From 121b26f5eef583a95b268a391790d8de0d404f0e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Nov 2024 22:46:15 +0900 Subject: Rename KAppDCOPInterface to TDEAppDCOPInterface Signed-off-by: Michele Calgaro --- tdecore/CMakeLists.txt | 2 +- tdecore/MAINTAINERS | 2 +- tdecore/Makefile.am | 4 +- tdecore/kappdcopiface.cpp | 70 ---------------------------------- tdecore/kappdcopiface.h | 80 --------------------------------------- tdecore/kapplication_win.cpp | 4 +- tdecore/tdeappdcopinterface.cpp | 70 ++++++++++++++++++++++++++++++++++ tdecore/tdeappdcopinterface.h | 80 +++++++++++++++++++++++++++++++++++++++ tdecore/tdeapplication.cpp | 28 +++++++------- win/pro_files/tdecore/tdecore.pro | 6 +-- 10 files changed, 173 insertions(+), 173 deletions(-) delete mode 100644 tdecore/kappdcopiface.cpp delete mode 100644 tdecore/kappdcopiface.h create mode 100644 tdecore/tdeappdcopinterface.cpp create mode 100644 tdecore/tdeappdcopinterface.h diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 3857660ad..4e36f0978 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -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 diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index 99b6e7ef2..441274b09 100644 --- a/tdecore/MAINTAINERS +++ b/tdecore/MAINTAINERS @@ -11,7 +11,7 @@ tdeaccel.cpp Ellis Whitehead tdeaccelaction.cpp Ellis Whitehead tdeaccelbase.cpp Ellis Whitehead kallocator.cpp Waldo Bastian -kappdcopiface.cpp +tdeappdcopinterface.cpp tdeapplication.cpp Waldo Bastian kaudioplayer.cpp kcatalogue.cpp Hans Petter Bieker diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index d646aac94..b59c6fd52 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -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 \ diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp deleted file mode 100644 index ed6e26163..000000000 --- a/tdecore/kappdcopiface.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001 Ian Reinhart Geiser - - This program is free software; you can redistribute it and/or - modify it under the terms of the Lesser GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the Lesser GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kappdcopiface.h" -#include -#include -#include -#include - - -KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp) - : DCOPObject( "MainApplication-Interface") -{ - m_TDEApplication = theKApp; -} - -KAppDCOPInterface::~KAppDCOPInterface() -{ -} - -void KAppDCOPInterface::disableSessionManagement() -{ - -} - -TQCString KAppDCOPInterface::startupId() -{ - return ""; -} - -TQCString KAppDCOPInterface::caption() -{ - return ""; -} - -void KAppDCOPInterface::quit() -{ - m_TDEApplication->quit(); -} - -void KAppDCOPInterface::updateUserTimestamp( ulong time ) -{ - m_TDEApplication->updateUserTimestamp( time ); -} - -void KAppDCOPInterface::reparseConfiguration() -{ - TDEGlobal::config()->reparseConfiguration(); -} - -void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) { - m_TDEApplication->broadcastKeyCode(keyCode); -} - diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h deleted file mode 100644 index 164c8b115..000000000 --- a/tdecore/kappdcopiface.h +++ /dev/null @@ -1,80 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001 Ian Reinhart Geiser - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KAPPDCOP_INTERFACE_H -#define KAPPDCOP_INTERFACE_H - -#include -#include -#include -#include -#include "tdelibs_export.h" - -class TDEApplication; - -/** -This is the main interface to the TDEApplication. This will provide a consistant -dcop interface to all KDE applications that use it. -@short DCOP interface to TDEApplication. -@author Ian Reinhart Geiser -*/ -class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject -{ -K_DCOP - -public: - /** - Construct a new interface object. - @param theKapp - The parent TDEApplication object - that will provide us with the functional interface. - */ - KAppDCOPInterface( TDEApplication * theKapp ); - /** - Destructor - Cleans up the dcop connection. - **/ - ~KAppDCOPInterface(); -k_dcop: - /** - Disable current applications session management - **/ - void disableSessionManagement(); - - TQCString startupId(); - TQCString caption(); - - void quit(); - - void reparseConfiguration(); - - void updateUserTimestamp( ulong time ); - /** - Send a fake keypress to all TDEApplication instances - For internal use in connecting insecure function keys to - KDE applications while the X keyboard is locked. - **/ - void sendFakeKey( unsigned int keyCode); - -private: - TDEApplication *m_TDEApplication; -}; - -#endif - - diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index 38bafaef8..475dc070f 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -23,7 +23,7 @@ #include #include "kcheckaccelerators.h" -#include "kappdcopiface.h" +#include "tdeappdcopinterface.h" #include #include @@ -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; }; diff --git a/tdecore/tdeappdcopinterface.cpp b/tdecore/tdeappdcopinterface.cpp new file mode 100644 index 000000000..c67d1931d --- /dev/null +++ b/tdecore/tdeappdcopinterface.cpp @@ -0,0 +1,70 @@ +/* This file is part of the KDE project + Copyright (C) 2001 Ian Reinhart Geiser + + This program is free software; you can redistribute it and/or + modify it under the terms of the Lesser GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the Lesser GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "tdeappdcopinterface.h" +#include +#include +#include +#include + + +TDEAppDCOPInterface::TDEAppDCOPInterface(TDEApplication * theKApp) + : DCOPObject( "MainApplication-Interface") +{ + m_TDEApplication = theKApp; +} + +TDEAppDCOPInterface::~TDEAppDCOPInterface() +{ +} + +void TDEAppDCOPInterface::disableSessionManagement() +{ + +} + +TQCString TDEAppDCOPInterface::startupId() +{ + return ""; +} + +TQCString TDEAppDCOPInterface::caption() +{ + return ""; +} + +void TDEAppDCOPInterface::quit() +{ + m_TDEApplication->quit(); +} + +void TDEAppDCOPInterface::updateUserTimestamp( ulong time ) +{ + m_TDEApplication->updateUserTimestamp( time ); +} + +void TDEAppDCOPInterface::reparseConfiguration() +{ + TDEGlobal::config()->reparseConfiguration(); +} + +void TDEAppDCOPInterface::sendFakeKey( unsigned int keyCode) { + m_TDEApplication->broadcastKeyCode(keyCode); +} + diff --git a/tdecore/tdeappdcopinterface.h b/tdecore/tdeappdcopinterface.h new file mode 100644 index 000000000..0288e4b01 --- /dev/null +++ b/tdecore/tdeappdcopinterface.h @@ -0,0 +1,80 @@ +/* This file is part of the KDE project + Copyright (C) 2001 Ian Reinhart Geiser + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef TDEAPPDCOP_INTERFACE_H +#define TDEAPPDCOP_INTERFACE_H + +#include +#include +#include +#include +#include "tdelibs_export.h" + +class TDEApplication; + +/** +This is the main interface to the TDEApplication. This will provide a consistant +dcop interface to all KDE applications that use it. +@short DCOP interface to TDEApplication. +@author Ian Reinhart Geiser +*/ +class TDECORE_EXPORT TDEAppDCOPInterface : virtual public DCOPObject +{ +K_DCOP + +public: + /** + Construct a new interface object. + @param theKapp - The parent TDEApplication object + that will provide us with the functional interface. + */ + TDEAppDCOPInterface( TDEApplication * theKapp ); + /** + Destructor + Cleans up the dcop connection. + **/ + ~TDEAppDCOPInterface(); +k_dcop: + /** + Disable current applications session management + **/ + void disableSessionManagement(); + + TQCString startupId(); + TQCString caption(); + + void quit(); + + void reparseConfiguration(); + + void updateUserTimestamp( ulong time ); + /** + Send a fake keypress to all TDEApplication instances + For internal use in connecting insecure function keys to + KDE applications while the X keyboard is locked. + **/ + void sendFakeKey( unsigned int keyCode); + +private: + TDEApplication *m_TDEApplication; +}; + +#endif + + diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index d089f24f6..6b48f805a 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -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. diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index 55106e943..2de2351c9 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -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 \ -- cgit v1.2.1