TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KAppDCOPInterface to TDEAppDCOPInterface

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/320/head
Michele Calgaro 2 weeks ago
parent 1711870a07
commit 121b26f5ee
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
8 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
tdecore/CMakeLists.txt
Unescape View File

@ -126,7 +126,7 @@ set( ${target}_SRCS
fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp
kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
tdeappdcopinterface.cpp tdeappdcopinterface.skel kclipboard.cpp
kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp

2
tdecore/MAINTAINERS
Unescape View File

@ -11,7 +11,7 @@ tdeaccel.cpp Ellis Whitehead <ellis@kde.org>
tdeaccelaction.cpp Ellis Whitehead <ellis@kde.org>
tdeaccelbase.cpp Ellis Whitehead <ellis@kde.org>
kallocator.cpp Waldo Bastian <bastian@kde.org>
kappdcopiface.cpp
tdeappdcopinterface.cpp
tdeapplication.cpp Waldo Bastian <bastian@kde.org>
kaudioplayer.cpp
kcatalogue.cpp Hans Petter Bieker <bieker@kde.org>

4
tdecore/Makefile.am
Unescape View File

@ -110,8 +110,8 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
tdemultipledrag.cpp kstaticdeleter.cpp tdeappdcopinterface.cpp \
tdeappdcopinterface.skel kclipboard.cpp kcheckaccelerators.cpp \
tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
kcalendarsystem.cpp kcalendarsystemgregorian.cpp \
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \

4
tdecore/kapplication_win.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <kurl.h>
#include "kcheckaccelerators.h"
#include "kappdcopiface.h"
#include "tdeappdcopinterface.h"
#include <qassistantclient.h>
#include <tqdir.h>
@ -69,7 +69,7 @@ public:
TQString geometry_arg;
TQCString startup_id;
TQTimer* app_started_timer;
KAppDCOPInterface *m_KAppDCOPInterface;
TDEAppDCOPInterface *m_TDEAppDCOPInterface;
bool session_save;
QAssistantClient* qassistantclient;
};

20
tdecore/kappdcopiface.cpp → tdecore/tdeappdcopinterface.cpp
Unescape View File

@ -17,54 +17,54 @@
Boston, MA 02110-1301, USA.
*/
#include "kappdcopiface.h"
#include "tdeappdcopinterface.h"
#include <tdeapplication.h>
#include <dcopclient.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp)
TDEAppDCOPInterface::TDEAppDCOPInterface(TDEApplication * theKApp)
: DCOPObject( "MainApplication-Interface")
{
m_TDEApplication = theKApp;
}
KAppDCOPInterface::~KAppDCOPInterface()
TDEAppDCOPInterface::~TDEAppDCOPInterface()
{
}
void KAppDCOPInterface::disableSessionManagement()
void TDEAppDCOPInterface::disableSessionManagement()
{
}
TQCString KAppDCOPInterface::startupId()
TQCString TDEAppDCOPInterface::startupId()
{
return "";
}
TQCString KAppDCOPInterface::caption()
TQCString TDEAppDCOPInterface::caption()
{
return "";
}
void KAppDCOPInterface::quit()
void TDEAppDCOPInterface::quit()
{
m_TDEApplication->quit();
}
void KAppDCOPInterface::updateUserTimestamp( ulong time )
void TDEAppDCOPInterface::updateUserTimestamp( ulong time )
{
m_TDEApplication->updateUserTimestamp( time );
}
void KAppDCOPInterface::reparseConfiguration()
void TDEAppDCOPInterface::reparseConfiguration()
{
TDEGlobal::config()->reparseConfiguration();
}
void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) {
void TDEAppDCOPInterface::sendFakeKey( unsigned int keyCode) {
m_TDEApplication->broadcastKeyCode(keyCode);
}

10
tdecore/kappdcopiface.h → tdecore/tdeappdcopinterface.h
Unescape View File

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KAPPDCOP_INTERFACE_H
#define KAPPDCOP_INTERFACE_H
#ifndef TDEAPPDCOP_INTERFACE_H
#define TDEAPPDCOP_INTERFACE_H
#include <dcopobject.h>
#include <tqstringlist.h>
@ -34,7 +34,7 @@ dcop interface to all KDE applications that use it.
@short DCOP interface to TDEApplication.
@author Ian Reinhart Geiser <geiseri@yahoo.com>
*/
class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
class TDECORE_EXPORT TDEAppDCOPInterface : virtual public DCOPObject
{
K_DCOP
@ -44,12 +44,12 @@ public:
@param theKapp - The parent TDEApplication object
that will provide us with the functional interface.
*/
KAppDCOPInterface( TDEApplication * theKapp );
TDEAppDCOPInterface( TDEApplication * theKapp );
/**
Destructor
Cleans up the dcop connection.
**/
~KAppDCOPInterface();
~TDEAppDCOPInterface();
k_dcop:
/**
Disable current applications session management

28
tdecore/tdeapplication.cpp
Unescape View File

@ -185,7 +185,7 @@ extern int getfd(const char *fnam);
}
#endif
#include "kappdcopiface.h"
#include "tdeappdcopinterface.h"
// exported for tdm kfrontend
TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
@ -326,7 +326,7 @@ public:
overrideStyle( TQString::null ),
startup_id( "0" ),
app_started_timer( NULL ),
m_KAppDCOPInterface( 0L ),
m_TDEAppDCOPInterface( 0L ),
session_save( false )
#ifdef TQ_WS_X11
,oldXErrorHandler( NULL )
@ -360,7 +360,7 @@ public:
TQString geometry_arg;
TQCString startup_id;
TQTimer* app_started_timer;
KAppDCOPInterface *m_KAppDCOPInterface;
TDEAppDCOPInterface *m_TDEAppDCOPInterface;
bool session_save;
#ifdef TQ_WS_X11
int (*oldXErrorHandler)(Display*,XErrorEvent*);
@ -720,7 +720,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
// FIXME
@ -748,7 +748,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) :
@ -771,7 +771,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenable
installSigpipeHandler();
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
// FIXME
@ -797,7 +797,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
installSigpipeHandler();
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
#ifdef TQ_WS_X11
@ -814,7 +814,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
installSigpipeHandler();
parseCommandLine( );
init( true );
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) :
@ -831,7 +831,7 @@ TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE vis
installSigpipeHandler();
parseCommandLine( );
init( true );
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
@ -850,7 +850,7 @@ TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE co
installSigpipeHandler();
parseCommandLine( );
init( true );
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
@ -869,7 +869,7 @@ TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE co
installSigpipeHandler();
parseCommandLine( );
init( true );
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
#endif
@ -894,7 +894,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance*
installSigpipeHandler();
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
#ifdef TQ_WS_X11
@ -919,7 +919,7 @@ TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const T
TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
}
#endif
@ -1858,7 +1858,7 @@ TDEApplication::~TDEApplication()
aIconPixmap.pm.miniIcon = 0L;
delete aIconPixmap.pm.icon;
aIconPixmap.pm.icon = 0L;
delete d->m_KAppDCOPInterface;
delete d->m_TDEAppDCOPInterface;
// First call the static deleters and then call KLibLoader::cleanup()
// The static deleters may delete libraries for which they need KLibLoader.

6
win/pro_files/tdecore/tdecore.pro
Unescape View File

@ -85,7 +85,7 @@ tdesycocadict.cpp \
tdesycocafactory.cpp \
tdeapplication.cpp \
kapplication_win.cpp \
kappdcopiface.cpp \
tdeappdcopinterface.cpp \
kprocctrl.cpp \
kdesktopfile.cpp \
kbufferedio.cpp \
@ -128,8 +128,8 @@ kqiodevicegzip_p.cpp
# generated:
SOURCES += \
kappdcopiface_stub.cpp \
kappdcopiface_skel.cpp \
tdeappdcopiface_stub.cpp \
tdeappdcopiface_skel.cpp \
tdesycoca_stub.cpp \
tdesycoca_skel.cpp \
kdebugdcopiface_stub.cpp \

Write Preview
Loading…
Cancel
Save