Diffstat (limited to 'kaddressbook/extensionmanager.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kaddressbook/extensionmanager.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 46defa1..5356224 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp | |||
@@ -22,6 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | #include <qlayout.h> | 23 | #include <qlayout.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | //Added by qt3to4: | ||
26 | #include <Q3HBoxLayout> | ||
25 | #include <kactionclasses.h> | 27 | #include <kactionclasses.h> |
26 | #include <kconfig.h> | 28 | #include <kconfig.h> |
27 | #include <kdebug.h> | 29 | #include <kdebug.h> |
@@ -42,7 +44,7 @@ | |||
42 | 44 | ||
43 | ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, | 45 | ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, |
44 | const char *name ) | 46 | const char *name ) |
45 | : QScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 ) | 47 | : Q3ScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 ) |
46 | { | 48 | { |
47 | #ifdef KAB_EMBEDDED | 49 | #ifdef KAB_EMBEDDED |
48 | //US QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu(); | 50 | //US QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu(); |
@@ -58,7 +60,7 @@ ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, | |||
58 | connect( mActionExtensions, SIGNAL( activated( int ) ), | 60 | connect( mActionExtensions, SIGNAL( activated( int ) ), |
59 | SLOT( setActiveExtension( int ) ) ); | 61 | SLOT( setActiveExtension( int ) ) ); |
60 | mWidgetBox = new QWidget( viewport() ); | 62 | mWidgetBox = new QWidget( viewport() ); |
61 | new QHBoxLayout (mWidgetBox ); | 63 | new Q3HBoxLayout (mWidgetBox ); |
62 | addChild( mWidgetBox ); | 64 | addChild( mWidgetBox ); |
63 | setResizePolicy(AutoOneFit); | 65 | setResizePolicy(AutoOneFit); |
64 | createExtensionWidgets(); | 66 | createExtensionWidgets(); |
@@ -148,7 +150,7 @@ void ExtensionManager::createExtensionWidgets() | |||
148 | { | 150 | { |
149 | // clear extension widget list | 151 | // clear extension widget list |
150 | mExtensionWidgetList.setAutoDelete( true ); | 152 | mExtensionWidgetList.setAutoDelete( true ); |
151 | QPtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList ); | 153 | Q3PtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList ); |
152 | ExtensionWidget *wdg = 0; | 154 | ExtensionWidget *wdg = 0; |
153 | while ( ( wdg = wdgIt.current() ) != 0 ) | 155 | while ( ( wdg = wdgIt.current() ) != 0 ) |
154 | mExtensionWidgetList.remove( wdg ); | 156 | mExtensionWidgetList.remove( wdg ); |
@@ -159,7 +161,7 @@ void ExtensionManager::createExtensionWidgets() | |||
159 | 161 | ||
160 | // add addressee editor as default | 162 | // add addressee editor as default |
161 | 163 | ||
162 | QHBoxLayout *hbl = (QHBoxLayout *) mWidgetBox->layout();; | 164 | Q3HBoxLayout *hbl = (Q3HBoxLayout *) mWidgetBox->layout();; |
163 | 165 | ||
164 | wdg = new AddresseeEditorWidget( mCore, true, mWidgetBox ); | 166 | wdg = new AddresseeEditorWidget( mCore, true, mWidgetBox ); |
165 | hbl->addWidget( wdg ); | 167 | hbl->addWidget( wdg ); |
@@ -244,6 +246,6 @@ void ExtensionManager::createExtensionWidgets() | |||
244 | mCurrentExtensionWidget = 0; | 246 | mCurrentExtensionWidget = 0; |
245 | } | 247 | } |
246 | 248 | ||
247 | #ifndef KAB_EMBEDDED | 249 | #ifndef KAB_EMBEDDED_ |
248 | #include "extensionmanager.moc" | 250 | #include "moc_extensionmanager.cpp" |
249 | #endif //KAB_EMBEDDED | 251 | #endif //KAB_EMBEDDED |