Porting to Qt 4

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index 05971b643a155c6d0970db85d65dae48248a014e..56ab7f33231ccc5e68592a55ccc7ee4933c52b16 100755 (executable)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -708,7 +708,6 @@ QImage Qtx::transparentImage( const int w, const int h, const int d )
   return img;
 }
 
-/*!
 /*!
   \brief Create transparent pixmap.
   \param w required image width

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index c0c38ab05d8976565b80a9587834a514222ec4b7..57956449a775292830e12c9359b68d2c7f7f05b3 100755 (executable)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -135,10 +135,10 @@ private:
 QtxListAction::ListFrame::ListFrame( QtxListAction* a, QWidget* parent )
 : QMenu( parent ),
   myList( 0 ),
-  myLines( 5 ),
-  myChars( 5 ),
   myAction( a ),
-  myComment( 0 )
+  myComment( 0 ),
+  myLines( 5 ),
+  myChars( 5 )
 {
   QVBoxLayout* top = new QVBoxLayout( this );
   top->setMargin( 0 );

diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index 9f1617d5f54a786b8b71301f4bfa101abcbd17c7..b5bd38895e1e06353551153730dab09a86ec90dd 100644 (file)
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.cxx
@@ -406,7 +406,7 @@ void QtxLogoMgr::generate()
 int QtxLogoMgr::find( const QString& id ) const
 {
   int idx = -1;
-  for ( uint i = 0; i < myLogos.count() && idx < 0; i++ )
+  for ( int i = 0; i < myLogos.count() && idx < 0; i++ )
   {
     if ( myLogos.at( i ).id == id )
       idx = i;