Porting to Qt4

diff --git a/src/Qtx/QtxGroupBox.cxx b/src/Qtx/QtxGroupBox.cxx
index 6975f779e27cced40777c9a06d6e11572fc6341b..b2062e38e10e7be501a443c4b881fa9ec6c3761c 100644 (file)
--- a/src/Qtx/QtxGroupBox.cxx
+++ b/src/Qtx/QtxGroupBox.cxx
@@ -85,50 +85,6 @@ void QtxGroupBox::initialize()
   updateTitle();
 }
 
-#if QT_VER < 3
-
-/*!
-  \return the width of the empty space between the items in the group and the frame of the group
-*/
-int QtxGroupBox::insideMargin() const
-{
-  int m = 0;
-  if ( layout() )
-    m = layout()->margin();
-  return m;
-}
-
-/*!
-  \return the width of the empty space between each of the items in the group
-*/
-int QtxGroupBox::insideSpacing() const
-{
-  int s = 0;
-  if ( layout() )
-    s = layout()->spacing();
-  return s;
-}
-
-/*!
-  Sets the width of the empty space between the items in the group and the frame of the group
-*/
-void QtxGroupBox::setInsideMargin( int m )
-{
-  if ( layout() )
-    layout()->setMargin( m );
-}
-
-/*!
-  Sets the width of the empty space between each of the items in the group
-*/
-void QtxGroupBox::setInsideSpacing( int s )
-{
-  if ( layout() )
-    layout()->setSpacing( s );
-}
-
-#endif
-
 /*!
   Inserts title widget
   \param wid - new title widget

diff --git a/src/Qtx/QtxGroupBox.h b/src/Qtx/QtxGroupBox.h
index 04f9bb2e6c4f7c90189ded53b954dc8e94c3398f..20c26fcc764fc7d6d8192f9823f8940dbe24969b 100644 (file)
--- a/src/Qtx/QtxGroupBox.h
+++ b/src/Qtx/QtxGroupBox.h
@@ -38,13 +38,6 @@ public:
   QtxGroupBox( int, Orientation, const QString&, QWidget* = 0, const char* = 0 );
   virtual ~QtxGroupBox();
 
-#if QT_VER < 3
-  int           insideMargin() const;
-  int           insideSpacing() const;
-  void          setInsideMargin( int );
-  void          setInsideSpacing( int );
-#endif
-
   virtual void  setAlignment( int );
   virtual void  setTitle( const QString& );
   virtual void  setColumnLayout( int, Orientation );

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 52f09303943cb6377d2a74e29a5f803634b1f108..891f64e608affc5f78b1b6f6f5acc06294f85d31 100755 (executable)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -232,11 +232,6 @@ bool QtxListAction::addTo( QWidget* w )
                if ( !QtxAction::addTo( w ) )
                        return false;
 
-#if QT_VER < 3
-  if ( w->children() )
-    addedTo( (QWidget*)w->children()->getLast(), w );
-#endif
-
   if ( w->inherits( "QToolBar" ) )
   {
                Buttons& entry = myButtons[w];
@@ -278,9 +273,7 @@ bool QtxListAction::addTo( QWidget* w )
                connect( entry.popup, SIGNAL( activated( int ) ), this, SLOT( onActivated( int ) ) );
        }
 
-#if QT_VER >= 3
-       connect( w, SIGNAL( destroyed( QObject* ) ), this, SLOT( onDestroyed( QObject* ) ) );
-#endif
+    connect( w, SIGNAL( destroyed( QObject* ) ), this, SLOT( onDestroyed( QObject* ) ) );
 
     return true;
 }
@@ -325,9 +318,7 @@ bool QtxListAction::removeFrom( QWidget* w )
   else if ( w->inherits( "QPopupMenu" ) )
     myPopups.remove( w );
 
-#if QT_VER >= 3
-       disconnect( w, SIGNAL( destroyed( QObject* ) ), this, SLOT( onDestroyed( QObject* ) ) );
-#endif
+  disconnect( w, SIGNAL( destroyed( QObject* ) ), this, SLOT( onDestroyed( QObject* ) ) );
 
   return true;
 }
@@ -429,9 +420,7 @@ bool QtxListAction::eventFilter( QObject* o, QEvent* e )
 
 void QtxListAction::addedTo( QWidget* actionWidget, QWidget* container )
 {
-#if QT_VER >= 3
        QtxAction::addedTo( actionWidget, container );
-#endif
 
        if ( !container->inherits( "QToolBar" ) )
                return;