initial public commit of qt4 portp1

7 files changed, 31 insertions, 28 deletions

diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp
index cee5886..4a86aca 100644
--- a/kaddressbook/details/detailsviewcontainer.cpp
+++ b/kaddressbook/details/detailsviewcontainer.cpp
@@ -1,91 +1,94 @@
 /*                                                                      
     This file is part of KAddressBook.
     Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                         
     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.
 */                                                                      
 
 #include <qcombobox.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
 #include "look_basic.h"
 //#include "look_details.h"
 #include "look_html.h"
 
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #endif //KAB_EMBEDDED
 
 
 #include "detailsviewcontainer.h"
 
 ViewContainer::ViewContainer( QWidget *parent, const char* name )
   : QWidget( parent, name ), mCurrentLook( 0 )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   //topLayout->setMargin( KDialog::marginHint() );
   //topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( 0 );
   topLayout->setSpacing( 0 );
 
-  QBoxLayout *styleLayout = new QHBoxLayout( topLayout );    
+  Q3BoxLayout *styleLayout = new Q3HBoxLayout( topLayout );    
 
   QLabel *label = new QLabel( i18n("Style:"), this );
   styleLayout->addWidget( label );
 
   mStyleCombo = new QComboBox( this );
   styleLayout->addWidget( mStyleCombo );
 
-  QFrame *frameRuler = new QFrame( this );
+  Q3Frame *frameRuler = new Q3Frame( this );
 //US  frameRuler->setFrameShape( QFrame::HLine );
 //US  frameRuler->setFrameShadow( QFrame::Sunken );
 //US  topLayout->addWidget( frameRuler );
 
-  mDetailsStack = new QWidgetStack( this );
+  mDetailsStack = new Q3WidgetStack( this );
   topLayout->addWidget( mDetailsStack, 1 );
 
   registerLooks();
 
 #if 1
     // Hide detailed view selection combo box, because we currently have
     // only one. Reenable it when there are more detailed views.
     label->hide();
     mStyleCombo->hide();
     frameRuler->hide();
 #endif
 }
 
 void ViewContainer::printView()
 {
     mCurrentLook->printView();
 }
 KABBasicLook *ViewContainer::currentLook()
 {
   return mCurrentLook;
 }
 
 void ViewContainer::registerLooks()
 {
@@ -138,27 +141,27 @@ void ViewContainer::setAddressee( const KABC::Addressee& addressee )
 {
   if ( mCurrentLook != 0 ) {
       mCurrentAddressee = addressee;
       mCurrentLook->setAddressee( mCurrentAddressee );
     
   }
 }
 
 KABC::Addressee ViewContainer::addressee()
 {
   static KABC::Addressee empty; // do not use!
 
   if ( !mCurrentLook )
     return empty;
   else
     return mCurrentLook->addressee();
 }
 
 void ViewContainer::setReadOnly( bool state )
 {
   if ( mCurrentLook )
     mCurrentLook->setReadOnly( state );
 }
 
-#ifndef KAB_EMBEDDED
-#include "detailsviewcontainer.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_detailsviewcontainer.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/detailsviewcontainer.h b/kaddressbook/details/detailsviewcontainer.h
index 9684736..f310a30 100644
--- a/kaddressbook/details/detailsviewcontainer.h
+++ b/kaddressbook/details/detailsviewcontainer.h
@@ -3,54 +3,54 @@
     Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                         
     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 DETAILSVIEWCONTAINER_H
 #define DETAILSVIEWCONTAINER_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "look_basic.h"
 
 class QComboBox;
-class QWidgetStack;
+class Q3WidgetStack;
 
 class ViewContainer : public QWidget
 {
   Q_OBJECT
 
   public:
     ViewContainer( QWidget *parent = 0, const char* name = 0 );
 
     /**
       Return the look currently selected. If there is none, it
       returns zero. Do not use this pointer to store a reference
       to a look, the user might select another one (e.g., create
       a new object) at any time.
      */
     KABBasicLook *currentLook();
     /**
       Return the contact currently displayed.
      */
     KABC::Addressee addressee();
 
   public slots:
     void printView();
     /**
       Set the contact currently displayed.
@@ -73,31 +73,31 @@ class ViewContainer : public QWidget
       by, for example, clicking on the displayed mailto-URL.
      */
     void sendEmail( const QString& );
 
     /**
       The user activated one of the displayed HTTP URLs. For example
       by clicking on the displayed homepage address.
      */
     void browse( const QString& );
 
   protected:
     /**
       A style has been selected. Overloaded from base class.
      */
     void slotStyleSelected( int );
 
     /**
       Register the available looks.
      */
     void registerLooks();
 
   private:
     KABC::Addressee mCurrentAddressee;
     KABBasicLook *mCurrentLook;
-    QPtrList<KABLookFactory> mLookFactories;
+    Q3PtrList<KABLookFactory> mLookFactories;
 
     QComboBox *mStyleCombo;
-    QWidgetStack *mDetailsStack;
+    Q3WidgetStack *mDetailsStack;
 };
 
 #endif
diff --git a/kaddressbook/details/look_basic.cpp b/kaddressbook/details/look_basic.cpp
index 0245686..48cc42a 100644
--- a/kaddressbook/details/look_basic.cpp
+++ b/kaddressbook/details/look_basic.cpp
@@ -5,71 +5,71 @@
     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.
 */                                                                      
 
 #include <kdebug.h>
 
 #include "look_basic.h"
 
 KABBasicLook::KABBasicLook( QWidget *parent, const char *name )
-  : QVBox( parent, name ), mReadOnly( false )
+  : Q3VBox( parent, name ), mReadOnly( false )
 {
 }
 
 void KABBasicLook::setReadOnly( bool state )
 {
   mReadOnly = state;
 }
 
 bool KABBasicLook::isReadOnly() const
 {
   return mReadOnly;
 }
 
 void KABBasicLook::setAddressee( const KABC::Addressee &addr )
 {
   if ( mAddressee == addr )
     return;
 
   mAddressee = addr;
   repaint( false );
 }
 
 KABC::Addressee KABBasicLook::addressee()
 {
   return mAddressee;
 }
 
 void KABBasicLook::restoreSettings( KConfig* )
 {
 }
 
 void KABBasicLook::saveSettings( KConfig* )
 {
 }
 
 KABLookFactory::KABLookFactory( QWidget *parent, const char *name )
   : mParent( parent ), mName( name )
 {
 }
 
 KABLookFactory::~KABLookFactory()
 {
 }
-#ifndef KAB_EMBEDDED
-#include "look_basic.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_look_basic.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/look_basic.h b/kaddressbook/details/look_basic.h
index a65c99c..a70e7f7 100644
--- a/kaddressbook/details/look_basic.h
+++ b/kaddressbook/details/look_basic.h
@@ -4,65 +4,65 @@
                                                                         
     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 LOOK_KABBASIC_H
 #define LOOK_KABBASIC_H
 
 #include <kabc/addressbook.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 
 class KConfig;
 
 /**
   This is a pure virtual base class that defines the
   interface for how to display and change entries of
   the KDE addressbook.
 
   This basic widget does not show anything in its client space.
   Derive it and implement its look and how the user may edit the
   entry.
 
   The paintEvent() has to paint the whole widget, since repaint()
   calls will not delete the widgets background.
  */
-class KABBasicLook : public QVBox
+class KABBasicLook : public Q3VBox
 {
   Q_OBJECT
 
   public:
     /**
       The constructor.
      */
     KABBasicLook( QWidget *parent = 0, const char *name = 0 );
 
     /**
       Set the entry. It will be displayed automatically.
      */
     virtual void setAddressee( const KABC::Addressee& addressee );
 
     /**
       Get the current entry.
      */
     virtual KABC::Addressee addressee();
 
     /**
       Configure the view from the configuration file.
      */
     virtual void restoreSettings( KConfig* );
 
diff --git a/kaddressbook/details/look_details.cpp b/kaddressbook/details/look_details.cpp
index 11d06e9..2c3a79d 100644
--- a/kaddressbook/details/look_details.cpp
+++ b/kaddressbook/details/look_details.cpp
@@ -168,52 +168,52 @@ void KABDetailedView::mouseMoveEvent( QMouseEvent *e )
 {
   QPoint bias( mGrid, mGrid );
   int rc;
   bool hit = false;
 
   if ( ( rc = mPainter->hitsEmail( e->pos() - bias ) ) != -1 )
     hit = true;
   else if ( ( rc = mPainter->hitsURL( e->pos() - bias ) ) != -1 )
     hit = true;
   else if ( ( rc = mPainter->hitsPhone( e->pos() - bias ) ) != -1 )
     hit = true;
   else if ( ( rc = mPainter->hitsTalk( e->pos() - bias ) ) != -1 )
     hit = true;
 
   if ( hit ) {
     if ( cursor().shape() != PointingHandCursor )
       setCursor( PointingHandCursor );
     else if( cursor().shape() != ArrowCursor )
       setCursor(ArrowCursor);
   }
 }
 
 void KABDetailedView::mousePressEvent( QMouseEvent *e )
 {
-  QPopupMenu menu( this );
-  QPopupMenu *menuBG = new QPopupMenu( &menu );
-  mMenuBorderedBG = new QPopupMenu( &menu );
-  mMenuTiledBG = new QPopupMenu( &menu );
+  Q3PopupMenu menu( this );
+  Q3PopupMenu *menuBG = new Q3PopupMenu( &menu );
+  mMenuBorderedBG = new Q3PopupMenu( &menu );
+  mMenuTiledBG = new Q3PopupMenu( &menu );
 
   menu.insertItem( i18n( "Select Background" ), menuBG );
   menuBG->insertItem( i18n( "Bordered Backgrounds" ), mMenuBorderedBG );
   menuBG->insertItem( i18n( "Tiled Backgrounds" ), mMenuTiledBG );
   menu.insertSeparator();
 
   QPoint point = e->pos() - QPoint( mGrid, mGrid );
   int rc;
   QStringList dirsBorderedBG, dirsTiledBG;
   QDir dir;
 
   switch( e->button() ) {
     case QMouseEvent::RightButton:
       if ( isReadOnly() )
         menu.setItemEnabled( menu.idAt( 0 ), false );
       else {
         // TODO: settings need to be saved in view options
         dirsBorderedBG = KGlobal::instance()->dirs()->findDirs( "data", mBorderedBGDir );
         if ( dirsBorderedBG.count() > 0 ) {
           dir.setPath( dirsBorderedBG[ 0 ] );
           mBorders = dir.entryList( QDir::Files );
           for ( uint count = 0; count < mBorders.count(); ++count )
             mMenuBorderedBG->insertItem( mBorders[ count ], count );
 
@@ -393,27 +393,27 @@ void KABDetailedView::restoreSettings( KConfig *config )
                       << endl;
     }
   }
 
   mDefaultBGColor = config->readColorEntry( ConfigView_DefaultBackgroundColor, &white );
   mHeadLineBGColor = config->readColorEntry( ConfigView_HeadlineBGColor, &darkBlue );
   mHeadLineTextColor = config->readColorEntry( ConfigView_HeadlineTextColor, &yellow );
   mUseHeadLineBGColor = config->readBoolEntry( ConfigView_UseHeadlineBGColor, true );
 
   if ( !mPainter )
     mPainter = new KABEntryPainter;
 
   mPainter->setForegroundColor( black );
   mPainter->setHeaderColor( mHeadLineTextColor );
   mPainter->setUseHeaderColor( mUseHeadLineBGColor );
   mPainter->setBackgroundColor( mHeadLineBGColor );
 
   mPainter->setHeaderFont( QFont( gfont, gpointsize + 4, QFont::Bold, true ) );
   mPainter->setHeadLineFont( QFont( gfont, gpointsize + 2, QFont::Bold, true ) );
   mPainter->setBodyFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
   mPainter->setFixedFont( QFont( ffont, fpointsize, QFont::Normal, false ) );
   mPainter->setCommentFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
 }
 
-#ifndef KAB_EMBEDDED
-#include "look_details.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_look_details.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/look_details.h b/kaddressbook/details/look_details.h
index e8d50a9..b59d3a7 100644
--- a/kaddressbook/details/look_details.h
+++ b/kaddressbook/details/look_details.h
@@ -109,49 +109,49 @@ class KABDetailedView : public KABBasicLook
 
     QMap<QString, QPixmap> mBackgroundMap;
     QPixmap mCurrentBackground;
 
     BackgroundStyle mBackgroundStyle;
 
     bool mUseDefaultBGImage;
     bool mUseHeadLineBGColor;
 
     QColor mDefaultBGColor;
     QColor mHeadLineBGColor;
     QColor mHeadLineTextColor;
 
     QPixmap mDefaultBGImage;
 
     KToggleAction *mActionShowAddresses;
     KToggleAction *mActionShowEmails;
     KToggleAction *mActionShowPhones;
     KToggleAction *mActionShowURLs;
 
     const int mGrid;
     QStringList mBorders;
     QStringList mTiles;
 
-    QPopupMenu *mMenuBorderedBG;
-    QPopupMenu *mMenuTiledBG;
+    Q3PopupMenu *mMenuBorderedBG;
+    Q3PopupMenu *mMenuTiledBG;
 
     static const QString mBorderedBGDir;
     static const QString mTiledBGDir;
 };
 
 class KABDetailedViewFactory : public KABLookFactory
 {
   public:
     KABDetailedViewFactory( QWidget *parent = 0, const char *name = 0 )
       : KABLookFactory( parent, name ) {}
 
     KABBasicLook *create()
     {
       return new KABDetailedView( mParent, mName );
     }
 
     QString description()
     {
       return i18n( "Detailed Style: Display all details, no modifications." );
     }
 };
 
 #endif
diff --git a/kaddressbook/details/look_html.cpp b/kaddressbook/details/look_html.cpp
index bb30650..4ec1c7d 100644
--- a/kaddressbook/details/look_html.cpp
+++ b/kaddressbook/details/look_html.cpp
@@ -3,54 +3,54 @@
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     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.
 */
 
 #include <addresseeview.h>
 
 #include "look_html.h"
-#include <qscrollview.h> 
+#include <q3scrollview.h> 
 #include "kabprefs.h"
 #include <kabc/addresseeview.h>
 KABHtmlView::KABHtmlView( QWidget *parent, const char *name )
   : KABBasicLook( parent, name )
 {
     mView = new KABC::AddresseeView( this ); 
     mView->setFont( KABPrefs::instance()->mDetailsFont );
     connect(this, SIGNAL(printMyView()),
           this , SLOT(printMe()));
 }
 
 KABHtmlView::~KABHtmlView()
 {
 }
 void KABHtmlView::printMe()
 {
     mView->printMe();
 
 }
 
 void KABHtmlView::setAddressee( const KABC::Addressee &addr )
 {
   mView->setFont( KABPrefs::instance()->mDetailsFont );
   mView->setAddressee( addr );
 }
 
-#ifndef KAB_EMBEDDED
-#include "look_html.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_look_html.cpp"
 #endif //KAB_EMBEDDED