From 63b571ba5d25fb55cfd35ee7908e50032048c017 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 27 Aug 2007 20:48:55 +0000 Subject: [PATCH] compile using KDE3_SUPPORT for KCModule; fix forward decl. svn path=/trunk/KDE/kdebase/apps/; revision=705387 --- kdepasswd/kcm/main.h | 2 ++ konqueror/settings/css/kcmcss.h | 2 ++ konqueror/settings/ebrowsing/main.h | 2 ++ konqueror/settings/kio/cache.h | 2 ++ konqueror/settings/kio/kcookiesmain.h | 2 ++ konqueror/settings/kio/kcookiespolicies.h | 2 ++ konqueror/settings/kio/kproxydlg.h | 2 ++ konqueror/settings/kio/main.h | 2 ++ konqueror/settings/kio/netpref.h | 2 ++ konqueror/settings/kio/smbrodlg.h | 2 ++ konqueror/settings/kio/useragentdlg.h | 2 ++ konqueror/settings/konq/behaviour.h | 2 ++ konqueror/settings/konq/browser.h | 2 ++ konqueror/settings/konq/desktop.h | 2 ++ konqueror/settings/konq/desktopbehavior_impl.h | 2 ++ konqueror/settings/konq/fontopts.h | 2 ++ konqueror/settings/konq/globalpaths.h | 2 ++ konqueror/settings/konq/previews.h | 2 ++ konqueror/settings/konqhtml/appearance.h | 2 ++ konqueror/settings/konqhtml/filteropts.h | 2 ++ konqueror/settings/konqhtml/generalopts.h | 2 ++ konqueror/settings/konqhtml/htmlopts.h | 2 ++ konqueror/settings/konqhtml/javaopts.h | 2 ++ konqueror/settings/konqhtml/jsopts.h | 2 ++ konqueror/settings/konqhtml/main.h | 2 ++ konqueror/settings/konqhtml/pluginopts.h | 2 ++ konqueror/settings/performance/kcmperformance.h | 2 ++ konqueror/sidebar/trees/history_module/kcmhistory.h | 2 ++ konqueror/src/konqfactory.h | 6 +++--- 29 files changed, 59 insertions(+), 3 deletions(-) diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h index b186f4b8cb..225d22b2ab 100644 --- a/kdepasswd/kcm/main.h +++ b/kdepasswd/kcm/main.h @@ -19,7 +19,9 @@ #ifndef MAIN_H #define MAIN_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include #include "ui_main_widget.h" diff --git a/konqueror/settings/css/kcmcss.h b/konqueror/settings/css/kcmcss.h index c7be723df5..f300f15b2d 100644 --- a/konqueror/settings/css/kcmcss.h +++ b/konqueror/settings/css/kcmcss.h @@ -21,7 +21,9 @@ #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "ui_csscustom.h" #include "ui_cssconfig.h" #include "ui_preview.h" diff --git a/konqueror/settings/ebrowsing/main.h b/konqueror/settings/ebrowsing/main.h index 9118ecde60..a8d426d695 100644 --- a/konqueror/settings/ebrowsing/main.h +++ b/konqueror/settings/ebrowsing/main.h @@ -25,7 +25,9 @@ #ifndef __MAIN_H__ #define __MAIN_H__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include #include "filteropts.h" diff --git a/konqueror/settings/kio/cache.h b/konqueror/settings/kio/cache.h index 524d3ac7dd..1b46c6bbbd 100644 --- a/konqueror/settings/kio/cache.h +++ b/konqueror/settings/kio/cache.h @@ -22,7 +22,9 @@ #ifndef CACHE_H #define CACHE_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "ui_cache_ui.h" class CacheDlgUI : public QWidget, public Ui::CacheDlgUI diff --git a/konqueror/settings/kio/kcookiesmain.h b/konqueror/settings/kio/kcookiesmain.h index 01d29b9949..c2a1a24a78 100644 --- a/konqueror/settings/kio/kcookiesmain.h +++ b/konqueror/settings/kio/kcookiesmain.h @@ -6,7 +6,9 @@ #ifndef __KCOOKIESMAIN_H #define __KCOOKIESMAIN_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT class QTabWidget; class KCookiesPolicies; diff --git a/konqueror/settings/kio/kcookiespolicies.h b/konqueror/settings/kio/kcookiespolicies.h index 1e23871ba9..de4b9227e7 100644 --- a/konqueror/settings/kio/kcookiespolicies.h +++ b/konqueror/settings/kio/kcookiespolicies.h @@ -27,7 +27,9 @@ #define __KCOOKIESPOLICIES_H #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "policydlg.h" #include "ui_kcookiespoliciesdlg_ui.h" diff --git a/konqueror/settings/kio/kproxydlg.h b/konqueror/settings/kio/kproxydlg.h index ac80e7ec0f..fec940afe2 100644 --- a/konqueror/settings/kio/kproxydlg.h +++ b/konqueror/settings/kio/kproxydlg.h @@ -22,7 +22,9 @@ #ifndef KPROXYDLG_H #define KPROXYDLG_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "ui_kproxydlg_ui.h" class QTabWidget; diff --git a/konqueror/settings/kio/main.h b/konqueror/settings/kio/main.h index 38b9f10bcc..f88190aacc 100644 --- a/konqueror/settings/kio/main.h +++ b/konqueror/settings/kio/main.h @@ -26,7 +26,9 @@ #include // KDE +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class QTabWidget; diff --git a/konqueror/settings/kio/netpref.h b/konqueror/settings/kio/netpref.h index 1a3f38023f..0263213a8e 100644 --- a/konqueror/settings/kio/netpref.h +++ b/konqueror/settings/kio/netpref.h @@ -1,7 +1,9 @@ #ifndef NETPREF_H #define NETPREF_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT class Q3GroupBox; class QCheckBox; diff --git a/konqueror/settings/kio/smbrodlg.h b/konqueror/settings/kio/smbrodlg.h index 8f21173221..ec7a91dc32 100644 --- a/konqueror/settings/kio/smbrodlg.h +++ b/konqueror/settings/kio/smbrodlg.h @@ -25,7 +25,9 @@ #include #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class KComboBox; diff --git a/konqueror/settings/kio/useragentdlg.h b/konqueror/settings/kio/useragentdlg.h index d3d9e66a19..8232265a6a 100644 --- a/konqueror/settings/kio/useragentdlg.h +++ b/konqueror/settings/kio/useragentdlg.h @@ -25,7 +25,9 @@ #ifndef _USERAGENTDLG_H #define _USERAGENTDLG_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "ui_useragentdlg_ui.h" class KConfig; diff --git a/konqueror/settings/konq/behaviour.h b/konqueror/settings/konq/behaviour.h index b26e2e7479..e0190dc16b 100644 --- a/konqueror/settings/konq/behaviour.h +++ b/konqueror/settings/konq/behaviour.h @@ -19,7 +19,9 @@ #ifndef BEHAVIOUR_H #define BEHAVIOUR_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include #include #include diff --git a/konqueror/settings/konq/browser.h b/konqueror/settings/konq/browser.h index 04bc06abdc..0b1d39cfcd 100644 --- a/konqueror/settings/konq/browser.h +++ b/konqueror/settings/konq/browser.h @@ -20,7 +20,9 @@ #ifndef __KBROWSER_OPTIONS_H__ #define __KBROWSER_OPTIONS_H__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class QTabWidget; diff --git a/konqueror/settings/konq/desktop.h b/konqueror/settings/konq/desktop.h index fc3f4d2acf..c544829d40 100644 --- a/konqueror/settings/konq/desktop.h +++ b/konqueror/settings/konq/desktop.h @@ -19,7 +19,9 @@ #ifndef __desktop_h__ #define __desktop_h__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT class QLabel; class QCheckBox; diff --git a/konqueror/settings/konq/desktopbehavior_impl.h b/konqueror/settings/konq/desktopbehavior_impl.h index 5702e680de..279f1f5fd3 100644 --- a/konqueror/settings/konq/desktopbehavior_impl.h +++ b/konqueror/settings/konq/desktopbehavior_impl.h @@ -23,7 +23,9 @@ #include "ui_desktopbehavior.h" #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT class QStringList; class DesktopBehaviorBase : public QWidget, public Ui::DesktopBehaviorBase diff --git a/konqueror/settings/konq/fontopts.h b/konqueror/settings/konq/fontopts.h index 9972a1e8b8..bd5a6c4c91 100644 --- a/konqueror/settings/konq/fontopts.h +++ b/konqueror/settings/konq/fontopts.h @@ -37,7 +37,9 @@ #include #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include #include diff --git a/konqueror/settings/konq/globalpaths.h b/konqueror/settings/konq/globalpaths.h index 284856ffb4..7e70730ed9 100644 --- a/konqueror/settings/konq/globalpaths.h +++ b/konqueror/settings/konq/globalpaths.h @@ -30,7 +30,9 @@ #ifndef __GLOBALPATHS_H #define __GLOBALPATHS_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include #include #include diff --git a/konqueror/settings/konq/previews.h b/konqueror/settings/konq/previews.h index 8ff1e06e62..ae2dd3cedf 100644 --- a/konqueror/settings/konq/previews.h +++ b/konqueror/settings/konq/previews.h @@ -35,7 +35,9 @@ Configuration of the maximum image size //Added by qt3to4: #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class QCheckBox; diff --git a/konqueror/settings/konqhtml/appearance.h b/konqueror/settings/konqhtml/appearance.h index 0470b69849..c1b08c7b69 100644 --- a/konqueror/settings/konqhtml/appearance.h +++ b/konqueror/settings/konqhtml/appearance.h @@ -14,7 +14,9 @@ #include #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class QSpinBox; diff --git a/konqueror/settings/konqhtml/filteropts.h b/konqueror/settings/konqhtml/filteropts.h index 2398bb6563..ee968458a1 100644 --- a/konqueror/settings/konqhtml/filteropts.h +++ b/konqueror/settings/konqhtml/filteropts.h @@ -18,7 +18,9 @@ #ifndef FILTEROPTS_H #define FILTEROPTS_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class QListWidget; diff --git a/konqueror/settings/konqhtml/generalopts.h b/konqueror/settings/konqhtml/generalopts.h index d81c082ccc..e3c405605b 100644 --- a/konqueror/settings/konqhtml/generalopts.h +++ b/konqueror/settings/konqhtml/generalopts.h @@ -12,7 +12,9 @@ #include #include +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class Ui_advancedTabOptions; diff --git a/konqueror/settings/konqhtml/htmlopts.h b/konqueror/settings/konqhtml/htmlopts.h index 754b9f782a..2b3814b94e 100644 --- a/konqueror/settings/konqhtml/htmlopts.h +++ b/konqueror/settings/konqhtml/htmlopts.h @@ -22,7 +22,9 @@ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class KIntNumInput; diff --git a/konqueror/settings/konqhtml/javaopts.h b/konqueror/settings/konqhtml/javaopts.h index 66ff50ff05..b145be9b1c 100644 --- a/konqueror/settings/konqhtml/javaopts.h +++ b/konqueror/settings/konqhtml/javaopts.h @@ -15,7 +15,9 @@ #ifndef __JAVAOPTS_H__ #define __JAVAOPTS_H__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "domainlistview.h" #include "policies.h" diff --git a/konqueror/settings/konqhtml/jsopts.h b/konqueror/settings/konqhtml/jsopts.h index bda8cbbf74..37070cb029 100644 --- a/konqueror/settings/konqhtml/jsopts.h +++ b/konqueror/settings/konqhtml/jsopts.h @@ -10,7 +10,9 @@ #ifndef __JSOPTS_H__ #define __JSOPTS_H__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "domainlistview.h" #include "jspolicies.h" diff --git a/konqueror/settings/konqhtml/main.h b/konqueror/settings/konqhtml/main.h index c6b9ba25d4..71e19dc595 100644 --- a/konqueror/settings/konqhtml/main.h +++ b/konqueror/settings/konqhtml/main.h @@ -26,7 +26,9 @@ #ifndef __MAIN_H__ #define __MAIN_H__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include class KJavaOptions; diff --git a/konqueror/settings/konqhtml/pluginopts.h b/konqueror/settings/konqhtml/pluginopts.h index ebc9ad2974..ec439c1a9c 100644 --- a/konqueror/settings/konqhtml/pluginopts.h +++ b/konqueror/settings/konqhtml/pluginopts.h @@ -18,7 +18,9 @@ class QCheckBox; +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include #include "ui_nsconfigwidget.h" diff --git a/konqueror/settings/performance/kcmperformance.h b/konqueror/settings/performance/kcmperformance.h index 743638ede9..e42f43ecd1 100644 --- a/konqueror/settings/performance/kcmperformance.h +++ b/konqueror/settings/performance/kcmperformance.h @@ -19,7 +19,9 @@ #ifndef _KCM_PERFORMANCE_H #define _KCM_PERFORMANCE_H +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT class QStringList; namespace KCMPerformance diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index 3978f82a25..20359e63f1 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -21,7 +21,9 @@ #ifndef __kcmhistory_h__ #define __kcmhistory_h__ +#define KDE3_SUPPORT #include +#undef KDE3_SUPPORT #include "ui_history_dlg.h" class KonqHistoryManager; diff --git a/konqueror/src/konqfactory.h b/konqueror/src/konqfactory.h index 5ca43b5aaf..170068281e 100644 --- a/konqueror/src/konqfactory.h +++ b/konqueror/src/konqfactory.h @@ -29,7 +29,7 @@ #include class KAboutData; -class KLibFactory; +class KPluginFactory; namespace KParts { class ReadOnlyPart; } class KonqViewFactory // TODO rename to KonqPartFactory? confusing though due to KParts::PartFactory (in the part itself) @@ -37,7 +37,7 @@ class KonqViewFactory // TODO rename to KonqPartFactory? confusing though due to public: KonqViewFactory() : m_factory( 0 ), m_createBrowser( false ) {} - KonqViewFactory( KLibFactory *factory, const QStringList &args, bool createBrowser ); + KonqViewFactory( KPluginFactory *factory, const QStringList &args, bool createBrowser ); KonqViewFactory( const KonqViewFactory &factory ) { (*this) = factory; } @@ -55,7 +55,7 @@ public: bool isNull() const { return m_factory ? false : true; } private: - KLibFactory *m_factory; + KPluginFactory *m_factory; QStringList m_args; bool m_createBrowser; };