From: vsr <vsr@opencascade.com>
Date: Fri, 15 Jun 2007 14:19:53 +0000 (+0000)
Subject: Porting to Qt 4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f189f21a425103c1382b382a749f5993029ef701;p=modules%2Fgui.git

Porting to Qt 4
---

diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am
index fa76bc474..5addbdd15 100755
--- a/src/Qtx/Makefile.am
+++ b/src/Qtx/Makefile.am
@@ -53,12 +53,12 @@ salomeinclude_HEADERS=		\
 	QtxResourceMgr.h	\
 	QtxSplash.h		\
 	QtxToolBar.h		\
+	QtxToolTip.h		\
 	QtxValidator.h		\
 	QtxWorkspace.h		\
 	QtxWorkspaceAction.h	\
 	QtxWorkstack.h		\
-	QtxWorkstackAction.h    \
-	QtxToolTip.h
+	QtxWorkstackAction.h
 
 #VSR: not yet migrated to Qt4 files
 #				\
@@ -101,12 +101,12 @@ dist_libqtx_la_SOURCES=		\
 	QtxResourceMgr.cxx	\
 	QtxSplash.cxx		\
 	QtxToolBar.cxx		\
+	QtxToolTip.cxx		\
 	QtxValidator.cxx	\
 	QtxWorkspace.cxx	\
 	QtxWorkspaceAction.cxx	\
 	QtxWorkstack.cxx	\
-	QtxWorkstackAction.cxx  \
-	QtxToolTip.cxx
+	QtxWorkstackAction.cxx
 
 #VSR: not yet migrated to Qt4 files
 #				\
@@ -142,12 +142,12 @@ MOC_FILES=				\
 	QtxPopupMgr_moc.cxx		\
 	QtxSplash_moc.cxx		\
 	QtxToolBar_moc.cxx		\
+	QtxToolTip_moc.cxx		\
 	QtxValidator_moc.cxx		\
 	QtxWorkspace_moc.cxx		\
 	QtxWorkspaceAction_moc.cxx	\
 	QtxWorkstack_moc.cxx		\
-	QtxWorkstackAction_moc.cxx      \
-	QtxToolTip_moc.cxx
+	QtxWorkstackAction_moc.cxx
 
 #VSR: not yet migrated to Qt4 files
 #					\
diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro
index 1fe4228e6..276bdc778 100644
--- a/src/Qtx/Qtx.pro
+++ b/src/Qtx/Qtx.pro
@@ -37,6 +37,7 @@ HEADERS += QtxPopupMgr.h
 HEADERS += QtxResourceMgr.h
 HEADERS += QtxSplash.h
 HEADERS += QtxToolBar.h
+HEADERS += QtxToolTip.h
 HEADERS += QtxValidator.h
 HEADERS += QtxWorkspace.h
 HEADERS += QtxWorkspaceAction.h
@@ -49,7 +50,6 @@ HEADERS += QtxWorkstackAction.h
 #HEADERS += QtxPopupMenu.h
 #HEADERS += QtxResourceEdit.h
 #HEADERS += QtxTable.h
-#HEADERS += QtxToolTip.h
 
 SOURCES  = Qtx.cxx
 SOURCES += QtxAction.cxx
@@ -62,7 +62,7 @@ SOURCES += QtxComboBox.cxx
 SOURCES += QtxDialog.cxx
 SOURCES += QtxDockAction.cxx
 SOURCES += QtxDockWidget.cxx
-SOURCES += QtxDblSpinBox.cxx
+SOURCES += QtxDoubleSpinBox.cxx
 SOURCES += QtxEvalExpr.cxx
 SOURCES += QtxGridBox.cxx
 SOURCES += QtxGroupBox.cxx
@@ -76,6 +76,7 @@ SOURCES += QtxPopupMgr.cxx
 SOURCES += QtxResourceMgr.cxx
 SOURCES += QtxSplash.cxx
 SOURCES += QtxToolBar.cxx
+SOURCES += QtxToolTip.cxx
 SOURCES += QtxValidator.cxx
 SOURCES += QtxWorkspace.cxx
 SOURCES += QtxWorkspaceAction.cxx
@@ -88,7 +89,6 @@ SOURCES += QtxWorkstackAction.cxx
 #SOURCES += QtxPopupMenu.cxx
 #SOURCES += QtxResourceEdit.cxx
 #SOURCES += QtxTable.cxx
-#SOURCES += QtxToolTip.cxx
 
 includes.files = $$HEADERS
 includes.path = ../../include
diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 360cd98e8..96a1b8e0c 100755
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -143,7 +143,7 @@ void QtxComboBox::paintEvent( QPaintEvent* e )
 
 /*!
   \brief Called when any item is activated by the user.
-  \param idx activated item index (not used)
+  \param idx activated item index
 */
 void QtxComboBox::onActivated( int idx )
 {
diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index accc7ee18..2158b6417 100644
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -493,18 +493,18 @@ bool QtxPopupMgr::isSatisfied( QAction* act, const RuleType ruleType ) const
       for ( int i = 0; i < mySelection->count() && !res; i++ )
       {
         QList<QVariant> c;
-	      for ( QStringList::const_iterator anIt1 = specific.begin(); anIt1 != specific.end(); ++anIt1 )
+	for ( QStringList::const_iterator anIt1 = specific.begin(); anIt1 != specific.end(); ++anIt1 )
           c.append( parameter( *anIt1, i ) );
         aCorteges.insert( c, 0 );
       }
       for ( QMap<QList<QVariant>, int>::const_iterator anIt = aCorteges.begin(); anIt  != aCorteges.end(); ++anIt )
       {
-	      const QList<QVariant>& aCortege = anIt.key();
-	      QStringList::const_iterator anIt1 = specific.begin(), aLast1 = specific.end();
-	      QList<QVariant>::const_iterator anIt2 = aCortege.begin();
-	      for ( ; anIt1 != aLast1; anIt1++, anIt2++ )
-	        p->setParameter( *anIt1, *anIt2 );
-	      res = res || result( p );
+	const QList<QVariant>& aCortege = anIt.key();
+	QStringList::const_iterator anIt1 = specific.begin(), aLast1 = specific.end();
+	QList<QVariant>::const_iterator anIt2 = aCortege.begin();
+	for ( ; anIt1 != aLast1; anIt1++, anIt2++ )
+	  p->setParameter( *anIt1, *anIt2 );
+	res = res || result( p );
       }
     }
     else