Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 15:51:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

port away from KDE3 support: K3StaticDeleter -> K_GLOBAL_STATIC. Krfb is now KDE3 support free again.

Browse Source 
svn path=/trunk/KDE/kdenetwork/krfb/; revision=712838
This commit is contained in:
Urs Wolfer
2007-09-15 13:11:12 +00:00
parent 4e3efb7760
commit d11198cbd4
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -27,7 +27,6 @@ set(krfb_SRCS
x11framebuffer.cpp
)
kde4_add_kcfg_files(krfb_SRCS krfbconfig.kcfgc)
kde4_add_ui_files(krfb_SRCS connectionwidget.ui
@@ -40,7 +39,7 @@ kde4_add_ui_files(krfb_SRCS connectionwidget.ui
kde4_add_executable(krfb ${krfb_SRCS})
target_link_libraries(krfb ${JPEG_LIBRARIES} ${SLP_LIBRARIES} ${LIBVNCSERVER_LIBRARIES} ${X11_XTest_LIB} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
target_link_libraries(krfb ${JPEG_LIBRARIES} ${SLP_LIBRARIES} ${LIBVNCSERVER_LIBRARIES} ${X11_XTest_LIB} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBRARY})
install(TARGETS krfb DESTINATION ${BIN_INSTALL_DIR})

14
invitationmanager.cpp
View File

@@ -9,18 +9,22 @@
#include "invitationmanager.h"
#include "invitationmanager.moc"
#include <K3StaticDeleter>
#include <KConfigGroup>
#include <KConfig>
#include <KGlobal>
#include <QTimer>
static K3StaticDeleter<InvitationManager> sd;
InvitationManager * InvitationManager::_self = 0;
class InvitationManagerPrivate
{
public:
InvitationManager instance;
};
K_GLOBAL_STATIC(InvitationManagerPrivate, invitationManagerPrivate)
InvitationManager * InvitationManager::self() {
if (!_self) sd.setObject(_self, new InvitationManager);
return _self;
return &invitationManagerPrivate->instance;
}
InvitationManager::InvitationManager()

3
invitationmanager.h
View File

@@ -14,13 +14,14 @@
#include "invitation.h"
class InvitationManager;
class InvitationManagerPrivate;
/**
@author Alessandro Praduroux <pradu@pradu.it>
*/
class InvitationManager : public QObject
{
Q_OBJECT
friend class InvitationManagerPrivate;
public:
static InvitationManager *self();

13
krfbserver.cpp
View File

@@ -23,7 +23,6 @@
#include <KGlobal>
#include <KUser>
#include <KLocale>
#include <K3StaticDeleter>
#include <KMessageBox>
#include <dnssd/publicservice.h>
@@ -127,12 +126,16 @@ class KrfbServer::KrfbServerP {
QByteArray desktopName;
};
class KrfbServerPrivate
{
public:
KrfbServer instance;
};
K_GLOBAL_STATIC(KrfbServerPrivate, krfbServerPrivate)
static K3StaticDeleter<KrfbServer> sdServer;
KrfbServer * KrfbServer::_self = 0;
KrfbServer * KrfbServer::self() {
if (!_self) sdServer.setObject(_self, new KrfbServer);
return _self;
return &krfbServerPrivate->instance;
}

1
krfbserver.h
View File

@@ -22,6 +22,7 @@ This class implements the listening server for the RFB protocol.
class KrfbServer : public QObject
{
Q_OBJECT
friend class KrfbServerPrivate;
public:
static KrfbServer *self();