Diffstat (limited to 'korganizer/filteredit_base.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/filteredit_base.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp index 505edf6..9425963 100644 --- a/korganizer/filteredit_base.cpp +++ b/korganizer/filteredit_base.cpp | |||
@@ -12,14 +12,19 @@ | |||
12 | #include <qvariant.h> | 12 | #include <qvariant.h> |
13 | #include <qpushbutton.h> | 13 | #include <qpushbutton.h> |
14 | #include <qframe.h> | 14 | #include <q3frame.h> |
15 | #include <qbuttongroup.h> | 15 | #include <q3buttongroup.h> |
16 | #include <qapplication.h> | 16 | #include <qapplication.h> |
17 | #include <QDesktopWidget> | ||
17 | #include <qradiobutton.h> | 18 | #include <qradiobutton.h> |
18 | #include <qlistbox.h> | 19 | #include <q3listbox.h> |
19 | #include <qlabel.h> | 20 | #include <qlabel.h> |
20 | #include <qcheckbox.h> | 21 | #include <qcheckbox.h> |
21 | #include <qlayout.h> | 22 | #include <qlayout.h> |
22 | #include <qtooltip.h> | 23 | #include <qtooltip.h> |
23 | #include <qwhatsthis.h> | 24 | #include <q3whatsthis.h> |
25 | //Added by qt3to4: | ||
26 | #include <Q3GridLayout> | ||
27 | #include <Q3HBoxLayout> | ||
28 | #include <Q3VBoxLayout> | ||
24 | #include "tr.h" | 29 | #include "tr.h" |
25 | 30 | ||
@@ -28,24 +33,24 @@ | |||
28 | * name 'name' and widget flags set to 'f'. | 33 | * name 'name' and widget flags set to 'f'. |
29 | */ | 34 | */ |
30 | FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | 35 | FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, Qt::WFlags fl ) |
31 | : QWidget( parent, name, fl ) | 36 | : QWidget( parent, name, fl ) |
32 | { | 37 | { |
33 | if ( !name ) | 38 | if ( !name ) |
34 | setName( "FilterEdit_base" ); | 39 | setName( "FilterEdit_base" ); |
35 | FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); | 40 | FilterEdit_baseLayout = new Q3VBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); |
36 | 41 | ||
37 | mCriteriaFrame = new QFrame( this, "mCriteriaFrame" ); | 42 | mCriteriaFrame = new Q3Frame( this, "mCriteriaFrame" ); |
38 | mCriteriaFrame->setFrameShape( QFrame::StyledPanel ); | 43 | mCriteriaFrame->setFrameShape( Q3Frame::StyledPanel ); |
39 | mCriteriaFrame->setFrameShadow( QFrame::Raised ); | 44 | mCriteriaFrame->setFrameShadow( Q3Frame::Raised ); |
40 | mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); | 45 | mCriteriaFrameLayout = new Q3VBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); |
41 | 46 | ||
42 | ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" ); | 47 | ButtonGroup1 = new Q3ButtonGroup( mCriteriaFrame, "ButtonGroup1" ); |
43 | ButtonGroup1->setColumnLayout(0, Qt::Vertical ); | 48 | ButtonGroup1->setColumnLayout(0, Qt::Vertical ); |
44 | ButtonGroup1->layout()->setSpacing( 6 ); | 49 | ButtonGroup1->layout()->setSpacing( 6 ); |
45 | ButtonGroup1->layout()->setMargin( 6 ); | 50 | ButtonGroup1->layout()->setMargin( 6 ); |
46 | ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() ); | 51 | ButtonGroup1Layout = new Q3GridLayout( ButtonGroup1->layout() ); |
47 | ButtonGroup1Layout->setAlignment( Qt::AlignTop ); | 52 | ButtonGroup1Layout->setAlignment( Qt::AlignTop ); |
48 | 53 | ||
49 | layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); | 54 | layout4 = new Q3HBoxLayout( 0, 0, 6, "layout4"); |
50 | 55 | ||
51 | mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" ); | 56 | mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" ); |
@@ -60,10 +65,10 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
60 | ButtonGroup1Layout->addLayout( layout4, 0, 0 ); | 65 | ButtonGroup1Layout->addLayout( layout4, 0, 0 ); |
61 | 66 | ||
62 | mCatList = new QListBox( ButtonGroup1, "mCatList" ); | 67 | mCatList = new Q3ListBox( ButtonGroup1, "mCatList" ); |
63 | 68 | ||
64 | ButtonGroup1Layout->addWidget( mCatList, 1, 0 ); | 69 | ButtonGroup1Layout->addWidget( mCatList, 1, 0 ); |
65 | mCriteriaFrameLayout->addWidget( ButtonGroup1 ); | 70 | mCriteriaFrameLayout->addWidget( ButtonGroup1 ); |
66 | 71 | ||
67 | layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); | 72 | layout7 = new Q3HBoxLayout( 0, 0, 6, "layout7"); |
68 | 73 | ||
69 | textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" ); | 74 | textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" ); |
@@ -77,5 +82,5 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
77 | mCriteriaFrameLayout->addLayout( layout7 ); | 82 | mCriteriaFrameLayout->addLayout( layout7 ); |
78 | 83 | ||
79 | layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); | 84 | layout9 = new Q3HBoxLayout( 0, 0, 6, "layout9"); |
80 | 85 | ||
81 | textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" ); | 86 | textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" ); |
@@ -92,5 +97,5 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
92 | mCriteriaFrameLayout->addLayout( layout9 ); | 97 | mCriteriaFrameLayout->addLayout( layout9 ); |
93 | 98 | ||
94 | layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); | 99 | layout2 = new Q3HBoxLayout( 0, 0, 0, "layout2"); |
95 | 100 | ||
96 | textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" ); | 101 | textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" ); |
@@ -110,5 +115,4 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
110 | languageChange(); | 115 | languageChange(); |
111 | resize( QSize(300, 200).expandedTo(minimumSizeHint()) ); | 116 | resize( QSize(300, 200).expandedTo(minimumSizeHint()) ); |
112 | clearWState( WState_Polished ); | ||
113 | } | 117 | } |
114 | 118 | ||