Porting to Qt4

diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h
index f9066d93969ebed52d2a00d7e930b1c0cefdd38c..8ce33fff9f12668b7d8b0576dcac7ecf0fed0a62 100644 (file)
--- 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 f1b5778f3ea76e0b8de9ed7b4bc31ec4648e94f7..a1e46ddf158bde03d35bb8cef5a308febee96342 100644 (file)
--- 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 582798b2b0fa0f1a5eb55768291792038b0cd671..7589037ef69790cc36648f0843fada320d72738f 100644 (file)
--- 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 f064810ee343d5a0085e1c987f1fe411a778acfa..765095551786d1d1685dd196dd37bbd60f7efc74 100755 (executable)
--- 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& );