[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/krfb
From: George Goldberg <grundleborg () googlemail ! com>
Date: 2010-10-23 19:30:43
Message-ID: 20101023193043.0BD33AC89B () svn ! kde ! org
[Download RAW message or body]
SVN commit 1189037 by gberg:
Fix all the #includes to not be complete chaos.
M +6 -3 abstractconnectioncontroller.cpp
M +2 -2 abstractconnectioncontroller.h
M +5 -6 abstractrfbserver.cpp
M +1 -2 abstractrfbserver.h
M +3 -3 connectiondialog.cpp
M +2 -1 connectiondialog.h
M +2 -2 events.cpp
M +3 -3 events.h
M +4 -2 framebuffer.cpp
M +6 -5 framebuffer.h
M +1 -0 framebuffermanager.h
M +1 -0 framebufferplugin.h
M +2 -3 invitation.h
M +1 -1 invitationmanager.cpp
M +2 -2 invitationmanager.h
M +3 -3 invitedialog.cpp
M +18 -15 krfbconnectioncontroller.cpp
M +18 -17 krfbserver.cpp
M +12 -13 main.cpp
M +15 -15 manageinvitationsdialog.cpp
M +2 -1 manageinvitationsdialog.h
M +9 -6 personalinvitedialog.cpp
M +4 -2 personalinvitedialog.h
M +0 -1 servermanager.cpp
M +9 -10 trayicon.cpp
M +2 -2 trayicon.h
--- trunk/KDE/kdenetwork/krfb/abstractconnectioncontroller.cpp #1189036:1189037
@@ -20,16 +20,19 @@
* Boston, MA 02110-1301, USA.
*/
-#include <KDebug>
-
#include "abstractconnectioncontroller.h"
#include "abstractrfbserver.h"
#include "connectiondialog.h"
-#include "events.h"
+#include <KDebug>
+
#include <string.h>
+// events.h includes Xlib.h, which must always be included after all Qt headers,
+// so this must always be the last #include.
+#include "events.h"
+
static void clientGoneHook(rfbClientPtr cl)
{
AbstractConnectionController *cc = static_cast<AbstractConnectionController *>(cl->clientData);
--- trunk/KDE/kdenetwork/krfb/abstractconnectioncontroller.h #1189036:1189037
@@ -22,10 +22,10 @@
#ifndef KRFB_ABSTRACTCONNECTIONCONTROLLER_H
#define KRFB_ABSTRACTCONNECTIONCONTROLLER_H
+#include "rfb.h"
+
#include <QtCore/QObject>
-#include "rfb.h"
-
class AbstractRfbServer;
class AbstractConnectionController : public QObject
--- trunk/KDE/kdenetwork/krfb/abstractrfbserver.cpp #1189036:1189037
@@ -18,24 +18,23 @@
* Boston, MA 02110-1301, USA.
*/
-#include "servermanager.h"
-
#include "abstractrfbserver.h"
#include "abstractconnectioncontroller.h"
#include "framebuffer.h"
#include "invitationmanager.h"
#include "krfbconfig.h"
+#include "servermanager.h"
#include "sockethelpers.h"
-#include <QtCore/QPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
-
#include <KDebug>
#include <KLocale>
#include <KMessageBox>
+#include <QtCore/QPointer>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QTimer>
+
#include <X11/Xutil.h>
#include <X11/extensions/XTest.h>
--- trunk/KDE/kdenetwork/krfb/abstractrfbserver.h #1189036:1189037
@@ -23,12 +23,11 @@
#define KRFB_ABSTRACTRFBSERVER_H
#include "framebuffer.h"
+#include "rfb.h"
#include <QtCore/QObject>
#include <QtCore/QSharedPointer>
-#include "rfb.h"
-
class AbstractConnectionController;
class AbstractRfbServer : public QObject
--- trunk/KDE/kdenetwork/krfb/connectiondialog.cpp #1189036:1189037
@@ -19,13 +19,13 @@
#include "connectiondialog.h"
-#include <QCheckBox>
-#include <QLabel>
-
#include <KIconLoader>
#include <KLocale>
#include <KStandardGuiItem>
+#include <QtGui/QCheckBox>
+#include <QtGui/QLabel>
+
ConnectionDialog::ConnectionDialog( QWidget *parent )
: KDialog( parent )
{
--- trunk/KDE/kdenetwork/krfb/connectiondialog.h #1189036:1189037
@@ -20,9 +20,10 @@
#ifndef CONNECTIONDIALOG_H
#define CONNECTIONDIALOG_H
-#include <KDialog>
#include "ui_connectionwidget.h"
+#include <KDialog>
+
class QWidget;
class ConnectionDialog : public KDialog, public Ui::ConnectionWidget
--- trunk/KDE/kdenetwork/krfb/events.cpp #1189036:1189037
@@ -12,8 +12,8 @@
#include "abstractconnectioncontroller.h"
-#include <QApplication>
-#include <QX11Info>
+#include <QtGui/QApplication>
+#include <QtGui/QX11Info>
#include <X11/Xutil.h>
#include <X11/keysym.h>
--- trunk/KDE/kdenetwork/krfb/events.h #1189036:1189037
@@ -11,9 +11,9 @@
#ifndef EVENTS_H
#define EVENTS_H
-#include <QDesktopWidget>
-#include <QEvent>
-#include <QString>
+#include <QtCore/QEvent>
+#include <QtCore/QString>
+#include <QtGui/QDesktopWidget>
#include <X11/Xlib.h>
--- trunk/KDE/kdenetwork/krfb/framebuffer.cpp #1189036:1189037
@@ -8,9 +8,8 @@
*/
#include "framebuffer.h"
-#include "framebuffer.moc"
-#include <config-krfb.h>
+#include "config-krfb.h"
#include <X11/Xutil.h>
@@ -69,3 +68,6 @@
{
}
+
+#include "framebuffer.moc"
+
--- trunk/KDE/kdenetwork/krfb/framebuffer.h #1189036:1189037
@@ -10,15 +10,16 @@
#ifndef FRAMEBUFFER_H
#define FRAMEBUFFER_H
-#include <QObject>
-#include <QRect>
-#include <QList>
-#include <QWidget>
+#include "rfb.h"
#include <kdemacros.h>
-#include "rfb.h"
+#include <QtCore/QObject>
+#include <QtCore/QRect>
+#include <QtCore/QList>
+#include <QtGui/QWidget>
+
class FrameBuffer;
/**
@author Alessandro Praduroux <pradu@pradu.it>
--- trunk/KDE/kdenetwork/krfb/framebuffermanager.h #1189036:1189037
@@ -29,6 +29,7 @@
#include <QtCore/QObject>
#include <QtCore/QSharedPointer>
#include <QtCore/QWeakPointer>
+
#include <QtGui/QWidget>
class FrameBufferPlugin;
--- trunk/KDE/kdenetwork/krfb/framebufferplugin.h #1189036:1189037
@@ -24,6 +24,7 @@
#include <kdemacros.h>
#include <QtCore/QVariantList>
+
#include <QtGui/QWidget>
class FrameBuffer;
--- trunk/KDE/kdenetwork/krfb/invitation.h #1189036:1189037
@@ -20,11 +20,10 @@
#include <KApplication>
#include <KConfig>
-#include <QObject>
-#include <QDateTime>
+#include <QtCore/QDateTime>
+#include <QtCore/QObject>
-
const int INVITATION_DURATION = 60*60;
class Invitation {
--- trunk/KDE/kdenetwork/krfb/invitationmanager.cpp #1189036:1189037
@@ -13,7 +13,7 @@
#include <KConfig>
#include <KGlobal>
-#include <QTimer>
+#include <QtCore/QTimer>
class InvitationManagerPrivate
{
--- trunk/KDE/kdenetwork/krfb/invitationmanager.h #1189036:1189037
@@ -9,10 +9,10 @@
#ifndef INVITATIONMANAGER_H
#define INVITATIONMANAGER_H
-#include <QObject>
-#include <QList>
#include "invitation.h"
+#include <QtCore/QList>
+#include <QtCore/QObject>
class InvitationManagerPrivate;
/**
--- trunk/KDE/kdenetwork/krfb/invitedialog.cpp #1189036:1189037
@@ -19,14 +19,14 @@
#include "invitedialog.h"
-#include <kiconloader.h>
-#include <klocale.h>
+#include <KIconLoader>
+#include <KLocale>
#include <KStandardGuiItem>
+#include <QtGui/QCursor>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QToolTip>
-#include <QtGui/QCursor>
InviteDialog::InviteDialog( QWidget *parent )
: KDialog( parent )
--- trunk/KDE/kdenetwork/krfb/krfbconnectioncontroller.cpp #1189036:1189037
@@ -22,31 +22,34 @@
#include "krfbconnectioncontroller.h"
-#include <QX11Info>
-#include <QHostInfo>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QTcpSocket>
-#include <QTimer>
+#include "connectiondialog.h"
+#include "invitationmanager.h"
+#include "krfbconfig.h"
+#include "krfbserver.h"
+#include "sockethelpers.h"
#include <KConfig>
+#include <KDebug>
#include <KGlobal>
+#include <KLocale>
+#include <KNotification>
#include <KUser>
-#include <KNotification>
-#include <KLocale>
-#include <KDebug>
+#include <QtCore/QTimer>
-#include "invitationmanager.h"
-#include "connectiondialog.h"
-#include "events.h"
-#include "krfbserver.h"
-#include "sockethelpers.h"
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QX11Info>
-#include "krfbconfig.h"
+#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QTcpSocket>
#include <X11/Xutil.h>
+// events.h includes Xlib.h, which must always be included after all Qt headers,
+// so this must always be the last #include.
+#include "events.h"
+
static bool checkPassword(const QString &p, unsigned char *ochallenge, const char *response, int len)
{
if ((len == 0) && (p.length() == 0)) {
--- trunk/KDE/kdenetwork/krfb/krfbserver.cpp #1189036:1189037
@@ -8,36 +8,35 @@
version 2 of the License, or (at your option) any later version.
*/
-#include "servermanager.h"
-
#include "krfbserver.h"
-#include "krfbserver.moc"
+#include "abstractconnectioncontroller.h"
+#include "framebuffer.h"
+#include "framebuffermanager.h"
+#include "krfbconfig.h"
#include "krfbconnectioncontroller.h"
+#include "invitationmanager.h"
+#include "servermanager.h"
+#include "sockethelpers.h"
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QTimer>
-#include <QHostInfo>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QPointer>
+#include <dnssd/publicservice.h>
#include <KGlobal>
#include <KUser>
#include <KLocale>
#include <KDebug>
#include <KMessageBox>
-#include <dnssd/publicservice.h>
-#include "abstractconnectioncontroller.h"
-#include "framebuffer.h"
-#include "framebuffermanager.h"
-#include "krfbconfig.h"
-#include "invitationmanager.h"
-#include "sockethelpers.h"
+#include <QtCore/QPointer>
+#include <QtCore/QTimer>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QTcpSocket>
+
KrfbServer::KrfbServer()
: AbstractRfbServer()
@@ -97,3 +96,5 @@
}
+#include "krfbserver.moc"
+
--- trunk/KDE/kdenetwork/krfb/main.cpp #1189036:1189037
@@ -15,25 +15,24 @@
* *
***************************************************************************/
-#include "trayicon.h"
-//#include "configuration.h"
#include "krfbserver.h"
#include "manageinvitationsdialog.h"
#include "servermanager.h"
+#include "trayicon.h"
-#include <QPixmap>
-#include <kaction.h>
-#include <kdebug.h>
+#include <KAboutApplicationDialog>
+#include <KAboutData>
+#include <KAction>
+#include <KApplication>
+#include <KCmdLineArgs>
+#include <KDebug>
+#include <KLocale>
+#include <KMessageBox>
#include <KNotification>
-#include <ksystemtrayicon.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kaboutapplicationdialog.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <qwindowdefs.h>
+#include <QtGui/QPixmap>
+#include <QtGui/qwindowdefs.h>
+
#include <signal.h>
#define VERSION "1.0"
--- trunk/KDE/kdenetwork/krfb/manageinvitationsdialog.cpp #1189036:1189037
@@ -7,33 +7,30 @@
version 2 of the License, or (at your option) any later version.
*/
#include "manageinvitationsdialog.h"
-#include "manageinvitationsdialog.moc"
-#include "personalinvitedialog.h"
#include "invitationmanager.h"
#include "invitation.h"
#include "krfbconfig.h"
#include "krfbserver.h"
+#include "personalinvitedialog.h"
#include "servermanager.h"
+#include "ui_configtcp.h"
+#include "ui_configsecurity.h"
-#include <QWidget>
-#include <QToolTip>
-#include <QCursor>
-#include <QDateTime>
-#include <QNetworkInterface>
-
-#include <KStandardGuiItem>
+#include <KConfigDialog>
+#include <KGlobal>
#include <KIconLoader>
#include <KLocale>
-#include <KGlobal>
-#include <KConfigDialog>
#include <KMessageBox>
+#include <KStandardGuiItem>
+#include <KSystemTimeZone>
#include <KToolInvocation>
-#include <KSystemTimeZone>
-// settings dialog
-#include "ui_configtcp.h"
-#include "ui_configsecurity.h"
+#include <QtGui/QWidget>
+#include <QtGui/QToolTip>
+#include <QtGui/QCursor>
+#include <QtCore/QDateTime>
+#include <QtNetwork/QNetworkInterface>
class TCP: public QWidget, public Ui::TCP {
public:
@@ -241,3 +238,6 @@
deleteOneButton->setEnabled(invitationWidget->selectedItems().size() > 0);
}
+
+#include "manageinvitationsdialog.moc"
+
--- trunk/KDE/kdenetwork/krfb/manageinvitationsdialog.h #1189036:1189037
@@ -10,9 +10,10 @@
#ifndef MANAGEINVITATIONSDIALOG_H
#define MANAGEINVITATIONSDIALOG_H
-#include <KDialog>
#include "ui_manageinvitations.h"
+#include <KDialog>
+
/**
@author Alessandro Praduroux <pradu@pradu.it>
*/
--- trunk/KDE/kdenetwork/krfb/personalinvitedialog.cpp #1189036:1189037
@@ -18,17 +18,17 @@
*/
#include "personalinvitedialog.h"
-#include "personalinvitedialog.moc"
+#include "krfbconfig.h"
+
+#include <KIconLoader>
+#include <KLocale>
+
#include <QtGui/QLabel>
#include <QtGui/QToolTip>
-#include <QNetworkInterface>
-#include <kiconloader.h>
-#include <klocale.h>
+#include <QtNetwork/QNetworkInterface>
-#include "krfbconfig.h"
-
PersonalInviteDialog::PersonalInviteDialog( QWidget *parent )
: KDialog( parent )
{
@@ -97,3 +97,6 @@
}
}
+
+#include "personalinvitedialog.moc"
+
--- trunk/KDE/kdenetwork/krfb/personalinvitedialog.h #1189036:1189037
@@ -20,10 +20,12 @@
#ifndef PERSONALINVITEDIALOG_H
#define PERSONALINVITEDIALOG_H
-#include <qdatetime.h>
-#include <KDialog>
#include "ui_personalinvitewidget.h"
+#include <KDialog>
+
+#include <QtCore/QDateTime>
+
class QWidget;
class PersonalInviteDialog : public KDialog, public Ui::PersonalInviteWidget
{
--- trunk/KDE/kdenetwork/krfb/servermanager.cpp #1189036:1189037
@@ -21,7 +21,6 @@
#include "servermanager.h"
#include "sockethelpers.h"
-
#include "rfb.h"
#include <KDebug>
--- trunk/KDE/kdenetwork/krfb/trayicon.cpp #1189036:1189037
@@ -17,18 +17,17 @@
#include "trayicon.h"
-#include <kstandardaction.h>
-#include <klocale.h>
-#include <kdialog.h>
-#include <kmenu.h>
-#include <kglobal.h>
-#include <kactioncollection.h>
-#include <kaboutapplicationdialog.h>
-#include <KNotification>
-
-#include "manageinvitationsdialog.h"
#include "invitedialog.h"
+#include "manageinvitationsdialog.h"
+#include <KAboutApplicationDialog>
+#include <KActionCollection>
+#include <KDialog>
+#include <KGlobal>
+#include <KLocale>
+#include <KMenu>
+#include <KNotification>
+#include <KStandardAction>
TrayIcon::TrayIcon(KDialog *d)
: KStatusNotifierItem(d),
--- trunk/KDE/kdenetwork/krfb/trayicon.h #1189036:1189037
@@ -18,10 +18,10 @@
#ifndef TRAYICON_H
#define TRAYICON_H
-#include <kpassivepopup.h>
#include <KActionCollection>
+#include <KPassivePopup>
+#include <KStatusNotifierItem>
#include <KToggleAction>
-#include <kstatusnotifieritem.h>
class KDialog;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic