-rw-r--r-- | korganizer/calprinter.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/korganizer/calprinter.cpp b/korganizer/calprinter.cpp index 0cdf28e..d4bf988 100644 --- a/korganizer/calprinter.cpp +++ b/korganizer/calprinter.cpp | |||
@@ -22,6 +22,6 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qvbuttongroup.h> | 24 | // #include <qvbuttongroup.h> |
25 | #include <qwidgetstack.h> | 25 | #include <q3widgetstack.h> |
26 | #include <qradiobutton.h> | 26 | #include <qradiobutton.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
@@ -29,6 +29,9 @@ | |||
29 | #include <qcombobox.h> | 29 | #include <qcombobox.h> |
30 | #include <qlabel.h> | 30 | #include <qlabel.h> |
31 | #include <qvbox.h> | 31 | #include <q3vbox.h> |
32 | #include <qsplitter.h> | 32 | #include <qsplitter.h> |
33 | //Added by qt3to4: | ||
34 | #include <Q3GridLayout> | ||
35 | #include <Q3PtrList> | ||
33 | 36 | ||
34 | #include <kprinter.h> | 37 | #include <kprinter.h> |
@@ -175,12 +178,12 @@ void CalPrinter::updateConfig() | |||
175 | /****************************************************************************/ | 178 | /****************************************************************************/ |
176 | 179 | ||
177 | CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p, | 180 | CalPrintDialog::CalPrintDialog( Q3PtrList<CalPrintBase> plugins, KPrinter *p, |
178 | QWidget *parent, const char *name ) | 181 | QWidget *parent, const char *name ) |
179 | : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel ), | 182 | : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel ), |
180 | mPrinter( p ), mPrintPlugins( plugins ) | 183 | mPrinter( p ), mPrintPlugins( plugins ) |
181 | { | 184 | { |
182 | QVBox *page = new QVBox(this);//makeVBoxMainWidget(); | 185 | Q3VBox *page = new Q3VBox(this);//makeVBoxMainWidget(); |
183 | setMainWidget( page ); | 186 | setMainWidget( page ); |
184 | QHBox *printerLayout = new QHBox( page ); | 187 | Q3HBox *printerLayout = new Q3HBox( page ); |
185 | 188 | ||
186 | mPrinterLabel = new QLabel( printerLayout ); | 189 | mPrinterLabel = new QLabel( printerLayout ); |
@@ -192,7 +195,7 @@ CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p, | |||
192 | 195 | ||
193 | QSplitter *splitter = new QSplitter( page ); | 196 | QSplitter *splitter = new QSplitter( page ); |
194 | splitter->setOrientation( QSplitter::Horizontal ); | 197 | splitter->setOrientation( Qt::Horizontal ); |
195 | 198 | ||
196 | mTypeGroup = new QVButtonGroup( i18n("View Type"), splitter, "buttonGroup" ); | 199 | mTypeGroup = new Q3VButtonGroup( i18n("View Type"), splitter, "buttonGroup" ); |
197 | // use the minimal width possible = max width of the radio buttons, not extensible | 200 | // use the minimal width possible = max width of the radio buttons, not extensible |
198 | /* mTypeGroup->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)4, | 201 | /* mTypeGroup->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)4, |
@@ -201,9 +204,9 @@ CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p, | |||
201 | 204 | ||
202 | QWidget *splitterRight = new QWidget( splitter, "splitterRight" ); | 205 | QWidget *splitterRight = new QWidget( splitter, "splitterRight" ); |
203 | QGridLayout *splitterRightLayout = new QGridLayout( splitterRight ); | 206 | Q3GridLayout *splitterRightLayout = new Q3GridLayout( splitterRight ); |
204 | splitterRightLayout->setMargin( marginHint() ); | 207 | splitterRightLayout->setMargin( marginHint() ); |
205 | splitterRightLayout->setSpacing( spacingHint() ); | 208 | splitterRightLayout->setSpacing( spacingHint() ); |
206 | 209 | ||
207 | mConfigArea = new QWidgetStack( splitterRight, "configWidgetStack" ); | 210 | mConfigArea = new Q3WidgetStack( splitterRight, "configWidgetStack" ); |
208 | splitterRightLayout->addMultiCellWidget( mConfigArea, 0,0, 0,1 ); | 211 | splitterRightLayout->addMultiCellWidget( mConfigArea, 0,0, 0,1 ); |
209 | 212 | ||