initial public commit of qt4 portp1

1 files changed, 9 insertions, 7 deletions

diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 6def26b..b52a83c 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -1,118 +1,120 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include "kaddressbookview.h"
 #include "addviewdialog.h"
 
-AddViewDialog::AddViewDialog( QDict<ViewFactory> *viewFactoryDict,
+AddViewDialog::AddViewDialog( Q3Dict<ViewFactory> *viewFactoryDict,
                               QWidget *parent, const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Add View" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name ),
    mViewFactoryDict( viewFactoryDict )
 {
 //US  setMinimumSize( KMIN(KGlobal::getDesktopWidth(), 300), KMIN(KGlobal::getDesktopHeight(), 300));
   
   mTypeId = 0;
 
   QWidget *page = plainPage();
 
-  QGridLayout *layout = new QGridLayout( page, 2, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 2, 2 );
   layout->setSpacing( spacingHint() );
   layout->setRowStretch( 1, 1 );
   layout->setColStretch( 1, 1 );
 
   QLabel *label = new QLabel( i18n( "View name:" ), page );
   layout->addWidget( label, 0, 0 );
 
   mViewNameEdit = new QLineEdit( page );
   connect( mViewNameEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   layout->addWidget( mViewNameEdit, 0, 1 );
 
-  mTypeGroup = new QButtonGroup( 2, Qt::Horizontal, i18n( "View Type" ), page );
+  mTypeGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "View Type" ), page );
   connect( mTypeGroup, SIGNAL( clicked( int ) ), this, SLOT( clicked( int ) ) );
   layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
 
   // Now create the radio buttons. This needs some layout work.
-  QDictIterator<ViewFactory> iter( *mViewFactoryDict );
+  Q3DictIterator<ViewFactory> iter( *mViewFactoryDict );
   for ( iter.toFirst(); iter.current(); ++iter ) {
 //US i am not quit sure, why I can nopt use (*iter)-> here 
 //US    new QRadioButton( (*iter)->type(), mTypeGroup );
 //US    label = new QLabel( (*iter)->description(), mTypeGroup );
 #ifdef DESKTOP_VERSION
     new QRadioButton( (*iter)->type(), mTypeGroup );
     label = new QLabel( (*iter)->description(), mTypeGroup );
 #else
     new QRadioButton( (*iter).type(), mTypeGroup );
     label = new QLabel( (*iter).description(), mTypeGroup );
 
 #endif
     label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
   }
 
   mTypeGroup->setButton( 0 );
   mViewNameEdit->setFocus();
   enableButton( KDialogBase::Ok, false );
  
   
 }
 
 AddViewDialog::~AddViewDialog()
 {
 }
 
 QString AddViewDialog::viewName()const
 {
   return mViewNameEdit->text();
 }
 
 QString AddViewDialog::viewType()const
 {
   return mTypeGroup->find( mTypeId )->text();
 }
 
 void AddViewDialog::clicked( int id )
 {
   mTypeId = id;
 }
 
 void AddViewDialog::textChanged( const QString &text )
 {
   enableButton( KDialogBase::Ok, !text.isEmpty() );
 }
 
-#ifndef KAB_EMBEDDED
-#include "addviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addviewdialog.cpp"
 #endif //KAB_EMBEDDED