Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: namespaced Qt4/Katie build fixes

Browse source 
most of the changes were done trought Katie's namefsck script which
convertes forward class declarations to include directives, however
other fixes here and there were needed as well as some questionable
changes to Q_DECLARE_TYPEINFO() macro calls because they most likely
have to do the namespacing themselfs (QT_BEGIN/END_NAMESPACE, and
probably will be in Katie) meaning that some of the changes may be
temporary and reverted later.

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2017-08-04 09:17:49 +00:00
parent 74c0d28e38
commit 61333c4671
368 changed files with 746 additions and 733 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dnssd/avahi-servicebrowser_p.h
View file

@ -32,7 +32,7 @@ namespace DNSSD
class ServiceBrowserPrivate : public QObject class ServiceBrowserPrivate : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
ServiceBrowserPrivate(ServiceBrowser* parent) : QObject(), m_running(false), m_browser(0), m_parent(parent) ServiceBrowserPrivate(ServiceBrowser* parent) : QObject(), m_running(false), m_browser(0), m_parent(parent)
{} {}

2
dnssd/avahi-servicetypebrowser_p.h
View file

@ -31,7 +31,7 @@ namespace DNSSD
class ServiceTypeBrowserPrivate : public QObject class ServiceTypeBrowserPrivate : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
ServiceTypeBrowserPrivate(ServiceTypeBrowser* parent) : m_browser(0), m_parent(parent),m_started(false) {} ServiceTypeBrowserPrivate(ServiceTypeBrowser* parent) : m_browser(0), m_parent(parent),m_started(false) {}
~ServiceTypeBrowserPrivate() { if (m_browser) m_browser->Free(); } ~ServiceTypeBrowserPrivate() { if (m_browser) m_browser->Free(); }

2
dnssd/domainbrowser.h
View file

@ -22,9 +22,9 @@
#define DNSSDDOMAINBROWSER_H #define DNSSDDOMAINBROWSER_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QStringList>
#include <dnssd/remoteservice.h> #include <dnssd/remoteservice.h>
class QStringList;
namespace DNSSD namespace DNSSD
{ {
class DomainBrowserPrivate; class DomainBrowserPrivate;

2
dnssd/mdnsd-domainbrowser_p.h
View file

@ -21,9 +21,9 @@
#ifndef MDNSD_DOMAINBROWSER_P_H #ifndef MDNSD_DOMAINBROWSER_P_H
#define MDNSD_DOMAINBROWSER_P_H #define MDNSD_DOMAINBROWSER_P_H
#include <QtCore/QStringList>
#include "mdnsd-responder.h" #include "mdnsd-responder.h"
#include "domainbrowser.h" #include "domainbrowser.h"
#include <QtCore/QStringList>
namespace DNSSD namespace DNSSD
{ {

2
dnssd/publicservice.h
View file

@ -22,8 +22,8 @@
#define DNSSDPUBLICSERVICE_H #define DNSSDPUBLICSERVICE_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <dnssd/servicebase.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <dnssd/servicebase.h>
namespace DNSSD namespace DNSSD
{ {

2
dnssd/servicetypebrowser.h
View file

@ -22,9 +22,9 @@
#define DNSSDSERVICETYPEBROWSER_H #define DNSSDSERVICETYPEBROWSER_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QStringList>
#include <dnssd/remoteservice.h> #include <dnssd/remoteservice.h>
class QStringList;
namespace DNSSD namespace DNSSD
{ {
class ServiceTypeBrowserPrivate; class ServiceTypeBrowserPrivate;

3
interfaces/ktexteditor/annotationinterface.h
View file

@ -24,8 +24,7 @@
#include <ktexteditor/ktexteditor_export.h> #include <ktexteditor/ktexteditor_export.h>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtGui/QMenu>
class QMenu;
namespace KTextEditor namespace KTextEditor
{ {

2
interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h
View file

@ -25,7 +25,7 @@
#include <ktexteditor/cursor.h> #include <ktexteditor/cursor.h>
#include "codecompletionmodel.h" #include "codecompletionmodel.h"
class QModelIndex; #include <QModelIndex>
namespace KTextEditor { namespace KTextEditor {
class View; class View;

2
interfaces/ktexteditor/commandinterface.h
View file

@ -25,8 +25,8 @@
#include <ktexteditor/ktexteditor_export.h> #include <ktexteditor/ktexteditor_export.h>
#include <ktexteditor/range.h> #include <ktexteditor/range.h>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QStringList>
class QStringList;
class KCompletion; class KCompletion;
namespace KTextEditor namespace KTextEditor

2
interfaces/ktexteditor/editorchooser.h
View file

@ -23,10 +23,10 @@
#include <ktexteditor/document.h> #include <ktexteditor/document.h>
#include <ktexteditor/editor.h> #include <ktexteditor/editor.h>
#include <QtCore/QString>
#include <QtGui/QWidget> #include <QtGui/QWidget>
class KConfig; class KConfig;
class QString;
namespace KTextEditor namespace KTextEditor
{ {

7
interfaces/ktexteditor/markinterface.h
View file

@ -25,10 +25,9 @@
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QPoint>
class QPixmap; #include <QtGui/QPixmap>
class QPoint; #include <QtGui/QMenu>
class QMenu;
namespace KTextEditor namespace KTextEditor
{ {

2
interfaces/ktexteditor/searchinterface.h
View file

@ -24,7 +24,7 @@
#include <ktexteditor/ktexteditor_export.h> #include <ktexteditor/ktexteditor_export.h>
#include <ktexteditor/range.h> #include <ktexteditor/range.h>
class QString; #include <QString>
namespace KTextEditor namespace KTextEditor
{ {

2
interfaces/ktexteditor/smartinterface.h
View file

@ -23,7 +23,7 @@
#include <ktexteditor/ktexteditor_export.h> #include <ktexteditor/ktexteditor_export.h>
#include <ktexteditor/smartrange.h> #include <ktexteditor/smartrange.h>
class QMutex; #include <QMutex>
namespace KTextEditor namespace KTextEditor
{ {

2
interfaces/ktexteditor/smartrange.h
View file

@ -28,7 +28,7 @@
#include <QtCore/QList> #include <QtCore/QList>
#ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef DOXYGEN_SHOULD_SKIP_THIS
template <class T> class QStack; #include <QStack>
#endif #endif
class KAction; class KAction;

2
interfaces/ktexteditor/variableinterface.h
View file

@ -26,7 +26,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QString; #include <QString>
namespace KTextEditor { namespace KTextEditor {

2
interfaces/ktexteditor/view.h
View file

@ -29,7 +29,7 @@
// widget // widget
#include <QtGui/QWidget> #include <QtGui/QWidget>
class QMenu; #include <QMenu>
namespace KTextEditor namespace KTextEditor
{ {

2
interfaces/terminal/kde_terminal_interface.h
View file

@ -21,7 +21,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QStringList; #include <QStringList>
/** /**
* TerminalInterface is an interface implemented by KonsolePart to * TerminalInterface is an interface implemented by KonsolePart to

4
kcddb/libkcddb/cdinfodialog.h
View file

@ -26,8 +26,8 @@
#include <kdialog.h> #include <kdialog.h>
class QStandardItemModel; #include <QStandardItemModel>
class QModelIndex; #include <QModelIndex>
namespace KCDDB namespace KCDDB
{ {

4
kdeclarative/bindings/i18n_p.h
View file

@ -21,8 +21,8 @@
#include <QtScript/QScriptValue> #include <QtScript/QScriptValue>
class QScriptContext; #include <QScriptContext>
class QScriptEngine; #include <QScriptEngine>
QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine); QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine);
QScriptValue jsi18nc(QScriptContext *context, QScriptEngine *engine); QScriptValue jsi18nc(QScriptContext *context, QScriptEngine *engine);

4
kdeclarative/kdeclarative.h
View file

@ -24,8 +24,8 @@
#include <QStringList> #include <QStringList>
class QDeclarativeEngine; #include <QDeclarativeEngine>
class QScriptEngine; #include <QScriptEngine>
class KDeclarativePrivate; class KDeclarativePrivate;

6
kdecore/date/kcalendarsystemprivate_p.h
View file

@ -20,9 +20,9 @@
#ifndef KCALENDARSYSTEMPRIVATE_H #ifndef KCALENDARSYSTEMPRIVATE_H
#define KCALENDARSYSTEMPRIVATE_H #define KCALENDARSYSTEMPRIVATE_H
class QChar; #include <QChar>
class QString; #include <QString>
class QDate; #include <QDate>
class KCalendarSystem; class KCalendarSystem;
class KCalendarEra; class KCalendarEra;

4
kdecore/date/kdatetime.cpp
View file

@ -242,6 +242,7 @@ bool KDateTime::Spec::equivalentTo(const Spec &other) const
} }
} }
QT_BEGIN_NAMESPACE
QDataStream & operator<<(QDataStream &s, const KDateTime::Spec &spec) QDataStream & operator<<(QDataStream &s, const KDateTime::Spec &spec)
{ {
// The specification type is encoded in order to insulate from changes // The specification type is encoded in order to insulate from changes
@ -303,6 +304,7 @@ QDataStream & operator>>(QDataStream &s, KDateTime::Spec &spec)
} }
return s; return s;
} }
QT_END_NAMESPACE
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
@ -2434,6 +2436,7 @@ KDateTime KDateTime::realCurrentLocalDateTime()
#endif #endif
} }
QT_BEGIN_NAMESPACE
QDataStream & operator<<(QDataStream &s, const KDateTime &dt) QDataStream & operator<<(QDataStream &s, const KDateTime &dt)
{ {
s << dt.date() << dt.time() << dt.timeSpec() << quint8(dt.isDateOnly() ? 0x01 : 0x00); s << dt.date() << dt.time() << dt.timeSpec() << quint8(dt.isDateOnly() ? 0x01 : 0x00);
@ -2453,6 +2456,7 @@ QDataStream & operator>>(QDataStream &s, KDateTime &kdt)
kdt = KDateTime(d, t, spec); kdt = KDateTime(d, t, spec);
return s; return s;
} }
QT_END_NAMESPACE
/* /*

6
kdecore/date/kdatetime.h
View file

@ -28,9 +28,9 @@
#include <ktimezone.h> #include <ktimezone.h>
#include <QtCore/qmetatype.h> #include <QMetaType>
#include <QDataStream>
class QDataStream;
class KDateTimePrivate; class KDateTimePrivate;
class KDateTimeSpecPrivate; class KDateTimeSpecPrivate;
@ -1626,6 +1626,7 @@ class KDECORE_EXPORT KDateTime //krazy:exclude=dpointer (implicitly shared)
Q_DECLARE_METATYPE(KDateTime) Q_DECLARE_METATYPE(KDateTime)
Q_DECLARE_METATYPE(KDateTime::Spec) Q_DECLARE_METATYPE(KDateTime::Spec)
QT_BEGIN_NAMESPACE
/** Write @p spec to the datastream @p out, in binary format. */ /** Write @p spec to the datastream @p out, in binary format. */
QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime::Spec &spec); QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime::Spec &spec);
/** Read a KDateTime::Spec object into @p spec from @p in, in binary format. */ /** Read a KDateTime::Spec object into @p spec from @p in, in binary format. */
@ -1635,5 +1636,6 @@ QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime::Spec &spec);
QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime); QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
/** Read a KDateTime object into @p dateTime from @p in, in binary format. */ /** Read a KDateTime object into @p dateTime from @p in, in binary format. */
QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime); QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
QT_END_NAMESPACE
#endif #endif

8
kdecore/date/kdatetimeformatter_p.h
View file

@ -23,10 +23,10 @@
#include "klocale.h" #include "klocale.h"
#include "kglobal.h" #include "kglobal.h"
class QChar; #include <QChar>
class QString; #include <QString>
class QDate; #include <QDate>
class QTime; #include <QTime>
class KDateTime; class KDateTime;
class KCalendarSystem; class KCalendarSystem;

8
kdecore/date/kdatetimeparser_p.h
View file

@ -23,10 +23,10 @@
#include "klocale.h" #include "klocale.h"
#include "kglobal.h" #include "kglobal.h"
class QChar; #include <QChar>
class QString; #include <QString>
class QDate; #include <QDate>
class QTime; #include <QTime>
class KDateTime; class KDateTime;
class KCalendarSystem; class KCalendarSystem;

6
kdecore/date/kdayperiod_p.h
View file

@ -25,9 +25,9 @@
#include "klocale.h" #include "klocale.h"
#include <kdecore_export.h> #include <kdecore_export.h>
class QDate; #include <QDate>
class QString; #include <QString>
class QTime; #include <QTime>
class KDayPeriodPrivate; class KDayPeriodPrivate;

2
kdecore/date/klocalizeddate.cpp
View file

@ -587,6 +587,7 @@ bool KLocalizedDate::operator>=(const QDate &rhs) const
return (date() >= rhs); return (date() >= rhs);
} }
QT_BEGIN_NAMESPACE
QDataStream &operator<<(QDataStream &out, const KLocalizedDate &date) QDataStream &operator<<(QDataStream &out, const KLocalizedDate &date)
{ {
return out << (quint32)(date.toJulianDay()) << date.calendar()->calendarSystem(); return out << (quint32)(date.toJulianDay()) << date.calendar()->calendarSystem();
@ -614,3 +615,4 @@ QDebug operator<<(QDebug dbg, const KLocalizedDate &date)
} }
return dbg.space(); return dbg.space();
} }
QT_END_NAMESPACE

2
kdecore/date/klocalizeddate.h
View file

@ -1157,6 +1157,7 @@ private:
Q_DECLARE_METATYPE(KLocalizedDate) Q_DECLARE_METATYPE(KLocalizedDate)
QT_BEGIN_NAMESPACE
/** /**
* Data stream output operator * Data stream output operator
* *
@ -1180,5 +1181,6 @@ QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
* @param date the date to write to the stream * @param date the date to write to the stream
*/ */
QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date); QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date);
QT_END_NAMESPACE
#endif // KLOCALIZEDDATE_H #endif // KLOCALIZEDDATE_H

2
kdecore/io/kdebug.h
View file

@ -192,7 +192,7 @@ KDECORE_EXPORT QDebug perror(QDebug, KDebugTag);
// operators for KDE types // operators for KDE types
class KUrl; class KUrl;
class KDateTime; class KDateTime;
class QObject; #include <QObject>
KDECORE_EXPORT QDebug operator<<(QDebug s, const KUrl &url); KDECORE_EXPORT QDebug operator<<(QDebug s, const KUrl &url);
KDECORE_EXPORT QDebug operator<<(QDebug s, const KDateTime &time); KDECORE_EXPORT QDebug operator<<(QDebug s, const KDateTime &time);

1
kdecore/io/kdirwatch_p.h
View file

@ -34,6 +34,7 @@
#include <QtCore/qmap.h> #include <QtCore/qmap.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qtimer.h> #include <QtCore/qtimer.h>
#include <QtCore/qsocketnotifier.h>
#ifdef HAVE_FAM #ifdef HAVE_FAM
#include <limits.h> #include <limits.h>

4
kdecore/jobs/kjob_p.h
View file

@ -26,8 +26,8 @@
#include <QtCore/qmap.h> #include <QtCore/qmap.h>
class KJobUiDelegate; class KJobUiDelegate;
class QTimer; #include <QTimer>
class QEventLoop; #include <QEventLoop>
// This is a private class, but it's exported for // This is a private class, but it's exported for
// KIO::Job's usage. Other Job classes in kdelibs may // KIO::Job's usage. Other Job classes in kdelibs may

4
kdecore/kernel/kauthorized.h
View file

@ -24,8 +24,8 @@
#include <kdecore_export.h> #include <kdecore_export.h>
class KUrl; class KUrl;
class QString; #include <QString>
class QStringList; #include <QStringList>
/** /**
* Extracted from kapplication (3.x). Kiosk authorization framework * Extracted from kapplication (3.x). Kiosk authorization framework

47
kdecore/localization/kcatalog.cpp
View file

@ -31,37 +31,13 @@
#include <locale.h> #include <locale.h>
#include "gettext.h" #include "gettext.h"
static bool s_localeSet = false;
// Initialize the locale very early during application startup
// This is necessary for e.g. toLocal8Bit() to work, even before
// a Q[Core]Application exists (David)
int kInitializeLocale()
{
setlocale(LC_ALL, "");
extern Q_CORE_EXPORT bool qt_locale_initialized; // in Qt since 4.5.0
qt_locale_initialized = true; // as recommended by Thiago
s_localeSet = true;
return 1;
}
Q_CONSTRUCTOR_FUNCTION(kInitializeLocale)
// not defined on win32 :( // not defined on win32 :(
static char *langenv = 0; static char *langenv = 0;
static const int langenvMaxlen = 42; static const int langenvMaxlen = 42;
// = "LANGUAGE=" + 32 chars for language code + terminating zero // = "LANGUAGE=" + 32 chars for language code + terminating zero
class KCatalogStaticData Q_GLOBAL_STATIC(QMutex, catalogLock)
{
public:
KCatalogStaticData() {}
QMutex mutex;
};
K_GLOBAL_STATIC(KCatalogStaticData, catalogStaticData)
class KCatalogPrivate class KCatalogPrivate
{ {
@ -93,10 +69,7 @@ QByteArray KCatalogPrivate::currentLanguage;
KCatalog::KCatalog(const QString & name, const QString & language ) KCatalog::KCatalog(const QString & name, const QString & language )
: d( new KCatalogPrivate ) : d( new KCatalogPrivate )
{ {
// Set locales if the static initializer didn't work setlocale(LC_ALL, "");
if (!s_localeSet) {
kInitializeLocale();
}
// Find locale directory for this catalog. // Find locale directory for this catalog.
QString localeDir = catalogLocaleDir( name, language ); QString localeDir = catalogLocaleDir( name, language );
@ -203,7 +176,7 @@ void KCatalogPrivate::resetSystemLanguage ()
QString KCatalog::translate(const char * msgid) const QString KCatalog::translate(const char * msgid) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dgettext(d->name, msgid); const char *msgstr = dgettext(d->name, msgid);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -212,7 +185,7 @@ QString KCatalog::translate(const char * msgid) const
QString KCatalog::translate(const char * msgctxt, const char * msgid) const QString KCatalog::translate(const char * msgctxt, const char * msgid) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid); const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -222,7 +195,7 @@ QString KCatalog::translate(const char * msgctxt, const char * msgid) const
QString KCatalog::translate(const char * msgid, const char * msgid_plural, QString KCatalog::translate(const char * msgid, const char * msgid_plural,
unsigned long n) const unsigned long n) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dngettext(d->name, msgid, msgid_plural, n); const char *msgstr = dngettext(d->name, msgid, msgid_plural, n);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -232,7 +205,7 @@ QString KCatalog::translate(const char * msgid, const char * msgid_plural,
QString KCatalog::translate(const char * msgctxt, const char * msgid, QString KCatalog::translate(const char * msgctxt, const char * msgid,
const char * msgid_plural, unsigned long n) const const char * msgid_plural, unsigned long n) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n); const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -241,7 +214,7 @@ QString KCatalog::translate(const char * msgctxt, const char * msgid,
QString KCatalog::translateStrict(const char * msgid) const QString KCatalog::translateStrict(const char * msgid) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dgettext(d->name, msgid); const char *msgstr = dgettext(d->name, msgid);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -250,7 +223,7 @@ QString KCatalog::translateStrict(const char * msgid) const
QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) const QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid); const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -260,7 +233,7 @@ QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) cons
QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural, QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural,
unsigned long n) const unsigned long n) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dngettext(d->name, msgid, msgid_plural, n); const char *msgstr = dngettext(d->name, msgid, msgid_plural, n);
d->resetSystemLanguage(); d->resetSystemLanguage();
@ -270,7 +243,7 @@ QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural,
QString KCatalog::translateStrict(const char * msgctxt, const char * msgid, QString KCatalog::translateStrict(const char * msgctxt, const char * msgid,
const char * msgid_plural, unsigned long n) const const char * msgid_plural, unsigned long n) const
{ {
QMutexLocker locker(&catalogStaticData->mutex); QMutexLocker locker(catalogLock());
d->setupGettextEnv(); d->setupGettextEnv();
const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n); const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n);
d->resetSystemLanguage(); d->resetSystemLanguage();

8
kdecore/localization/kcharsets.h
View file

@ -25,10 +25,10 @@
class KCharsets; class KCharsets;
class KCharsetsPrivate; class KCharsetsPrivate;
class QChar; #include <QChar>
class QString; #include <QString>
class QStringList; #include <QStringList>
class QTextCodec; #include <QTextCodec>
namespace KGlobal namespace KGlobal
{ {

6
kdecore/localization/kcurrencycode.h
View file

@ -25,9 +25,9 @@
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
class QDate; #include <QDate>
class QStringList; #include <QStringList>
class QFileInfo; #include <QFileInfo>
class KCurrencyCodePrivate; class KCurrencyCodePrivate;

4
kdecore/localization/kencodingdetector.h
View file

@ -26,8 +26,8 @@
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
class QTextCodec; #include <QTextCodec>
class QTextDecoder; #include <QTextDecoder>
class KEncodingDetectorPrivate; class KEncodingDetectorPrivate;
/** /**

2
kdecore/localization/klocale_p.h
View file

@ -24,7 +24,7 @@
#include "klocale.h" #include "klocale.h"
#include "kdayperiod_p.h" #include "kdayperiod_p.h"
class QMutex; #include <QMutex>
class KCatalog; class KCatalog;

2
kdecore/network/klocalsocket_p.h
View file

@ -24,7 +24,7 @@
#include "klocalsocket.h" #include "klocalsocket.h"
#define MIN_SOCKADDR_UN_LEN (sizeof(quint16) + sizeof(char)) #define MIN_SOCKADDR_UN_LEN (sizeof(quint16) + sizeof(char))
class QSocketNotifier; #include <QSocketNotifier>
class KLocalSocketPrivate class KLocalSocketPrivate
{ {

8
kdecore/network/ksocketfactory.h
View file

@ -26,10 +26,10 @@
#include <QtNetwork/QNetworkProxy> #include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QHostAddress> #include <QtNetwork/QHostAddress>
class QTcpSocket; #include <QTcpSocket>
class QTcpServer; #include <QTcpServer>
class QUdpSocket; #include <QUdpSocket>
class QUrl; #include <QUrl>
/** /**
* @namespace KSocketFactory * @namespace KSocketFactory

2
kdecore/network/ksslcertificatemanager.h
View file

@ -27,7 +27,7 @@
#include <QtNetwork/QSslError> #include <QtNetwork/QSslError>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
class QSslCertificate; #include <QSslCertificate>
class KSslCertificateRulePrivate; class KSslCertificateRulePrivate;
class KSslCertificateManagerPrivate; class KSslCertificateManagerPrivate;

4
kdecore/network/kssld/kssld.h
View file

@ -28,8 +28,8 @@
class KSSLDPrivate; class KSSLDPrivate;
class KSslCertificateRule; class KSslCertificateRule;
class QSslCertificate; #include <QSslCertificate>
class QString; #include <QString>
class KSSLD : public KDEDModule class KSSLD : public KDEDModule
{ {

2
kdecore/network/kssld/kssld_dbusmetatypes.h
View file

@ -31,6 +31,7 @@ Q_DECLARE_METATYPE(QList<QSslCertificate>)
Q_DECLARE_METATYPE(KSslError::Error) Q_DECLARE_METATYPE(KSslError::Error)
Q_DECLARE_METATYPE(QList<KSslError::Error>) Q_DECLARE_METATYPE(QList<KSslError::Error>)
QT_BEGIN_NAMESPACE
QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert)
{ {
@ -102,6 +103,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, KSslError::Error
return argument; return argument;
} }
QT_END_NAMESPACE
static void registerMetaTypesForKSSLD() static void registerMetaTypesForKSSLD()
{ {

2
kdecore/network/ktcpsocket.h
View file

@ -138,7 +138,7 @@ private:
//TODO protocol (or maybe even application?) dependent automatic proxy choice //TODO protocol (or maybe even application?) dependent automatic proxy choice
class KTcpSocketPrivate; class KTcpSocketPrivate;
class QHostAddress; #include <QHostAddress>
class KUrl; class KUrl;
class KDECORE_EXPORT KTcpSocket: public QIODevice class KDECORE_EXPORT KTcpSocket: public QIODevice

4
kdecore/services/kmimeglobsfileparser_p.h
View file

@ -23,8 +23,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <QtCore/QHash> #include <QtCore/QHash>
class QIODevice; #include <QIODevice>
class QString; #include <QString>
/** /**
* @internal * @internal

2
kdecore/services/kmimemagicrule_p.h
View file

@ -23,7 +23,7 @@
#include <QList> #include <QList>
#include <QString> #include <QString>
class QIODevice; #include <QIODevice>
/** /**
* @internal * @internal

5
kdecore/services/kservice.h
View file

@ -27,10 +27,11 @@
#include <ksycocaentry.h> #include <ksycocaentry.h>
#include <klocale.h> #include <klocale.h>
#include <QDataStream>
#include <QWidget>
class KServiceType; class KServiceType;
class QDataStream;
class KDesktopFile; class KDesktopFile;
class QWidget;
class KServicePrivate; class KServicePrivate;

4
kdecore/services/kserviceaction.h
View file

@ -21,10 +21,11 @@
#define KSERVICEACTION_H #define KSERVICEACTION_H
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <QtCore/qdatastream.h> #include <QtCore/qdatastream.h>
#include <QtCore/qvariant.h>
class QVariant;
class KServiceActionPrivate; class KServiceActionPrivate;
/** /**
@ -115,6 +116,7 @@ private:
friend KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act ); friend KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act );
}; };
// FIXME: namespace the operators via QT_BEGIN_NAMEPSACE/QT_END_NAMESPACE
KDECORE_EXPORT QDataStream& operator>>( QDataStream& str, KServiceAction& act ); KDECORE_EXPORT QDataStream& operator>>( QDataStream& str, KServiceAction& act );
KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act ); KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act );

3
kdecore/services/kservicetype.cpp
View file

@ -31,9 +31,6 @@
extern int servicesDebugArea(); extern int servicesDebugArea();
template QDataStream& operator>> <QString, QVariant>(QDataStream&, QMap<QString, QVariant>&);
template QDataStream& operator<< <QString, QVariant>(QDataStream&, const QMap<QString, QVariant>&);
KServiceType::KServiceType( KServiceTypePrivate &dd, const QString& _name, KServiceType::KServiceType( KServiceTypePrivate &dd, const QString& _name,
const QString& _comment ) const QString& _comment )
: KSycocaEntry(dd) : KSycocaEntry(dd)

2
kdecore/services/kservicetype.h
View file

@ -178,7 +178,9 @@ private:
Q_DECLARE_PRIVATE(KServiceType) Q_DECLARE_PRIVATE(KServiceType)
}; };
//QT_BEGIN_NAMESPACE
//QDataStream& operator>>( QDataStream& _str, KServiceType& s ); //QDataStream& operator>>( QDataStream& _str, KServiceType& s );
//QDataStream& operator<<( QDataStream& _str, KServiceType& s ); //QDataStream& operator<<( QDataStream& _str, KServiceType& s );
//QT_END_NAMESPACE
#endif #endif

2
kdecore/sycoca/kprotocolinfo.cpp
View file

@ -473,6 +473,7 @@ bool KProtocolInfo::isKnownProtocol( const QString &protocol )
return prot || isHelperProtocol(protocol); return prot || isHelperProtocol(protocol);
} }
QT_BEGIN_NAMESPACE
QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field ) { QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field ) {
s >> field.name; s >> field.name;
int type; int type;
@ -486,3 +487,4 @@ QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field
s << static_cast<int>( field.type ); s << static_cast<int>( field.type );
return s; return s;
} }
QT_END_NAMESPACE

4
kdecore/sycoca/kprotocolinfo.h
View file

@ -23,7 +23,7 @@
#include <ksycocaentry.h> #include <ksycocaentry.h>
#include <kservice.h> #include <kservice.h>
class QDataStream; #include <QDataStream>
class KProtocolInfoPrivate; class KProtocolInfoPrivate;
/** /**
@ -370,7 +370,9 @@ private:
}; };
QT_BEGIN_NAMESPACE
KDECORE_EXPORT QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field ); KDECORE_EXPORT QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field );
KDECORE_EXPORT QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field ); KDECORE_EXPORT QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field );
QT_END_NAMESPACE
#endif #endif

2
kdecore/sycoca/ksycoca.h
View file

@ -26,7 +26,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QStringList> #include <QtCore/QStringList>
class QDataStream; #include <QDataStream>
class KSycocaFactory; class KSycocaFactory;
class KSycocaFactoryList; class KSycocaFactoryList;
class KSycocaPrivate; class KSycocaPrivate;

4
kdecore/sycoca/ksycocadict_p.h
View file

@ -24,8 +24,8 @@
#include <QList> #include <QList>
class QString; #include <QString>
class QDataStream; #include <QDataStream>
/** /**
* @internal * @internal

6
kdecore/sycoca/ksycocafactory.h
View file

@ -21,11 +21,11 @@
#include <ksycocaentry.h> #include <ksycocaentry.h>
class QString; #include <QString>
class KSycocaDict; class KSycocaDict;
class KSycocaResourceList; class KSycocaResourceList;
template <typename T> class QList; #include <QList>
template <typename KT, typename VT> class QHash; #include <QHash>
typedef QHash<QString, KSycocaEntry::Ptr> KSycocaEntryDict; typedef QHash<QString, KSycocaEntry::Ptr> KSycocaEntryDict;

4
kdecore/tests/kcalendartest.h
View file

@ -25,8 +25,8 @@
#include "klocale.h" #include "klocale.h"
class QString; #include <QString>
class QDate; #include <QDate>
class KCalendarSystem; class KCalendarSystem;

4
kdecore/tests/kdatetimeformattertest.h
View file

@ -24,8 +24,8 @@
#include "kdatetimeformatter_p.h" #include "kdatetimeformatter_p.h"
class QString; #include <QString>
class QDate; #include <QDate>
class KCalendarSystem; class KCalendarSystem;

2
kdecore/tests/kdirwatchtest_gui.h
View file

@ -22,7 +22,7 @@
#include <QtGui/QDialog> #include <QtGui/QDialog>
class QTextBrowser; #include <QTextBrowser>
class KDirWatchTest_GUI : public QWidget class KDirWatchTest_GUI : public QWidget
{ {

4
kdecore/tests/ktcpsockettest.h
View file

@ -47,8 +47,8 @@ public Q_SLOTS: //auxiliary slots to check signal emission from the socket
}; };
class QTcpServer; #include <QTcpServer>
class QTcpSocket; #include <QTcpSocket>
class Server : public QObject class Server : public QObject
{ {

2
kdecore/util/kautostart.h
View file

@ -24,7 +24,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QStringList; #include <QStringList>
/** /**
* KAutostart provides a programmatic means to control the state of * KAutostart provides a programmatic means to control the state of

2
kdecore/util/kdedmodule.h
View file

@ -30,7 +30,7 @@
class KDEDModulePrivate; class KDEDModulePrivate;
class Kded; class Kded;
class QDBusObjectPath; #include <QDBusObjectPath>
/** /**
* \class KDEDModule kdedmodule.h <KDEDModule> * \class KDEDModule kdedmodule.h <KDEDModule>

6
kdecore/util/kmacroexpander.h
View file

@ -25,9 +25,9 @@
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QChar> #include <QtCore/QChar>
class QString; #include <QString>
class QStringList; #include <QStringList>
template <typename KT, typename VT> class QHash; #include <QHash>
class KMacroExpanderBasePrivate; class KMacroExpanderBasePrivate;
/** /**

4
kdecore/util/kshell.h
View file

@ -24,8 +24,8 @@
#include <kdecore_export.h> #include <kdecore_export.h>
#include <qglobal.h> #include <qglobal.h>
class QStringList; #include <QStringList>
class QString; #include <QString>
/** /**
* \namespace KShell * \namespace KShell

2
kdecore/util/kshell_p.h
View file

@ -22,7 +22,7 @@
#ifndef KSHELL_P_H #ifndef KSHELL_P_H
#define KSHELL_P_H #define KSHELL_P_H
class QString; #include <QString>
namespace KShell { namespace KShell {

6
kdecore/util/kuser.h
View file

@ -28,9 +28,9 @@
#include <QtCore/QVariant> #include <QtCore/QVariant>
class KUserGroup; class KUserGroup;
class QString; #include <QString>
class QStringList; #include <QStringList>
template <class T> class QList; #include <QList>
#include <sys/types.h> #include <sys/types.h>
typedef uid_t K_UID; typedef uid_t K_UID;

4
kdecore/util/qtest_kde.cpp
View file

@ -54,10 +54,14 @@ private:
// Unit test for this code: tests/kglobaltest.cpp // Unit test for this code: tests/kglobaltest.cpp
QT_BEGIN_NAMESPACE
bool QTest::kWaitForSignal(QObject *obj, const char *signal, int timeout ) bool QTest::kWaitForSignal(QObject *obj, const char *signal, int timeout )
{ {
KDESignalSpy spy(obj, signal, timeout); KDESignalSpy spy(obj, signal, timeout);
return spy.signalEmitted(); return spy.signalEmitted();
} }
QT_END_NAMESPACE
#include "qtest_kde.moc" #include "qtest_kde.moc"

4
kdecore/util/qtest_kde.h
View file

@ -35,6 +35,8 @@
#include <QtCore/qdir.h> #include <QtCore/qdir.h>
#include <QtCore/qtextstream.h> #include <QtCore/qtextstream.h>
QT_BEGIN_NAMESPACE
namespace QTest namespace QTest
{ {
/** /**
@ -49,6 +51,8 @@ namespace QTest
KDECORE_EXPORT bool kWaitForSignal(QObject *obj, const char *signal, int timeout = 0); KDECORE_EXPORT bool kWaitForSignal(QObject *obj, const char *signal, int timeout = 0);
} // namespace QTest } // namespace QTest
QT_END_NAMESPACE
// By default, unit tests get no gui. // By default, unit tests get no gui.
// Pass GUI if you use any GUI classes // Pass GUI if you use any GUI classes
enum KDEMainFlag { NoGUI = 0, GUI = 1 }; // bitfield, next item is 2! enum KDEMainFlag { NoGUI = 0, GUI = 1 }; // bitfield, next item is 2!

2
kded/kbuildsycoca.h
View file

@ -33,7 +33,7 @@
#include "vfolder_menu.h" #include "vfolder_menu.h"
class QDataStream; #include <QDataStream>
// No need for this in libkio - apps only get readonly access // No need for this in libkio - apps only get readonly access
class KBuildSycoca : public KSycoca, public KBuildSycocaInterface class KBuildSycoca : public KSycoca, public KBuildSycocaInterface

2
kded/kded.cpp
View file

@ -65,11 +65,13 @@ static bool bCheckSycoca;
static bool bCheckUpdates; static bool bCheckUpdates;
static bool bCheckHostname; static bool bCheckHostname;
QT_BEGIN_NAMESPACE
#ifdef Q_DBUS_EXPORT #ifdef Q_DBUS_EXPORT
extern Q_DBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&)); extern Q_DBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
#else #else
extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&)); extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
#endif #endif
QT_END_NAMESPACE
static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0, const char *callBackErrorSlot=0) static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0, const char *callBackErrorSlot=0)
{ {

2
kded/kded.h
View file

@ -34,7 +34,7 @@
#include <kdedmodule.h> #include <kdedmodule.h>
#include <kservice.h> #include <kservice.h>
class QDBusServiceWatcher; #include <QDBusServiceWatcher>
class KDirWatch; class KDirWatch;
// No need for this in libkio - apps only get readonly access // No need for this in libkio - apps only get readonly access

2
kdeui/actions/kactioncategory.h
View file

@ -32,7 +32,7 @@
class KAction; class KAction;
struct KActionCategoryPrivate; struct KActionCategoryPrivate;
class QAction; #include <QAction>

6
kdeui/actions/kactioncollection.h
View file

@ -32,11 +32,11 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QAction; #include <QAction>
class KXMLGUIClient; class KXMLGUIClient;
class QActionGroup; #include <QActionGroup>
class QString; #include <QString>
/** /**
* \short A container for a set of QAction objects. * \short A container for a set of QAction objects.

6
kdeui/actions/kstandardaction.h
View file

@ -23,9 +23,9 @@
#include <kstandardshortcut.h> #include <kstandardshortcut.h>
#include <QtCore/QList> #include <QtCore/QList>
class QObject; #include <QObject>
class QStringList; #include <QStringList>
class QWidget; #include <QWidget>
class KAction; class KAction;
class KRecentFilesAction; class KRecentFilesAction;
class KDualAction; class KDualAction;

2
kdeui/colors/kcolorchoosermode_p.h
View file

@ -24,7 +24,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
class QColor; #include <QColor>
namespace KDEPrivate { namespace KDEPrivate {

6
kdeui/colors/kcolorhelpers_p.h
View file

@ -30,9 +30,9 @@ static inline qreal normalize(qreal a)
return (a < 1.0 ? (a > 0.0 ? a : 0.0) : 1.0); return (a < 1.0 ? (a > 0.0 ? a : 0.0) : 1.0);
} }
class QPainter; #include <QPainter>
class QRect; #include <QRect>
class QBrush; #include <QBrush>
namespace KDEPrivate { namespace KDEPrivate {

8
kdeui/colors/kcolormimedata.h
View file

@ -23,10 +23,10 @@
#include <kdeui_export.h> #include <kdeui_export.h>
class QColor; #include <QColor>
class QDrag; #include <QDrag>
class QMimeData; #include <QMimeData>
class QWidget; #include <QWidget>
/** /**
* Drag-and-drop and clipboard mimedata manipulation for QColor objects. The according MIME type * Drag-and-drop and clipboard mimedata manipulation for QColor objects. The according MIME type

4
kdeui/colors/kcolorscheme.h
View file

@ -25,8 +25,8 @@
#include <QtGui/QPalette> #include <QtGui/QPalette>
class QColor; #include <QColor>
class QBrush; #include <QBrush>
class KColorSchemePrivate; class KColorSchemePrivate;

2
kdeui/colors/kcolorutils.h
View file

@ -25,7 +25,7 @@
#include <kdeui_export.h> #include <kdeui_export.h>
#include <QtGui/QPainter> #include <QtGui/QPainter>
class QColor; #include <QColor>
/** /**
* A set of methods used to work with colors. * A set of methods used to work with colors.

2
kdeui/dialogs/kconfigdialogmanager.h
View file

@ -29,7 +29,7 @@
class KCoreConfigSkeleton; class KCoreConfigSkeleton;
class KConfigSkeleton; class KConfigSkeleton;
class KConfigSkeletonItem; class KConfigSkeletonItem;
class QWidget; #include <QWidget>
/** /**
* @short Provides a means of automatically retrieving, * @short Provides a means of automatically retrieving,

4
kdeui/dialogs/kcupsoptionsjobwidget_p.h
View file

@ -26,8 +26,8 @@
#include "kcupsoptionswidget_p.h" #include "kcupsoptionswidget_p.h"
#include "ui_kcupsoptionsjobwidget.h" #include "ui_kcupsoptionsjobwidget.h"
class QString; #include <QString>
class QTime; #include <QTime>
/** /**
* A widget to add to QPrintDialog to enable extra CUPS options * A widget to add to QPrintDialog to enable extra CUPS options

8
kdeui/dialogs/kcupsoptionswidget_p.h
View file

@ -23,10 +23,10 @@
#include <qwidget.h> #include <qwidget.h>
class QString; #include <QString>
class QStringList; #include <QStringList>
class QPrinter; #include <QPrinter>
class QPrintDialog; #include <QPrintDialog>
/** /**
* A widget to add to QPrintDialog to enable extra CUPS options * A widget to add to QPrintDialog to enable extra CUPS options

6
kdeui/dialogs/kdeprintdialog.h
View file

@ -25,9 +25,9 @@
#include <QtCore/QList> #include <QtCore/QList>
class QPrintDialog; #include <QPrintDialog>
class QPrinter; #include <QPrinter>
class QWidget; #include <QWidget>
/** /**
* Namespace for the KDE printing system * Namespace for the KDE printing system

2
kdeui/dialogs/kdialog.h
View file

@ -25,7 +25,7 @@
#define KDIALOG_H #define KDIALOG_H
class KPushButton; class KPushButton;
class QMenu; #include <QMenu>
class KDialogPrivate; class KDialogPrivate;
#include <kdeui_export.h> #include <kdeui_export.h>

4
kdeui/dialogs/kdialog_p.h
View file

@ -26,11 +26,11 @@
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtCore/QHash> #include <QtCore/QHash>
class QBoxLayout; #include <QBoxLayout>
class KPushButton; class KPushButton;
class KUrlLabel; class KUrlLabel;
class KSeparator; class KSeparator;
class QDialogButtonBox; #include <QDialogButtonBox>
class KDialogPrivate class KDialogPrivate
{ {

2
kdeui/dialogs/kedittoolbar_p.h
View file

@ -24,7 +24,7 @@
#include <QListWidget> #include <QListWidget>
class KLineEdit; class KLineEdit;
class QCheckBox; #include <QCheckBox>
namespace KDEPrivate { namespace KDEPrivate {

2
kdeui/dialogs/kinputdialog.h
View file

@ -27,7 +27,7 @@
#include <limits.h> #include <limits.h>
#include <float.h> #include <float.h>
class QValidator; #include <QValidator>
/** /**
* The KInputDialog namespace provides simple dialogs to get a single value * The KInputDialog namespace provides simple dialogs to get a single value

6
kdeui/dialogs/kinputdialog_p.h
View file

@ -20,11 +20,11 @@
#ifndef KINPUTDIALOG_P_H #ifndef KINPUTDIALOG_P_H
#define KINPUTDIALOG_P_H #define KINPUTDIALOG_P_H
class QLabel; #include <QLabel>
class QValidator; #include <QValidator>
class KComboBox; class KComboBox;
class QDoubleSpinBox; #include <QDoubleSpinBox>
class KIntSpinBox; class KIntSpinBox;
class KLineEdit; class KLineEdit;
class KListWidget; class KListWidget;

2
kdeui/dialogs/klinkdialog.h
View file

@ -27,7 +27,7 @@
#include <kdialog.h> #include <kdialog.h>
class KLinkDialogPrivate; class KLinkDialogPrivate;
class QString; #include <QString>
/** /**
@short Dialog to allow user to configure a hyperlink. @short Dialog to allow user to configure a hyperlink.

4
kdeui/dialogs/kmessagebox.h
View file

@ -27,8 +27,8 @@
#include <kguiitem.h> #include <kguiitem.h>
#include <kstandardguiitem.h> #include <kstandardguiitem.h>
class QWidget; #include <QWidget>
class QStringList; #include <QStringList>
class KConfig; class KConfig;
class KDialog; class KDialog;

2
kdeui/dialogs/kmessageboxmessagehandler.h
View file

@ -24,7 +24,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QWidget; #include <QWidget>
class KMessageBoxMessageHandlerPrivate; class KMessageBoxMessageHandlerPrivate;
/** /**
* @brief This is a convience KMessageHandler that use KMessageBox. * @brief This is a convience KMessageHandler that use KMessageBox.

2
kdeui/dialogs/knewpassworddialog.h
View file

@ -27,7 +27,7 @@
#include <kdialog.h> #include <kdialog.h>
class QWidget; #include <QWidget>
/** /**

2
kdeui/dialogs/kpixmapregionselectordialog.h
View file

@ -24,7 +24,7 @@
class KPixmapRegionSelectorWidget; class KPixmapRegionSelectorWidget;
class QImage; #include <QImage>
/** /**
* A dialog that uses a KPixmapRegionSelectorWidget to allow the user * A dialog that uses a KPixmapRegionSelectorWidget to allow the user

8
kdeui/dialogs/kshortcutsdialog_p.h
View file

@ -35,10 +35,10 @@
#include <QtCore/QList> #include <QtCore/QList>
#include <QGroupBox> #include <QGroupBox>
class QLabel; #include <QLabel>
class QTreeWidget; #include <QTreeWidget>
class QTreeWidgetItem; #include <QTreeWidgetItem>
class QRadioButton; #include <QRadioButton>
class KAction; class KAction;
class KActionCollection; class KActionCollection;
class KPushButton; class KPushButton;

2
kdeui/dialogs/ksplashscreen.h
View file

@ -24,7 +24,7 @@
#include <QtGui/QSplashScreen> #include <QtGui/QSplashScreen>
class QPixmap; #include <QPixmap>
/** /**
* @short %KDE splash screen * @short %KDE splash screen

10
kdeui/findreplace/kfinddialog_p.h
View file

@ -28,11 +28,11 @@
class KHistoryComboBox; class KHistoryComboBox;
class QCheckBox; #include <QCheckBox>
class QGridLayout; #include <QGridLayout>
class QGroupBox; #include <QGroupBox>
class QMenu; #include <QMenu>
class QPushButton; #include <QPushButton>
class KFindDialog::KFindDialogPrivate class KFindDialog::KFindDialogPrivate
{ {

4
kdeui/fonts/kfontchooser.h
View file

@ -27,8 +27,8 @@
#include <kdeui_export.h> #include <kdeui_export.h>
#include <QtGui/QWidget> #include <QtGui/QWidget>
class QFont; #include <QFont>
class QStringList; #include <QStringList>
/** /**
* @short A font selection widget. * @short A font selection widget.

4
kdeui/fonts/kfontdialog.h
View file

@ -27,8 +27,8 @@
#include <kdialog.h> #include <kdialog.h>
#include <kfontchooser.h> #include <kfontchooser.h>
class QFont; #include <QFont>
class QStringList; #include <QStringList>
/** /**
* @short A font selection dialog. * @short A font selection dialog.

4
kdeui/fonts/kfontrequester.h
View file

@ -26,8 +26,8 @@
#include <kdeui_export.h> #include <kdeui_export.h>
class QLabel; #include <QLabel>
class QPushButton; #include <QPushButton>
/** /**
* This class provides a widget with a lineedit and a button, which invokes * This class provides a widget with a lineedit and a button, which invokes

6
kdeui/fonts/kfontutils.h
View file

@ -26,9 +26,9 @@
#include "kdeui_export.h" #include "kdeui_export.h"
#include <qglobal.h> #include <qglobal.h>
class QPainter; #include <QPainter>
class QSizeF; #include <QSizeF>
class QString; #include <QString>
namespace KFontUtils namespace KFontUtils
{ {

2
kdeui/icons/kicon.h
View file

@ -24,7 +24,7 @@
#include <QtGui/QIcon> #include <QtGui/QIcon>
class KIconLoader; class KIconLoader;
class QStringList; #include <QStringList>
/** /**
* \short A wrapper around QIcon that provides KDE icon features * \short A wrapper around QIcon that provides KDE icon features

6
kdeui/icons/kiconloader.h
View file

@ -28,9 +28,9 @@
#include <kglobal.h> #include <kglobal.h>
#include <kdeui_export.h> #include <kdeui_export.h>
class QIcon; #include <QIcon>
class QMovie; #include <QMovie>
class QPixmap; #include <QPixmap>
class KComponentData; class KComponentData;
class KIconLoaderPrivate; class KIconLoaderPrivate;

Some files were not shown because too many files have changed in this diff Show more