1 files changed, 20 insertions, 18 deletions

diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index ef9b979..40698a7 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -25,24 +25,26 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
-#include <qbuttongroup.h>
-#include <qhbox.h>
+#include <q3buttongroup.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
@@ -61,29 +63,29 @@ FilterEditDialog::FilterEditDialog( QWidget *parent, const char *name )
   initGUI();
 
   QStringList cats = KABPrefs::instance()->mCustomCategories;
 
   QStringList::Iterator iter;
   for ( iter = cats.begin(); iter != cats.end(); ++iter )
-    mCategoriesView->insertItem( new QCheckListItem( mCategoriesView, (*iter), QCheckListItem::CheckBox ) );
+    mCategoriesView->insertItem( new Q3CheckListItem( mCategoriesView, (*iter), Q3CheckListItem::CheckBox ) );
   filterNameTextChanged( mNameEdit->text() );
 }
 
 FilterEditDialog::~FilterEditDialog()
 {
 }
 
 void FilterEditDialog::setFilter( const Filter &filter )
 {
   mNameEdit->setText( filter.name() );
 
   QStringList categories = filter.categories();
-  QListViewItem *item = mCategoriesView->firstChild();
+  Q3ListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
     if ( categories.contains( item->text( 0 ) ) ) {
-      QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
+      Q3CheckListItem *checkItem = static_cast<Q3CheckListItem*>( item );
       checkItem->setOn( true );
     }
 
     item = item->nextSibling();
   }
 
@@ -102,15 +104,15 @@ Filter FilterEditDialog::filter()
 {
   Filter filter;
 
   filter.setName( mNameEdit->text() );
 
   QStringList categories;
-  QListViewItem *item = mCategoriesView->firstChild();
+  Q3ListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
-    QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
+    Q3CheckListItem *checkItem = static_cast<Q3CheckListItem*>( item );
     if ( checkItem->isOn() )
       categories.append( item->text( 0 ) );
 
     item = item->nextSibling();
   }
   filter.setCategories( categories );
@@ -138,13 +140,13 @@ void FilterEditDialog::initGUI()
 #endif //KAB_EMBEDDED  
   
 
   QWidget *page = plainPage();
   QLabel *label;
 
-  QGridLayout *topLayout = new QGridLayout( page, 3, 2, 0, spacingHint() );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 3, 2, 0, spacingHint() );
 
   label = new QLabel( i18n( "Name" ), page );
   mNameEdit = new KLineEdit( page );
   mNameEdit->setFocus();
   topLayout->addWidget( label, 0, 0 );
   topLayout->addWidget( mNameEdit, 0, 1 );
@@ -152,22 +154,22 @@ void FilterEditDialog::initGUI()
            SLOT( filterNameTextChanged( const QString&) ) );
 
   mCategoriesView = new KListView( page );
   mCategoriesView->addColumn( i18n( "Categories" ) );
   topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 );
 
-  mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page );
+  mMatchRuleGroup = new Q3HButtonGroup( i18n( "Category rule" ), page );
   mMatchRuleGroup->setExclusive( true );
   QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup );
   //mMatchRuleGroup->insert( radio );
   radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup );
   radio->setChecked( true );
   //mMatchRuleGroup->insert( radio );
   topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 );
 
-  QHButtonGroup * mMatchPPCGroup = new QHButtonGroup(i18n( "Include contacts, that are:" ), page );
+  Q3HButtonGroup * mMatchPPCGroup = new Q3HButtonGroup(i18n( "Include contacts, that are:" ), page );
   mPublic = new QCheckBox( i18n( "public" ), mMatchPPCGroup );
   mPrivate = new QCheckBox( i18n( "private" ), mMatchPPCGroup );
   mConfidential = new QCheckBox( i18n( "confidential" ), mMatchPPCGroup );
   mPublic->setChecked( true );
   mPrivate->setChecked( true );
   mConfidential->setChecked( true );
@@ -269,13 +271,13 @@ void FilterDialog::refresh()
 
   Filter::List::Iterator iter;
   for ( iter = mFilterList.begin(); iter != mFilterList.end(); ++iter )
     mFilterListBox->insertItem( (*iter).name() );
 }
 
-void FilterDialog::selectionChanged( QListBoxItem *item )
+void FilterDialog::selectionChanged( Q3ListBoxItem *item )
 {
   bool state = ( item != 0 );
 
   mEditButton->setEnabled( state );
   mRemoveButton->setEnabled( state );
 }
@@ -287,29 +289,29 @@ void FilterDialog::initGUI()
 #else //KAB_EMBEDDED  
   resize( KMIN(KGlobal::getDesktopWidth()-10, 330), KMIN(KGlobal::getDesktopHeight()-50, 200));
 #endif //KAB_EMBEDDED  
 
   QWidget *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 1, 2, 0, spacingHint() );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 1, 2, 0, spacingHint() );
 
   mFilterListBox = new KListBox( page );
   topLayout->addWidget( mFilterListBox, 0, 0 );
-  connect( mFilterListBox, SIGNAL( selectionChanged( QListBoxItem * ) ),
-           SLOT( selectionChanged( QListBoxItem * ) ) );
-  connect( mFilterListBox, SIGNAL( doubleClicked ( QListBoxItem * ) ),
+  connect( mFilterListBox, SIGNAL( selectionChanged( Q3ListBoxItem * ) ),
+           SLOT( selectionChanged( Q3ListBoxItem * ) ) );
+  connect( mFilterListBox, SIGNAL( doubleClicked ( Q3ListBoxItem * ) ),
            SLOT( edit() ) );
 
-  KButtonBox *buttonBox = new KButtonBox( page, Vertical );
+  KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
   buttonBox->addButton( i18n( "&Add..." ), this, SLOT( add() ) );
   mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT( edit() ) );
   mEditButton->setEnabled( false );
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
 
   buttonBox->layout();
   topLayout->addWidget( buttonBox, 0, 1 );
 }
 
-#ifndef KAB_EMBEDDED
-#include "filtereditdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_filtereditdialog.cpp"
 #endif //KAB_EMBEDDED