initial public commit of qt4 portp1

1 files changed, 11 insertions, 10 deletions

diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index b10a5d4..45f26fd 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -1,125 +1,126 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@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 KOEDITORGENERAL_H
 #define KOEDITORGENERAL_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qpopupmenu.h>
-#include <qgroupbox.h>
+#include <q3popupmenu.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
+#include <Q3BoxLayout>
 
 #include <ktextedit.h>
 #include <krestrictedline.h>
 
 #include <libkcal/incidence.h>
 
 #include "ktimeedit.h"
 
 class KDateEdit;
 class KOLocationBox;
 using namespace KCal;
 
 class KOEditorGeneral : public QObject
 {
     Q_OBJECT
   public:
     KOEditorGeneral (QObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneral();
     void setFocusOn( int i );
-    void initHeader(QWidget *,QBoxLayout *);
-    void initDescription(QWidget *,QBoxLayout *);
-    void initSecrecy(QWidget *,QBoxLayout *);
-    void initCategories(QWidget *,QBoxLayout *);    
-    void initAlarm(QWidget *,QBoxLayout *);
+    void initHeader(QWidget *,Q3BoxLayout *);
+    void initDescription(QWidget *,Q3BoxLayout *);
+    void initSecrecy(QWidget *,Q3BoxLayout *);
+    void initCategories(QWidget *,Q3BoxLayout *);    
+    void initAlarm(QWidget *,Q3BoxLayout *);
 
     /** Set widgets to default values */
     void setDefaults(bool allDay);
     /** Read event object and setup widgets accordingly */
     void readIncidence(Incidence *);
     /** Write event settings to event object */
     void writeIncidence(Incidence *);
 
     /** Check if the input is valid. */
     bool validateInput() { return true; }
 
     void enableAlarm( bool enable );
     void setSecrecy( int num );
     int getCalendarID();
   public slots:
     void setCategories(const QString &);
     void editCategories();
 
   protected slots:
     void enableAlarmEdit( bool enable );
     void disableAlarmEdit( bool disable );
     void alarmDisable( bool disable );
     void pickAlarmSound();
     void pickAlarmProgram();
     void slotSetFocusOn();
     void showCatPopup();
     void selectedCatPopup( int );
     
   signals:
     void openCategoryDialog();
     void allAccepted();
     void dateTimesChanged(QDateTime,QDateTime);
 
   protected:
     void fillCalCombo( int setToID = 0 );
     int                     mNextFocus; 
     //QLineEdit               *mSummaryEdit;
     //QLineEdit               *mLocationEdit;
     KOLocationBox             *mSummaryEdit;
     KOLocationBox             *mLocationEdit;
     QComboBox                  *mCalendarBox;
     QLabel                  *mAlarmBell;
     QCheckBox               *mAlarmButton;
     QSpinBox                *mAlarmTimeEdit;
     QPushButton             *mAlarmSoundButton;
     QPushButton             *mAlarmProgramButton;
     QComboBox               *mAlarmIncrCombo;
     KTextEdit               *mDescriptionEdit;
     QLabel                  *mOwnerLabel;
     QComboBox               *mSecrecyCombo;
     QCheckBox               *mCancelBox;
     QPushButton             *mCategoriesButton;
     QPushButton             *mCategoriesLabel;
      
   private:
-    QPopupMenu * mCatPopup;
+    Q3PopupMenu * mCatPopup;
     QString getFittingPath( const QString &) ;
     QString mAlarmSound;
     QString mAlarmProgram;
     QString mAlarmMessage;
 };
 
 #endif