From: vsr Date: Thu, 10 May 2007 13:49:16 +0000 (+0000) Subject: Porting to Qt4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=41d0856faba3b7ad536b500eff4709d80de9cc2d;p=modules%2Fgui.git Porting to Qt4 --- diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h index f9066d939..8ce33fff9 100644 --- a/src/Qtx/QtxActionMenuMgr.h +++ b/src/Qtx/QtxActionMenuMgr.h @@ -91,13 +91,13 @@ public: bool containsMenu( const QString&, const int ) const; bool containsMenu( const int, const int ) const; -private Q_SLOTS: +private slots: void onAboutToShow(); void onAboutToHide(); void onHighlighted( int ); void onDestroyed( QObject* ); -Q_SIGNALS: +signals: void menuAboutToShow( QMenu* ); void menuAboutToHide( QMenu* ); diff --git a/src/Qtx/QtxActionMgr.h b/src/Qtx/QtxActionMgr.h index f1b5778f3..a1e46ddf1 100644 --- a/src/Qtx/QtxActionMgr.h +++ b/src/Qtx/QtxActionMgr.h @@ -85,7 +85,7 @@ protected: void triggerUpdate(); virtual void updateContent(); -private Q_SLOTS: +private slots: void onUpdateContent(); private: diff --git a/src/Qtx/QtxActionToolMgr.h b/src/Qtx/QtxActionToolMgr.h index 582798b2b..7589037ef 100644 --- a/src/Qtx/QtxActionToolMgr.h +++ b/src/Qtx/QtxActionToolMgr.h @@ -103,7 +103,7 @@ public: virtual bool load( const QString&, QtxActionMgr::Reader& ); -protected Q_SLOTS: +protected slots: void onToolBarDestroyed(); protected: diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h index f064810ee..765095551 100755 --- a/src/Qtx/QtxComboBox.h +++ b/src/Qtx/QtxComboBox.h @@ -49,11 +49,11 @@ public: int currentId() const; void setCurrentId( int ); -Q_SIGNALS: +signals: void activatedId( int ); void highlightedId( int ); -private Q_SLOTS: +private slots: void onActivated( int ); void onActivated( const QString& );