1 files changed, 21 insertions, 17 deletions

diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index fc7a42e..1a9d063 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -28,7 +28,7 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
@@ -37,6 +37,10 @@ $Id$
 #endif
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
@@ -61,11 +65,11 @@ $Id$
 
 using namespace KRES;
 
-class ConfigViewItem : public QCheckListItem
+class ConfigViewItem : public Q3CheckListItem
 {
   public:
-    ConfigViewItem( QListView *parent, Resource* resource ) :
-      QCheckListItem( parent, resource->resourceName(), CheckBox ),
+    ConfigViewItem( Q3ListView *parent, Resource* resource ) :
+      Q3CheckListItem( parent, resource->resourceName(), CheckBox ),
       mResource( resource ),
       mIsStandard( false )
     {
@@ -97,13 +101,13 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
 {
   setCaption( i18n( "Resource Configuration" ) );
 
-  QVBoxLayout *mainLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( this );
 
-  QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this );
+  Q3GroupBox *groupBox = new Q3GroupBox( i18n( "Resources" ), this );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->layout()->setSpacing( 3 );
   groupBox->layout()->setMargin( 5 );
-  QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 );
+  Q3GridLayout *groupBoxLayout = new Q3GridLayout( groupBox->layout(), 4, 2 );
 
 //US  mFamilyCombo = new KComboBox( false, groupBox );
   mFamilyCombo = new KComboBox( groupBox );
@@ -145,8 +149,8 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
            SLOT( slotFamilyChanged( int ) ) );
   connect( mListView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionChanged() ) );
-  connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
-           SLOT( slotItemClicked( QListViewItem * ) ) );
+  connect( mListView, SIGNAL( clicked( Q3ListViewItem * ) ),
+           SLOT( slotItemClicked( Q3ListViewItem * ) ) );
 
   mLastItem = 0;
 
@@ -159,7 +163,7 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
 
 ConfigPage::~ConfigPage()
 {
-  QValueList<ResourcePageInfo>::Iterator it;
+  Q3ValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
     (*it).mManager->removeListener( this );
     delete (*it).mManager;
@@ -230,7 +234,7 @@ void ConfigPage::save()
 {
   saveResourceSettings();
 
-  QValueList<ResourcePageInfo>::Iterator it;
+  Q3ValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
     (*it).mManager->writeConfig( (*it).mConfig );
 
@@ -341,7 +345,7 @@ void ConfigPage::slotAdd()
     // as standard resource
     if ( !resource->readOnly() ) {
       bool onlyReadOnly = true;
-      QListViewItem *it = mListView->firstChild();
+      Q3ListViewItem *it = mListView->firstChild();
       while ( it != 0 ) {
         ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it );
         if ( !confIt->readOnly() && confIt != item )
@@ -366,7 +370,7 @@ void ConfigPage::slotRemove()
   if ( !mCurrentManager )
     return;
 
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
   ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item );
 
   if ( !confItem )
@@ -393,7 +397,7 @@ void ConfigPage::slotEdit()
   if ( !mCurrentManager )
     return;
 
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
   ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
   if ( !configItem )
     return;
@@ -435,7 +439,7 @@ void ConfigPage::slotStandard()
     return;
   }
 
-  QListViewItem *it = mListView->firstChild();
+  Q3ListViewItem *it = mListView->firstChild();
   while ( it != 0 ) {
     ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it );
     if ( configItem->standard() )
@@ -482,7 +486,7 @@ void ConfigPage::resourceDeleted( Resource* resource )
   qDebug("ConfigPage::resourceDeleted  : %s", resource->resourceName().latin1());
 }
 
-void ConfigPage::slotItemClicked( QListViewItem *item )
+void ConfigPage::slotItemClicked( Q3ListViewItem *item )
 {
   ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item );
   if ( !configItem ) return;
@@ -504,7 +508,7 @@ void ConfigPage::saveResourceSettings()
 
   if ( mCurrentManager ) {
 
-    QListViewItem *item = mListView->firstChild();
+    Q3ListViewItem *item = mListView->firstChild();
     while ( item ) {
       ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );