initial public commit of qt4 portp1

1 files changed, 4 insertions, 2 deletions

diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 003ccf8..8125fc9 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -1,103 +1,105 @@
 /*                                                                      
     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 CONFIGURETABLEVIEWDIALOG_H
 #define CONFIGURETABLEVIEWDIALOG_H
 
 #include "viewconfigurewidget.h"
 
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class QString;
 class QWidget;
 class QRadioButton;
 class QCheckBox;
 class KURLRequester;
 class KConfig;
 class QLabel;
 
 namespace KABC { class AddressBook; }
 
 class LookAndFeelPage;
 
 /**
   Configure dialog for the table view. This dialog inherits from the
   standard view dialog in order to add a custom page for the table
   view.
  */
 class ConfigureTableViewWidget : public ViewConfigureWidget
 {
   public:
     ConfigureTableViewWidget( KABC::AddressBook *ab, QWidget *parent, const char *name );
     virtual ~ConfigureTableViewWidget();
     
     virtual void restoreSettings( KConfig* );
     virtual void saveSettings( KConfig* );
     
   private:
     void initGUI();
     
     LookAndFeelPage *mPage;
 };
 
 /**
   Internal class. It is only defined here for moc
 */
-class LookAndFeelPage : public QVBox
+class LookAndFeelPage : public Q3VBox
 {
   Q_OBJECT
   
   public:
     LookAndFeelPage( QWidget *parent, const char *name = 0 );
     ~LookAndFeelPage() {}
     
     void restoreSettings( KConfig* );
     void saveSettings( KConfig* );
     
   protected slots:
     void enableBackgroundToggled( bool );
     void setTextFont();
     void setHeaderFont();
     void enableFonts();
     void enableColors();
 
   private:
     void initGUI();
     void updateFontLabel( QFont, QLabel * );
 
     QCheckBox *cbEnableCustomFonts,
       *cbEnableCustomColors;
     class ColorListBox *lbColors;
     QLabel *lTextFont, *lHeaderFont;
     class QPushButton *btnFont, *btnHeaderFont;
     class QWidget* vbFonts;
 
     QRadioButton *mAlternateButton;
     QRadioButton *mLineButton;
     QRadioButton *mNoneButton;
     QCheckBox *mToolTipBox;
     KURLRequester *mBackgroundName;
     QCheckBox *mBackgroundBox;
 };
 
 #endif