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

generic: make changes required for building against katie

Browse source
This commit is contained in:
Ivailo Monev 2015-08-12 13:11:16 +03:00
parent 280a229140
commit 840c8a25cc
611 changed files with 831 additions and 810 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appmenu/appmenu.cpp
View file

@ -33,7 +33,7 @@
#include <QDBusInterface> #include <QDBusInterface>
#include <QDBusReply> #include <QDBusReply>
#include <QDBusPendingCallWatcher> #include <QtDBus/qdbuspendingcall.h>
#include <QMenu> #include <QMenu>
#include <QApplication> #include <QApplication>
#include <QDesktopWidget> #include <QDesktopWidget>

2
appmenu/appmenu_dbus.cpp
View file

@ -29,7 +29,7 @@
#include <QApplication> #include <QApplication>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDBusObjectPath> #include <QtDBus/qdbusextratypes.h>
#include <QDBusServiceWatcher> #include <QDBusServiceWatcher>
static const char* DBUS_SERVICE = "org.kde.kded"; static const char* DBUS_SERVICE = "org.kde.kded";

2
appmenu/appmenu_dbus.h
View file

@ -28,7 +28,7 @@
// Qt // Qt
#include <QDBusContext> #include <QDBusContext>
#include <QDBusObjectPath> #include <QtDBus/qdbusextratypes.h>
#include <QObject> #include <QObject>
#include <QDebug> #include <QDebug>
#include <qwindowdefs.h> #include <qwindowdefs.h>

2
appmenu/glowbar.cpp
View file

@ -35,7 +35,7 @@
#include <QTimer> #include <QTimer>
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
GlowBar::GlowBar() GlowBar::GlowBar()

2
appmenu/menubar.cpp
View file

@ -30,7 +30,7 @@
#include <QPainter> #include <QPainter>
#include <QMenu> #include <QMenu>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QGraphicsDropShadowEffect> #include <QtGui/qgraphicseffect.h>
#include <KWindowSystem> #include <KWindowSystem>
#include <Plasma/FrameSvg> #include <Plasma/FrameSvg>

2
appmenu/menubutton.cpp
View file

@ -27,7 +27,7 @@
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>
#include <QGraphicsDropShadowEffect> #include <QtGui/qgraphicseffect.h>
#include <Plasma/Theme> #include <Plasma/Theme>

2
appmenu/menuimporter.cpp
View file

@ -28,7 +28,7 @@
#include <QApplication> #include <QApplication>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDBusObjectPath> #include <QtDBus/qdbusextratypes.h>
#include <QDBusServiceWatcher> #include <QDBusServiceWatcher>
#include <KDebug> #include <KDebug>

2
appmenu/menuimporter.h
View file

@ -28,7 +28,7 @@
// Qt // Qt
#include <QDBusContext> #include <QDBusContext>
#include <QDBusObjectPath> #include <QtDBus/qdbusextratypes.h>
#include <QObject> #include <QObject>
#include <QWidget> // For WId #include <QWidget> // For WId

2
appmenu/shadows.cpp
View file

@ -22,7 +22,7 @@
#include <QPainter> #include <QPainter>
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>

4
appmenu/verticalmenu.cpp
View file

@ -26,10 +26,10 @@
#include "verticalmenu.h" #include "verticalmenu.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QKeyEvent> #include <QtGui/qevent.h>
#include <QEvent> #include <QEvent>
#include <QMenu> #include <QMenu>
#include <QMouseEvent> #include <QtGui/qevent.h>
VerticalMenu::VerticalMenu(QWidget* parent) : QMenu(parent) VerticalMenu::VerticalMenu(QWidget* parent) : QMenu(parent)
{ {

2
drkonqi/detachedprocessmonitor.cpp
View file

@ -18,7 +18,7 @@
#include <signal.h> #include <signal.h>
#include <QtCore/QTimerEvent> #include <QtCore/qcoreevent.h>
#include <KDebug> #include <KDebug>

4
drkonqi/drkonqi.cpp
View file

@ -41,9 +41,9 @@
*/ */
#include "drkonqi.h" #include "drkonqi.h"
#include <QtCore/QWeakPointer> #include <QtCore/qsharedpointer.h>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QTimerEvent> #include <QtCore/qcoreevent.h>
#include <KMessageBox> #include <KMessageBox>
#include <KFileDialog> #include <KFileDialog>

2
drkonqi/parser/backtraceparser.cpp
View file

@ -20,7 +20,7 @@
#include "backtraceparserkdbgwin.h" #include "backtraceparserkdbgwin.h"
#include "backtraceparsernull.h" #include "backtraceparsernull.h"
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QMetaEnum> #include <QtCore/qmetaobject.h>
#include <KDebug> #include <KDebug>
//factory //factory

2
drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp
View file

@ -18,7 +18,7 @@
#include <QDirIterator> #include <QDirIterator>
#include <QFileInfo> #include <QFileInfo>
#include <QFile> #include <QFile>
#include <QMetaEnum> #include <QtCore/qmetaobject.h>
#include <QDebug> #include <QDebug>
#include <QSharedPointer> #include <QSharedPointer>

2
drkonqi/tests/backtraceparsertest/backtraceparsertest.h
View file

@ -18,6 +18,8 @@
#define BACKTRACEPARSERTEST_H #define BACKTRACEPARSERTEST_H
#include <QtTest> #include <QtTest>
#include <QtCore/qsettings.h>
#include "fakebacktracegenerator.h" #include "fakebacktracegenerator.h"
#include "../../parser/backtraceparser.h" #include "../../parser/backtraceparser.h"

2
drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp
View file

@ -19,7 +19,7 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QMetaEnum> #include <QtCore/qmetaobject.h>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <KAboutData> #include <KAboutData>
#include <KCmdLineOptions> #include <KCmdLineOptions>

2
kcminit/main.cpp
View file

@ -40,7 +40,7 @@
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#endif #endif
#include <kservicetypetrader.h> #include <kservicetypetrader.h>

2
kcontrol/access/kaccess.cpp
View file

@ -31,7 +31,7 @@
#include "moc_kaccess.cpp" #include "moc_kaccess.cpp"
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <kvbox.h> #include <kvbox.h>
struct ModifierKey { struct ModifierKey {

2
kcontrol/access/kaccess.h
View file

@ -6,7 +6,7 @@
#include <QColor> #include <QColor>
//Added by qt3to4: //Added by qt3to4:
#include <QLabel> #include <QLabel>
#include <QPaintEvent> #include <QtGui/qevent.h>
#include <KUniqueApplication> #include <KUniqueApplication>

2
kcontrol/access/kcmaccess.cpp
View file

@ -15,7 +15,7 @@
#include <QCheckBox> #include <QCheckBox>
#include <QLineEdit> #include <QLineEdit>
#include <QRadioButton> #include <QRadioButton>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
//Added by qt3to4: //Added by qt3to4:

2
kcontrol/autostart/autostartitem.cpp
View file

@ -21,7 +21,7 @@
#include "autostart.h" #include "autostart.h"
#include <QComboBox> #include <QComboBox>
#include <QTreeWidgetItem> #include <QtGui/qtreewidget.h>
#include <QTreeWidget> #include <QTreeWidget>
#include <QDir> #include <QDir>

2
kcontrol/autostart/autostartitem.h
View file

@ -20,7 +20,7 @@
#ifndef AUTOSTARTITEM_H #ifndef AUTOSTARTITEM_H
#define AUTOSTARTITEM_H #define AUTOSTARTITEM_H
#include <QTreeWidgetItem> #include <QtGui/qtreewidget.h>
#include <QObject> #include <QObject>
#include <KUrl> #include <KUrl>

2
kcontrol/colors/previewwidget.cpp
View file

@ -23,7 +23,7 @@
#include <KGlobalSettings> #include <KGlobalSettings>
#include <KColorScheme> #include <KColorScheme>
#include <QtDebug> #include <QtCore/qdebug.h>
PreviewWidget::PreviewWidget(QWidget *parent) : QFrame(parent) PreviewWidget::PreviewWidget(QWidget *parent) : QFrame(parent)
{ {

4
kcontrol/componentchooser/componentchooseremail.cpp
View file

@ -15,11 +15,11 @@
#include "componentchooseremail.h" #include "componentchooseremail.h"
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/qfile.h>
#include <QtGui/qcheckbox.h>
#include <kemailsettings.h> #include <kemailsettings.h>
#include <QCheckBox>
#include <kopenwithdialog.h> #include <kopenwithdialog.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <KUrl> #include <KUrl>
// for chmod: // for chmod:

4
kcontrol/dateandtime/dtime.cpp
View file

@ -34,10 +34,10 @@
#include <QtGui/QGroupBox> #include <QtGui/QGroupBox>
#include <QPushButton> #include <QPushButton>
#include <QPainter> #include <QPainter>
#include <QTimeEdit> #include <QtGui/qdatetimeedit.h>
#include <QCheckBox> #include <QCheckBox>
#include <QPaintEvent> #include <QtGui/qevent.h>
#include <QGridLayout> #include <QGridLayout>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QVBoxLayout> #include <QVBoxLayout>

2
kcontrol/dateandtime/dtime.h
View file

@ -30,7 +30,7 @@
#include <QWidget> #include <QWidget>
#include <QCheckBox> #include <QCheckBox>
//Added by qt3to4: //Added by qt3to4:
#include <QPaintEvent> #include <QtGui/qevent.h>
#include <kdatepicker.h> #include <kdatepicker.h>
#include <knuminput.h> #include <knuminput.h>

2
kcontrol/emoticons/emoticonslist.cpp
View file

@ -23,7 +23,7 @@
#include <QDir> #include <QDir>
#include <QIcon> #include <QIcon>
#include <QLabel> #include <QLabel>
#include <QListWidgetItem> #include <QtGui/qlistwidget.h>
#include <KMessageBox> #include <KMessageBox>
#include <KDebug> #include <KDebug>
#include <KIcon> #include <KIcon>

2
kcontrol/fonts/kxftconfig.cpp
View file

@ -31,7 +31,7 @@
#include <QRegExp> #include <QRegExp>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <QByteArray> #include <QByteArray>
#include <KLocale> #include <KLocale>

1
kcontrol/fonts/kxftconfig.h
View file

@ -28,6 +28,7 @@
#include <QStringList> #include <QStringList>
#include <QtXml/QtXml> #include <QtXml/QtXml>
#include <QtXml/qdom.h>
class KXftConfig class KXftConfig
{ {

2
kcontrol/input/kapplymousetheme.cpp
View file

@ -24,7 +24,7 @@
#include <config-X11.h> #include <config-X11.h>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>

2
kcontrol/input/main.cpp
View file

@ -29,7 +29,7 @@
#include <QFile> #include <QFile>
#include "mouse.h" #include "mouse.h"
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <klauncher_iface.h> #include <klauncher_iface.h>

2
kcontrol/input/mouse.cpp
View file

@ -73,7 +73,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#undef Below #undef Below

2
kcontrol/input/xcursor/cursortheme.cpp
View file

@ -22,7 +22,7 @@
#include <QCursor> #include <QCursor>
#include <QImage> #include <QImage>
#include <QFile> #include <QFile>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include "themepage.h" #include "themepage.h"
#include "cursortheme.h" #include "cursortheme.h"

2
kcontrol/input/xcursor/itemdelegate.cpp
View file

@ -21,7 +21,7 @@
#include "cursortheme.h" #include "cursortheme.h"
#include <QApplication> #include <QApplication>
#include <QModelIndex> #include <QtCore/qabstractitemmodel.h>
#include <QPainter> #include <QPainter>
namespace namespace

2
kcontrol/input/xcursor/previewwidget.cpp
View file

@ -17,7 +17,7 @@
*/ */
#include <QPainter> #include <QPainter>
#include <QMouseEvent> #include <QtGui/qevent.h>
#include "previewwidget.h" #include "previewwidget.h"

2
kcontrol/input/xcursor/thememodel.h
View file

@ -20,7 +20,7 @@
#ifndef THEMEMODEL_H #ifndef THEMEMODEL_H
#define THEMEMODEL_H #define THEMEMODEL_H
#include <QAbstractTableModel> #include <QtCore/qabstractitemmodel.h>
#include <QStringList> #include <QStringList>
class QDir; class QDir;

2
kcontrol/input/xcursor/themepage.cpp
View file

@ -37,7 +37,7 @@
#include <QWidget> #include <QWidget>
#include <QPushButton> #include <QPushButton>
#include <QDir> #include <QDir>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include "themepage.h" #include "themepage.h"
#include "moc_themepage.cpp" #include "moc_themepage.cpp"

2
kcontrol/input/xcursor/themepage.h
View file

@ -20,7 +20,7 @@
#define THEMEPAGE_H #define THEMEPAGE_H
#include <QWidget> #include <QWidget>
#include <QModelIndex> #include <QtCore/qabstractitemmodel.h>
#include "ui_themepage.h" #include "ui_themepage.h"

2
kcontrol/input/xcursor/xcursortheme.cpp
View file

@ -24,7 +24,7 @@
#include <QCursor> #include <QCursor>
#include <QImage> #include <QImage>
#include <QDir> #include <QDir>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xcursor/Xcursor.h> #include <X11/Xcursor/Xcursor.h>

2
kcontrol/keyboard/iso_codes.cpp
View file

@ -22,7 +22,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <QtXml/QXmlAttributes> #include <QtXml/qxml.h>
class IsoCodesPrivate { class IsoCodesPrivate {

2
kcontrol/keyboard/kcm_keyboard_widget.cpp
View file

@ -30,7 +30,7 @@
#include <QtGui/QCheckBox> #include <QtGui/QCheckBox>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include "keyboard_config.h" #include "keyboard_config.h"
#include "preview/keyboardpainter.h" #include "preview/keyboardpainter.h"

2
kcontrol/keyboard/kcm_view_models.h
View file

@ -21,7 +21,7 @@
#define KCM_VIEW_MODELS_H_ #define KCM_VIEW_MODELS_H_
#include <QtCore/QAbstractItemModel> #include <QtCore/QAbstractItemModel>
#include <QtCore/QAbstractTableModel> #include <QtCore/qabstractitemmodel.h>
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtGui/QStyledItemDelegate> #include <QtGui/QStyledItemDelegate>

2
kcontrol/keyboard/kcmmisc.cpp
View file

@ -31,7 +31,7 @@
#include <QtGui/QCheckBox> #include <QtGui/QCheckBox>
#include <QtGui/QWhatsThis> #include <QtGui/QWhatsThis>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <kconfig.h>

2
kcontrol/keyboard/keyboard_applet.cpp
View file

@ -27,7 +27,7 @@
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QGraphicsSceneMouseEvent> #include <QtGui/qgraphicssceneevent.h>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>

2
kcontrol/keyboard/keyboard_daemon.cpp
View file

@ -18,7 +18,7 @@
#include "keyboard_daemon.h" #include "keyboard_daemon.h"
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/QProcess> #include <QtCore/QProcess>

2
kcontrol/keyboard/keyboard_hardware.cpp
View file

@ -20,7 +20,7 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <QtGui/QCursor> // WTF? - otherwise compiler complains #include <QtGui/QCursor> // WTF? - otherwise compiler complains
#include <X11/Xlib.h> #include <X11/Xlib.h>

2
kcontrol/keyboard/layout_memory.cpp
View file

@ -19,7 +19,7 @@
#include "layout_memory.h" #include "layout_memory.h"
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwindowsystem.h> #include <kwindowsystem.h>

2
kcontrol/keyboard/layout_memory.h
View file

@ -22,7 +22,7 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtGui/QWidgetList> //For WId #include <QtGui/qwindowdefs.h> //For WId
#include "x11_helper.h" #include "x11_helper.h"
#include "keyboard_config.h" #include "keyboard_config.h"

2
kcontrol/keyboard/preview/keyaliases.cpp
View file

@ -23,7 +23,7 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>

2
kcontrol/keyboard/preview/keyboardlayout.cpp
View file

@ -25,7 +25,7 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>

2
kcontrol/keyboard/x11_helper.cpp
View file

@ -21,7 +21,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>

2
kcontrol/keyboard/xinput_helper.cpp
View file

@ -21,7 +21,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>

4
kcontrol/keyboard/xkb_helper.cpp
View file

@ -22,8 +22,8 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QTime> #include <QtCore/qdatetime.h>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

4
kcontrol/keyboard/xkb_rules.cpp
View file

@ -25,7 +25,7 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtGui/QTextDocument> // for Qt::escape #include <QtGui/QTextDocument> // for Qt::escape
#include <QtXml/QXmlAttributes> #include <QtXml/qxml.h>
#include <QtCore/QtConcurrentFilter> #include <QtCore/QtConcurrentFilter>
//#include <libintl.h> //#include <libintl.h>
@ -34,7 +34,7 @@
#include "x11_helper.h" #include "x11_helper.h"
// for findXkbRuleFile // for findXkbRuleFile
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>

2
kcontrol/keyboard/xkb_rules.h
View file

@ -20,7 +20,7 @@
#ifndef XKB_RULES_H_ #ifndef XKB_RULES_H_
#define XKB_RULES_H_ #define XKB_RULES_H_
#include <QtXml/QXmlDefaultHandler> #include <QtXml/qxml.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QStringList> #include <QtCore/QStringList>

12
kcontrol/kfontinst/CMakeLists.txt
View file

@ -1,15 +1,3 @@
if (KFI_BUILD_STANDALONE)
cmake_minimum_required(VERSION 2.6.4)
find_package(KDE4 "4.6.0" REQUIRED)
find_package(Qt4 REQUIRED)
find_package(Freetype REQUIRED)
find_package(Fontconfig REQUIRED)
find_package(Strigi REQUIRED)
find_package(X11 REQUIRED)
macro_log_feature(X11_Xft_FOUND "libxft" "X FreeType interface library" "http://www.x.org" FALSE "" "Font installer and font previews")
include(KDE4Defaults)
endif (KFI_BUILD_STANDALONE)
if (X11_Xft_FOUND) if (X11_Xft_FOUND)
check_include_files(locale.h HAVE_LOCALE_H) check_include_files(locale.h HAVE_LOCALE_H)
configure_file(config-fontinst.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-fontinst.h) configure_file(config-fontinst.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-fontinst.h)

4
kcontrol/kfontinst/apps/CreateParent.h
View file

@ -24,8 +24,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <QtCore/QLatin1String> #include <QtCore/qstring.h>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>

2
kcontrol/kfontinst/apps/Printer.cpp
View file

@ -38,7 +38,7 @@
#include <QtGui/QFrame> #include <QtGui/QFrame>
#include <QtGui/QGridLayout> #include <QtGui/QGridLayout>
#include <QtGui/QProgressBar> #include <QtGui/QProgressBar>
#include <QtGui/QCloseEvent> #include <QtGui/qevent.h>
#include <KCmdLineArgs> #include <KCmdLineArgs>
#include <KAboutData> #include <KAboutData>
#include <KApplication> #include <KApplication>

8
kcontrol/kfontinst/dbus/FcConfig.cpp
View file

@ -27,10 +27,10 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtXml/QDomDocument> #include <QtXml/qdom.h>
#include <QtXml/QDomElement> #include <QtXml/qdom.h>
#include <QtXml/QDomNode> #include <QtXml/qdom.h>
#include <QtXml/QDomText> #include <QtXml/qdom.h>
#include <KDebug> #include <KDebug>
#include <stdio.h> #include <stdio.h>
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>

6
kcontrol/kfontinst/dbus/Folder.cpp
View file

@ -26,9 +26,9 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtXml/QDomDocument> #include <QtXml/qdom.h>
#include <QtXml/QDomElement> #include <QtXml/qdom.h>
#include <QtXml/QDomNode> #include <QtXml/qdom.h>
#include <KStandardDirs> #include <KStandardDirs>
#include <KSaveFile> #include <KSaveFile>
#include <KShell> #include <KShell>

7
kcontrol/kfontinst/dbus/FontInst.cpp
View file

@ -21,8 +21,11 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <QtDBus/QDBusConnection> #include <QtDBus/qdbusconnection.h>
#include <QtCore/QTimer> #include <QtCore/qtimer.h>
#include <QtCore/qdir.h>
#include <QtCore/qcoreapplication.h>
#include <kauth.h> #include <kauth.h>
#include <KDebug> #include <KDebug>
#include <kio/global.h> #include <kio/global.h>

5
kcontrol/kfontinst/dbus/Helper.cpp
View file

@ -27,8 +27,9 @@
#include "Misc.h" #include "Misc.h"
#include "Utils.h" #include "Utils.h"
#include <KDebug> #include <KDebug>
#include <QtXml/QDomDocument> #include <QtXml/qdom.h>
#include <QtCore/QTextCodec> #include <QtCore/qtextcodec.h>
#include <QtCore/qcoreapplication.h>
#include <kio/global.h> #include <kio/global.h>
#include <kde_file.h> #include <kde_file.h>
#include <sys/types.h> #include <sys/types.h>

4
kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
View file

@ -41,12 +41,12 @@
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtGui/QGridLayout> #include <QtGui/QGridLayout>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFileInfoList> #include <QtCore/qfileinfo.h>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#include <QtCore/QDateTime> #include <QtCore/QDateTime>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QContextMenuEvent> #include <QtGui/qevent.h>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QDesktopWidget> #include <QtGui/QDesktopWidget>

2
kcontrol/kfontinst/kcmfontinst/FontFilter.cpp
View file

@ -37,7 +37,7 @@
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QMouseEvent> #include <QtGui/qevent.h>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QActionGroup> #include <QtGui/QActionGroup>

2
kcontrol/kfontinst/kcmfontinst/FontList.cpp
View file

@ -39,7 +39,7 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QDropEvent> #include <QtGui/qevent.h>
#include <QtCore/QDateTime> #include <QtCore/QDateTime>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#include <QtGui/QPainter> #include <QtGui/QPainter>

2
kcontrol/kfontinst/kcmfontinst/FontList.h
View file

@ -32,7 +32,7 @@
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtGui/QTreeView> #include <QtGui/QTreeView>
#include <QtCore/QAbstractItemModel> #include <QtCore/QAbstractItemModel>
#include <QtCore/QModelIndex> #include <QtCore/qabstractitemmodel.h>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QSortFilterProxyModel> #include <QtGui/QSortFilterProxyModel>
#include <QtGui/QFontDatabase> #include <QtGui/QFontDatabase>

6
kcontrol/kfontinst/kcmfontinst/GroupList.cpp
View file

@ -33,14 +33,14 @@
#include <KSaveFile> #include <KSaveFile>
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtGui/QFontDatabase> #include <QtGui/QFontDatabase>
#include <QtGui/QDropEvent> #include <QtGui/qevent.h>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QStyledItemDelegate> #include <QtGui/QStyledItemDelegate>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QLinearGradient> #include <QtGui/qbrush.h>
#include <QtXml/QDomElement> #include <QtXml/qdom.h>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QEvent> #include <QtCore/QEvent>

2
kcontrol/kfontinst/kcmfontinst/GroupList.h
View file

@ -31,7 +31,7 @@
#include <QtCore/QList> #include <QtCore/QList>
#include <QtGui/QTreeView> #include <QtGui/QTreeView>
#include <QtCore/QAbstractItemModel> #include <QtCore/QAbstractItemModel>
#include <QtCore/QModelIndex> #include <QtCore/qabstractitemmodel.h>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include "FontList.h" #include "FontList.h"

5
kcontrol/kfontinst/kcmfontinst/JobRunner.cpp
View file

@ -37,12 +37,13 @@
#include <QtGui/QGridLayout> #include <QtGui/QGridLayout>
#include <QtGui/QProgressBar> #include <QtGui/QProgressBar>
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <QtGui/QStackedWidget> #include <QtGui/QStackedWidget>
#include <QtGui/QCheckBox> #include <QtGui/QCheckBox>
#include <QtGui/QStyleOption> #include <QtGui/QStyleOption>
#include <QtGui/QStyle> #include <QtGui/QStyle>
#include <QtGui/QCloseEvent> #include <QtGui/qevent.h>
#include <QtCore/qprocess.h>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtDBus/QDBusServiceWatcher> #include <QtDBus/QDBusServiceWatcher>
#include <X11/Xlib.h> #include <X11/Xlib.h>

5
kcontrol/kfontinst/kcmfontinst/PreviewList.cpp
View file

@ -30,8 +30,9 @@
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#include <QtGui/QPixmapCache> #include <QtGui/QPixmapCache>
#include <QtGui/QContextMenuEvent> #include <QtGui/qevent.h>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <QtCore/qtextstream.h>
namespace KFI namespace KFI
{ {

1
kcontrol/kfontinst/kio/FontInstInterface.cpp
View file

@ -27,6 +27,7 @@
#include <KDebug> #include <KDebug>
#include <kio/global.h> #include <kio/global.h>
#include <QtDBus/QDBusServiceWatcher> #include <QtDBus/QDBusServiceWatcher>
#include <QtCore/qprocess.h>
#include "config-fontinst.h" #include "config-fontinst.h"
#define KFI_DBUG kDebug(7000) << '(' << time(NULL) << ')' #define KFI_DBUG kDebug(7000) << '(' << time(NULL) << ')'

2
kcontrol/kfontinst/lib/Family.cpp
View file

@ -22,7 +22,7 @@
*/ */
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtXml/QDomElement> #include <QtXml/qdom.h>
#include <KDebug> #include <KDebug>
#include "Family.h" #include "Family.h"
#include "Misc.h" #include "Misc.h"

2
kcontrol/kfontinst/lib/FcEngine.cpp
View file

@ -27,7 +27,7 @@
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtGui/QX11Info> #include <QtGui/qx11info_x11.h>
#include <KUrl> #include <KUrl>
#include <KConfig> #include <KConfig>
#include <KConfigGroup> #include <KConfigGroup>

2
kcontrol/kfontinst/lib/File.cpp
View file

@ -21,7 +21,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <QtXml/QDomElement> #include <QtXml/qdom.h>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QDir> #include <QtCore/QDir>
#include "File.h" #include "File.h"

2
kcontrol/kfontinst/lib/KfiConstants.h
View file

@ -24,7 +24,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <QtCore/QLatin1String> #include <QtCore/qstring.h>
#include <KLocale> #include <KLocale>
#include <kio/udsentry.h> #include <kio/udsentry.h>

2
kcontrol/kfontinst/lib/Style.cpp
View file

@ -23,7 +23,7 @@
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtXml/QDomElement> #include <QtXml/qdom.h>
#include "Fc.h" #include "Fc.h"
#include "Style.h" #include "Style.h"
#include "WritingSystems.h" #include "WritingSystems.h"

2
kcontrol/kfontinst/viewpart/CharTip.cpp
View file

@ -42,7 +42,7 @@
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QBoxLayout> #include <QtGui/QBoxLayout>
#include <QtCore/QEvent> #include <QtCore/QEvent>
#include <QtGui/QResizeEvent> #include <QtGui/qevent.h>
namespace KFI namespace KFI
{ {

6
kcontrol/kfontinst/viewpart/FontPreview.cpp
View file

@ -27,9 +27,9 @@
#include <KApplication> #include <KApplication>
#include <KLocale> #include <KLocale>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QPaintEvent> #include <QtGui/qevent.h>
#include <QtGui/QMouseEvent> #include <QtGui/qevent.h>
#include <QtGui/QWheelEvent> #include <QtGui/qevent.h>
#include <stdlib.h> #include <stdlib.h>
namespace KFI namespace KFI

2
kcontrol/kfontinst/viewpart/FontPreview.h
View file

@ -28,7 +28,7 @@
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtGui/QColor> #include <QtGui/QColor>
#include <QtGui/QPaintEvent> #include <QtGui/qevent.h>
#include "KfiConstants.h" #include "KfiConstants.h"
#include "FcEngine.h" #include "FcEngine.h"

2
kcontrol/krdb/krdb.cpp
View file

@ -51,7 +51,7 @@
#include "krdb.h" #include "krdb.h"
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#endif #endif
inline const char * gtkEnvVar(int version) inline const char * gtkEnvVar(int version)
{ {

2
kcontrol/locale/countryselectordialog.cpp
View file

@ -15,7 +15,7 @@
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QKeyEvent> #include <QtGui/qevent.h>
#include <QListView> #include <QListView>
#include <QScrollBar> #include <QScrollBar>

2
kcontrol/locale/kcmlocale.cpp
View file

@ -23,7 +23,7 @@
#include "kcmlocale.h" #include "kcmlocale.h"
#include <QListWidget> #include <QListWidget>
#include <QListWidgetItem> #include <QtGui/qlistwidget.h>
#include <QPrinter> #include <QPrinter>
#include <QTimer> #include <QTimer>

2
kcontrol/randr/krandrpassivepopup.cpp
View file

@ -19,7 +19,7 @@
#include "krandrpassivepopup.h" #include "krandrpassivepopup.h"
#include <kapplication.h> #include <kapplication.h>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
//Added by qt3to4: //Added by qt3to4:
#include <QPixmap> #include <QPixmap>
#include <QEvent> #include <QEvent>

2
kcontrol/randr/krandrtray.cpp
View file

@ -29,7 +29,7 @@
#include <config-randr.h> #include <config-randr.h>
#include <QMouseEvent> #include <QtGui/qevent.h>
#include <QVariant> #include <QVariant>
#include <KAction> #include <KAction>

4
kcontrol/randr/krandrtray.h
View file

@ -19,8 +19,8 @@
#ifndef KRANDRTRAY_H #ifndef KRANDRTRAY_H
#define KRANDRTRAY_H #define KRANDRTRAY_H
#include <QMouseEvent> #include <QtGui/qevent.h>
#include <QWeakPointer> #include <QtCore/qsharedpointer.h>
#include <KStatusNotifierItem> #include <KStatusNotifierItem>

2
kcontrol/randr/legacyrandrscreen.cpp
View file

@ -31,7 +31,7 @@
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include "legacyrandrscreen.h" #include "legacyrandrscreen.h"
LegacyRandRScreen::LegacyRandRScreen(int screenIndex) LegacyRandRScreen::LegacyRandRScreen(int screenIndex)

4
kcontrol/randr/outputgraphicsitem.h
View file

@ -19,8 +19,8 @@
#ifndef OUTPUTGRAPHICSITEM_H #ifndef OUTPUTGRAPHICSITEM_H
#define OUTPUTGRAPHICSITEM_H #define OUTPUTGRAPHICSITEM_H
#include <QGraphicsRectItem> #include <QtGui/qgraphicsitem.h>
#include <QGraphicsTextItem> #include <QtGui/qgraphicsitem.h>
#include "randr.h" #include "randr.h"

2
kcontrol/randr/randrcrtc.h
View file

@ -21,7 +21,7 @@
#include "randr.h" #include "randr.h"
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <QObject> #include <QObject>
#include <QRect> #include <QRect>

2
kcontrol/randr/randrdisplay.cpp
View file

@ -23,7 +23,7 @@
#include <KDebug> #include <KDebug>
#include <QApplication> #include <QApplication>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include "randrdisplay.h" #include "randrdisplay.h"
#ifdef HAS_RANDR_1_2 #ifdef HAS_RANDR_1_2

2
kcontrol/randr/randroutput.cpp
View file

@ -25,7 +25,7 @@
#include <KConfig> #include <KConfig>
#include <KConfigGroup> #include <KConfigGroup>
#include <KShell> #include <KShell>
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <QAction> #include <QAction>
RandROutput::RandROutput(RandRScreen *parent, RROutput id) RandROutput::RandROutput(RandRScreen *parent, RROutput id)

2
kcontrol/randr/randrscreen.h
View file

@ -21,7 +21,7 @@
#include "randr.h" #include "randr.h"
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#include <QObject> #include <QObject>
#include <QMap> #include <QMap>

2
kcontrol/screensaver/kswidget.cpp
View file

@ -27,7 +27,7 @@
#include "testwin.h" #include "testwin.h"
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#ifdef HAVE_GLXCHOOSEVISUAL #ifdef HAVE_GLXCHOOSEVISUAL
#include <GL/glx.h> #include <GL/glx.h>

10
kcontrol/screensaver/scrnsave.cpp
View file

@ -41,14 +41,14 @@
#include <QTimer> #include <QTimer>
#include <QTreeWidget> #include <QTreeWidget>
#include <QHeaderView> #include <QHeaderView>
#include <QTreeWidgetItem> #include <QtGui/qtreewidget.h>
#include <QTextStream> #include <QTextStream>
#include <QKeyEvent> #include <QtGui/qevent.h>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QBoxLayout> #include <QBoxLayout>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QResizeEvent> #include <QtGui/qevent.h>
#include <QMouseEvent> #include <QtGui/qevent.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QDesktopWidget> #include <QDesktopWidget>
@ -75,7 +75,7 @@
#include <fixx11h.h> #include <fixx11h.h>
#include "scrnsave.h" #include "scrnsave.h"
#include <QX11Info> #include <QtGui/qx11info_x11.h>
template class QList<SaverConfig*>; template class QList<SaverConfig*>;

6
kcontrol/screensaver/scrnsave.h
View file

@ -29,9 +29,9 @@
#define SCRNSAVE__H #define SCRNSAVE__H
#include <QWidget> #include <QWidget>
#include <QMouseEvent> #include <QtGui/qevent.h>
#include <QResizeEvent> #include <QtGui/qevent.h>
#include <QKeyEvent> #include <QtGui/qevent.h>
#include <KCModule> #include <KCModule>

2
kcontrol/smartcard/smartcard.h
View file

@ -27,7 +27,7 @@
#define KDE3_SUPPORT #define KDE3_SUPPORT
#include <kcmodule.h> #include <kcmodule.h>
#include <QVariantList> #include <QtCore/qvariant.h>
#undef KDE3_SUPPORT #undef KDE3_SUPPORT
#include "smartcardbase.h" #include "smartcardbase.h"

6
kcontrol/splash/installer.cpp
View file

@ -19,10 +19,10 @@
#include <QPixmap> #include <QPixmap>
#include <QFrame> #include <QFrame>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QDropEvent> #include <QtGui/qevent.h>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QDragEnterEvent> #include <QtGui/qevent.h>
#include <QMouseEvent> #include <QtGui/qevent.h>
#include <QScrollArea> #include <QScrollArea>
#include "installer.h" #include "installer.h"

6
kcontrol/splash/installer.h
View file

@ -13,10 +13,10 @@
#include <QMap> #include <QMap>
#include <QPoint> #include <QPoint>
#include <QDragEnterEvent> #include <QtGui/qevent.h>
#include <QMouseEvent> #include <QtGui/qevent.h>
#include <QLabel> #include <QLabel>
#include <QDropEvent> #include <QtGui/qevent.h>
#include <klistwidget.h> #include <klistwidget.h>
#include <kurl.h> #include <kurl.h>

3
kcontrol/style/kcmstyle.cpp
View file

@ -62,9 +62,10 @@
#include <QtGui/QStandardItemModel> #include <QtGui/QStandardItemModel>
#include <QtGui/QStyle> #include <QtGui/QStyle>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/qlibraryinfo.h>
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <QX11Info> #include <QtGui/qx11info_x11.h>
#endif #endif
#include "../krdb/krdb.h" #include "../krdb/krdb.h"

2
kcontrol/touchpad/src/kcm/customconfigdialogmanager.h
View file

@ -20,7 +20,7 @@
#define CUSTOMCONFIGDIALOGMANAGER_H #define CUSTOMCONFIGDIALOGMANAGER_H
#include <QMap> #include <QMap>
#include <QVariantHash> #include <QtCore/qvariant.h>
#include <KConfigDialogManager> #include <KConfigDialogManager>

2
kcontrol/touchpad/src/kcm/customslider.cpp
View file

@ -20,7 +20,7 @@
#include <cmath> #include <cmath>
#include <QResizeEvent> #include <QtGui/qevent.h>
CustomSlider::Interpolator::~Interpolator() CustomSlider::Interpolator::~Interpolator()
{ {

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