mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
compile using KDE3_SUPPORT for KCModule; fix forward decl.
svn path=/trunk/KDE/kdebase/apps/; revision=705387
This commit is contained in:
parent
4293c6f655
commit
63b571ba5d
29 changed files with 59 additions and 3 deletions
|
@ -19,7 +19,9 @@
|
|||
#ifndef MAIN_H
|
||||
#define MAIN_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kemailsettings.h>
|
||||
|
||||
#include "ui_main_widget.h"
|
||||
|
|
|
@ -21,7 +21,9 @@
|
|||
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include "ui_csscustom.h"
|
||||
#include "ui_cssconfig.h"
|
||||
#include "ui_preview.h"
|
||||
|
|
|
@ -25,7 +25,9 @@
|
|||
#ifndef __MAIN_H__
|
||||
#define __MAIN_H__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <QtCore/QList>
|
||||
|
||||
#include "filteropts.h"
|
||||
|
|
|
@ -22,7 +22,9 @@
|
|||
#ifndef CACHE_H
|
||||
#define CACHE_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include "ui_cache_ui.h"
|
||||
|
||||
class CacheDlgUI : public QWidget, public Ui::CacheDlgUI
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
#ifndef __KCOOKIESMAIN_H
|
||||
#define __KCOOKIESMAIN_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
class QTabWidget;
|
||||
class KCookiesPolicies;
|
||||
|
|
|
@ -27,7 +27,9 @@
|
|||
#define __KCOOKIESPOLICIES_H
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
#include "policydlg.h"
|
||||
#include "ui_kcookiespoliciesdlg_ui.h"
|
||||
|
|
|
@ -22,7 +22,9 @@
|
|||
#ifndef KPROXYDLG_H
|
||||
#define KPROXYDLG_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include "ui_kproxydlg_ui.h"
|
||||
|
||||
class QTabWidget;
|
||||
|
|
|
@ -26,7 +26,9 @@
|
|||
#include <QtGui/QVBoxLayout>
|
||||
|
||||
// KDE
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kglobal.h>
|
||||
|
||||
class QTabWidget;
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
#ifndef NETPREF_H
|
||||
#define NETPREF_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
class Q3GroupBox;
|
||||
class QCheckBox;
|
||||
|
|
|
@ -25,7 +25,9 @@
|
|||
#include <QtGui/QLineEdit>
|
||||
#include <QtGui/QCheckBox>
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kcomponentdata.h>
|
||||
|
||||
class KComboBox;
|
||||
|
|
|
@ -25,7 +25,9 @@
|
|||
#ifndef _USERAGENTDLG_H
|
||||
#define _USERAGENTDLG_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include "ui_useragentdlg_ui.h"
|
||||
|
||||
class KConfig;
|
||||
|
|
|
@ -19,7 +19,9 @@
|
|||
#ifndef BEHAVIOUR_H
|
||||
#define BEHAVIOUR_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kconfig.h>
|
||||
#include <ksharedconfig.h>
|
||||
#include <QtCore/QStringList>
|
||||
|
|
|
@ -20,7 +20,9 @@
|
|||
#ifndef __KBROWSER_OPTIONS_H__
|
||||
#define __KBROWSER_OPTIONS_H__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kconfig.h>
|
||||
|
||||
class QTabWidget;
|
||||
|
|
|
@ -19,7 +19,9 @@
|
|||
#ifndef __desktop_h__
|
||||
#define __desktop_h__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
class QLabel;
|
||||
class QCheckBox;
|
||||
|
|
|
@ -23,7 +23,9 @@
|
|||
|
||||
#include "ui_desktopbehavior.h"
|
||||
#include <kconfig.h>
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
class QStringList;
|
||||
|
||||
class DesktopBehaviorBase : public QWidget, public Ui::DesktopBehaviorBase
|
||||
|
|
|
@ -37,7 +37,9 @@
|
|||
#include <QtCore/QStringList>
|
||||
#include <QtGui/QSpinBox>
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kconfig.h>
|
||||
#include <ksharedconfig.h>
|
||||
|
||||
|
|
|
@ -30,7 +30,9 @@
|
|||
#ifndef __GLOBALPATHS_H
|
||||
#define __GLOBALPATHS_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kio/global.h>
|
||||
#include <kio/udsentry.h>
|
||||
#include <kurl.h>
|
||||
|
|
|
@ -35,7 +35,9 @@ Configuration of the maximum image size
|
|||
//Added by qt3to4:
|
||||
#include <Qt3Support/Q3PtrList>
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
class QCheckBox;
|
||||
|
|
|
@ -14,7 +14,9 @@
|
|||
#include <QtGui/QWidget>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kconfig.h>
|
||||
|
||||
class QSpinBox;
|
||||
|
|
|
@ -18,7 +18,9 @@
|
|||
#ifndef FILTEROPTS_H
|
||||
#define FILTEROPTS_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <ksharedconfig.h>
|
||||
|
||||
class QListWidget;
|
||||
|
|
|
@ -12,7 +12,9 @@
|
|||
#include <QtGui/QCheckBox>
|
||||
#include <QtGui/QComboBox>
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <ksharedconfig.h>
|
||||
|
||||
class Ui_advancedTabOptions;
|
||||
|
|
|
@ -22,7 +22,9 @@
|
|||
|
||||
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <ksharedconfig.h>
|
||||
class KIntNumInput;
|
||||
|
||||
|
|
|
@ -15,7 +15,9 @@
|
|||
#ifndef __JAVAOPTS_H__
|
||||
#define __JAVAOPTS_H__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
#include "domainlistview.h"
|
||||
#include "policies.h"
|
||||
|
|
|
@ -10,7 +10,9 @@
|
|||
#ifndef __JSOPTS_H__
|
||||
#define __JSOPTS_H__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
#include "domainlistview.h"
|
||||
#include "jspolicies.h"
|
||||
|
|
|
@ -26,7 +26,9 @@
|
|||
#ifndef __MAIN_H__
|
||||
#define __MAIN_H__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <ksharedconfig.h>
|
||||
|
||||
class KJavaOptions;
|
||||
|
|
|
@ -18,7 +18,9 @@
|
|||
|
||||
class QCheckBox;
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include <kconfig.h>
|
||||
#include "ui_nsconfigwidget.h"
|
||||
|
||||
|
|
|
@ -19,7 +19,9 @@
|
|||
#ifndef _KCM_PERFORMANCE_H
|
||||
#define _KCM_PERFORMANCE_H
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
class QStringList;
|
||||
|
||||
namespace KCMPerformance
|
||||
|
|
|
@ -21,7 +21,9 @@
|
|||
#ifndef __kcmhistory_h__
|
||||
#define __kcmhistory_h__
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include <kcmodule.h>
|
||||
#undef KDE3_SUPPORT
|
||||
#include "ui_history_dlg.h"
|
||||
|
||||
class KonqHistoryManager;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <kservice.h>
|
||||
|
||||
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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue