Rename KUniqueApplication to TDEUniqueApplication

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/555/head
Michele Calgaro 4 months ago
parent 657e8ed6bd
commit c1e3b95ae6
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -70,7 +70,6 @@
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <ktrader.h>
#include <kuniqueapplication.h>
#include <kurldrag.h>
#include <kdesktopfile.h>
#include <khelpmenu.h>

@ -92,7 +92,7 @@ static ModifierKey modifierKeys[] = {
KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
: KUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false),
: TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false),
overlay(0), wm(0, KWinModule::INFO_DESKTOP)
{
_activeWindow = wm.activeWindow();

@ -6,7 +6,7 @@
#include <tqcolor.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <twinmodule.h>
@ -19,7 +19,7 @@ class KDialogBase;
class TQLabel;
class KComboBox;
class KAccessApp : public KUniqueApplication
class KAccessApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -21,11 +21,11 @@
#define TDEHWDEVICEAPP_H
#include <tqtimer.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class HwDeviceSystemTray;
class HwDeviceApp : public KUniqueApplication
class HwDeviceApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -27,7 +27,7 @@
// TDE
#include <ksimpleconfig.h>
#include <tdecmdlineargs.h>
#include <kuniqueapplication.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdelocale.h>
#include <kdebug.h>

@ -50,7 +50,7 @@
#include "version.h"
KControlApp::KControlApp()
: KUniqueApplication()
: TDEUniqueApplication()
, toplevel(0)
{
toplevel = new TopLevel();
@ -58,7 +58,7 @@ KControlApp::KControlApp()
setMainWidget(toplevel);
TDEGlobal::setActiveInstance(this);
// KUniqueApplication does dcop regitration for us
// TDEUniqueApplication does dcop regitration for us
ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface");
connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest()));
@ -121,7 +121,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org");
TDECmdLineArgs::init( argc, argv, aboutData );
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
KCGlobal::init();

@ -21,11 +21,11 @@
#ifndef __main_h__
#define __main_h__
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class TopLevel;
class KControlApp : public KUniqueApplication
class KControlApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -20,11 +20,11 @@
#define TDERANDRAPP_H
#include <tqtimer.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class KRandRSystemTray;
class KRandRApp : public KUniqueApplication
class KRandRApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -20,7 +20,7 @@
#include <kdesktopapp.h>
KDesktopApp::KDesktopApp():
KUniqueApplication()
TDEUniqueApplication()
{
#ifdef COMPOSITE
initCmBackground();
@ -28,7 +28,7 @@ KUniqueApplication()
}
KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap):
KUniqueApplication(dpy, visual, colormap)
TDEUniqueApplication(dpy, visual, colormap)
{
#ifdef COMPOSITE
initCmBackground();
@ -87,7 +87,7 @@ bool KDesktopApp::x11EventFilter (XEvent * xevent)
emit cmBackgroundChanged(supported);
}
}
return KUniqueApplication::x11EventFilter (xevent);
return TDEUniqueApplication::x11EventFilter (xevent);
}
#endif

@ -21,7 +21,7 @@
#define __kdesktopapp_h__
#include <config.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE
@ -33,7 +33,7 @@
# include <fixx11h.h>
#endif
class KDesktopApp : public KUniqueApplication
class KDesktopApp : public TDEUniqueApplication
{
TQ_OBJECT
public:

@ -18,7 +18,7 @@
*/
#include <config.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <dcopclient.h>
#include <tdeaboutdata.h>
@ -184,7 +184,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
if (!KUniqueApplication::start()) {
if (!TDEUniqueApplication::start()) {
fprintf(stderr, "kdesktop is already running!\n");
exit(0);
}

@ -27,7 +27,7 @@
using namespace KHC;
Application::Application() : KUniqueApplication(), mMainWindow( 0 )
Application::Application() : TDEUniqueApplication(), mMainWindow( 0 )
{
}
@ -49,7 +49,7 @@ int Application::newInstance()
mMainWindow->openUrl( url );
return KUniqueApplication::newInstance();
return TDEUniqueApplication::newInstance();
}
static TDECmdLineOptions options[] =

@ -20,13 +20,13 @@
#ifndef APPLICATION_H
#define APPLICATION_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
namespace KHC {
class MainWindow;
class Application : public KUniqueApplication
class Application : public TDEUniqueApplication
{
public:
Application();

@ -26,7 +26,7 @@
#include <tdeaboutdata.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <kdebug.h>
#include <dcopclient.h>
#include <kprocess.h>
@ -181,7 +181,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
TDEApplication app;

@ -21,9 +21,9 @@
#ifndef KHC_INDEXBUILDER_H
#define KHC_INDEXBUILDER_H
#include <kuniqueapplication.h>
#include <tqobject.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqtimer.h>
class TDEProcess;

@ -39,7 +39,7 @@ namespace KHotKeys
// KhotKeysApp
KHotKeysApp::KHotKeysApp()
: KUniqueApplication( false, true ), // no styles
: TDEUniqueApplication( false, true ), // no styles
delete_helper( new TQObject )
{
init_global_data( true, delete_helper ); // grab keys
@ -129,7 +129,7 @@ int TDE_EXPORT kdemain( int argc, char** argv )
// no need to i18n these, no GUI
TDECmdLineArgs::init( argc, argv, "khotkeys", I18N_NOOP( "KHotKeys" ),
I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION );
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
if( !KHotKeysApp::start()) // already running
{
return 0;

@ -11,7 +11,7 @@
#ifndef _KHOTKEYS_APP_H_
#define _KHOTKEYS_APP_H_
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
namespace KHotKeys
{
@ -19,7 +19,7 @@ namespace KHotKeys
class Action_data_group;
class KHotKeysApp
: public KUniqueApplication
: public TDEUniqueApplication
{
TQ_OBJECT
K_DCOP

@ -16,7 +16,7 @@ Contents
NOTE: This is the design which we are working towards, not the design as it
currently is, but there's no point in documenting yesterday.
The class Kicker is a subclass of KUniqueApplication and is where all the
The class Kicker is a subclass of TDEUniqueApplication and is where all the
fun begins. It is always available via the static Kicker::kicker() method.
Upon creation, Kicker::kicker() ensures that its resources are added to the
standard dirs. This includes tile, background and various plugin directories.

@ -62,7 +62,7 @@
Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); }
Kicker::Kicker()
: KUniqueApplication(),
: TDEUniqueApplication(),
keys(0),
m_twinModule(0),
m_configDialog(0),

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqcolor.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <kicontheme.h>
class KCMultiDialog;
@ -36,7 +36,7 @@ class KWinModule;
class PanelKMenu;
class PanelPopupButton;
class Kicker : public KUniqueApplication
class Kicker : public TDEUniqueApplication
{
TQ_OBJECT
K_DCOP

@ -116,7 +116,7 @@ void KlipperAppletWidget::init()
// call() - wait for finishing
kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
// register ourselves, so if klipper process is started,
// it will quit immediately (KUniqueApplication)
// it will quit immediately (TDEUniqueApplication)
s_dcop = new DCOPClient;
s_dcop->registerAs( "klipper", false );
}
@ -129,7 +129,7 @@ KlipperAppletWidget::~KlipperAppletWidget()
DCOPClient* KlipperAppletWidget::s_dcop = 0;
// this is just to make klipper process think we're KUniqueApplication
// this is just to make klipper process think we're TDEUniqueApplication
// (AKA ugly hack)
int KlipperAppletWidget::newInstance()
{

@ -24,7 +24,7 @@
#include <tdecmdlineargs.h>
#include <twin.h>
#include <tdeaboutdata.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include "toplevel.h"
#include "version.h"
@ -38,13 +38,13 @@ extern "C" int TDE_EXPORT kdemain(int argc, char *argv[])
{
Klipper::createAboutData();
TDECmdLineArgs::init( argc, argv, Klipper::aboutData());
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) {
if (!TDEUniqueApplication::start()) {
fprintf(stderr, "Klipper is already running!\n");
exit(0);
}
KUniqueApplication app;
TDEUniqueApplication app;
app.disableSessionManagement();
Klipper *toplevel = new Klipper();

@ -1184,11 +1184,11 @@ Klipper::Klipper( TQWidget* parent )
{
}
// this sucks ... KUniqueApplication registers itself as 'klipper'
// this sucks ... TDEUniqueApplication registers itself as 'klipper'
// for the unique-app detection calls (and it shouldn't use that name IMHO)
// but in Klipper it's not KUniqueApplication class who handles
// but in Klipper it's not TDEUniqueApplication class who handles
// the DCOP calls, but an instance of class Klipper, registered as 'klipper'
// this below avoids a warning when KUniqueApplication wouldn't otherwise
// this below avoids a warning when TDEUniqueApplication wouldn't otherwise
// find newInstance() (which doesn't do anything in Klipper anyway)
int Klipper::newInstance()
{

@ -21,7 +21,7 @@
#include <unistd.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
@ -43,12 +43,12 @@ extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData );
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start())
if (!TDEUniqueApplication::start())
return 1;
KUniqueApplication app;
TDEUniqueApplication app;
KMenuEdit *menuEdit = new KMenuEdit(true);
menuEdit->show();

@ -20,7 +20,7 @@
#include <unistd.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] =
static KMenuEdit *menuEdit = 0;
class KMenuApplication : public KUniqueApplication
class KMenuApplication : public TDEUniqueApplication
{
public:
KMenuApplication() { }
@ -57,7 +57,7 @@ public:
menuEdit->selectMenuEntry(TQString::fromLocal8Bit(args->arg(1)));
}
}
return KUniqueApplication::newInstance();
return TDEUniqueApplication::newInstance();
}
};
@ -72,10 +72,10 @@ extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData );
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions( options );
if (!KUniqueApplication::start())
if (!TDEUniqueApplication::start())
return 1;
KMenuApplication app;

@ -30,7 +30,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kuniqueapplication.h>
#include <tdeapplication.h>
#include <tdemessagebox.h>
#include <twin.h>

@ -34,8 +34,7 @@
#include <dcopclient.h>
#include <tqsocketnotifier.h>
// KDE
#include <kuniqueapplication.h>
// TDE
#include <tdecmdlineargs.h>
#include <tdelocale.h>
#include <tdeglobalsettings.h>

@ -21,7 +21,7 @@
***************************************************************************/
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
@ -40,10 +40,10 @@ static TDECmdLineOptions pagerOpts[] =
bool closed_by_sm = false;
class KPagerApplication : public KUniqueApplication
class KPagerApplication : public TDEUniqueApplication
{
public:
KPagerApplication() : KUniqueApplication() {}
KPagerApplication() : TDEUniqueApplication() {}
void commitData(TQSessionManager& sm) {
if (mainWidget()->isHidden()) {
@ -51,7 +51,7 @@ public:
return;
}
closed_by_sm = true;
KUniqueApplication::commitData( sm );
TDEUniqueApplication::commitData( sm );
closed_by_sm = false;
}
@ -78,9 +78,9 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, aboutdata);
TDECmdLineArgs::addCmdLineOptions(pagerOpts);
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start())
if (!TDEUniqueApplication::start())
{
kdError() << "kpager is already running!" << endl;
return 0;

@ -25,7 +25,7 @@
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <ktip.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <twin.h>
#include <stdlib.h>
@ -37,12 +37,12 @@ int main(int argc, char *argv[])
"0.3", description, TDEAboutData::License_GPL,
"(c) 1998-2002, KDE Developers");
TDECmdLineArgs::init( argc, argv, &aboutData );
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start())
if (!TDEUniqueApplication::start())
exit(-1);
KUniqueApplication app;
TDEUniqueApplication app;
KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips"))));
TQ_CHECK_PTR(tipDialog);

@ -62,7 +62,7 @@ DESCRIPTION
KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
: KUniqueApplication(allowStyles, GUIenabled),
: TDEUniqueApplication(allowStyles, GUIenabled),
m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID),
m_rules(NULL),
m_tray(NULL),

@ -31,7 +31,7 @@ DESCRIPTION
#include <tqdict.h>
#include <tqptrqueue.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include "kxkbtraywindow.h"
#include "kxkbconfig.h"
@ -47,7 +47,7 @@ class LayoutMap;
and switching layouts
*/
class KXKBApp : public KUniqueApplication
class KXKBApp : public TDEUniqueApplication
{
TQ_OBJECT
K_DCOP

@ -17,7 +17,6 @@
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kuniqueapplication.h>
#include "kxkbtraywindow.h"
#include "pixmap.h"
@ -67,19 +66,13 @@ void KxkbLabelController::setError(const TQString& layoutInfo)
void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules)
{
TDEPopupMenu* menu = contextMenu;
// TQPopupMenu* menu = contextMenu;
// int index = menu->indexOf(0);
m_descriptionMap.clear();
// menu->clear();
// menu->insertTitle( kapp->miniIcon(), kapp->caption() );
for(int ii=0; ii<m_prevLayoutCount; ++ii) {
menu->removeItem(START_MENU_ID + ii);
kdDebug() << "remove item: " << START_MENU_ID + ii << endl;
}
/* menu->removeItem(CONFIG_MENU_ID);
menu->removeItem(HELP_MENU_ID);*/
TDEIconEffect iconeffect;

@ -25,7 +25,7 @@
#include <tqtextstream.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdeconfig.h>
#include <tqfile.h>
@ -84,8 +84,8 @@ int main(int argc, char ** argv)
data.addAuthor("David Faure", I18N_NOOP("Original maintainer/developer"), "faure@kde.org");
TDECmdLineArgs::init( argc, argv, &data );
TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions();
KUniqueApplication app;
TDEUniqueApplication::addCmdLineOptions();
TDEUniqueApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQStringList areaList ( readAreaList() );

@ -8,7 +8,7 @@
#include <config.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
@ -36,15 +36,15 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KUniqueApplication::addCmdLineOptions();
TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) {
if (!TDEUniqueApplication::start()) {
kdDebug() << "tdepasswd is already running" << endl;
return 0;
}
KUniqueApplication app;
TDEUniqueApplication app;
KUser ku;
TQString user;

@ -89,7 +89,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e)
//-------------------------------------------------------------
KJobViewerApp::KJobViewerApp() : KUniqueApplication()
KJobViewerApp::KJobViewerApp() : TDEUniqueApplication()
{
m_views.setAutoDelete(true);
m_tray = 0;

@ -20,7 +20,7 @@
#ifndef KJOBVIEWER_H
#define KJOBVIEWER_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdeprint/kpreloadobject.h>
#include <tqdict.h>
@ -28,7 +28,7 @@ class KMJobViewer;
class KMTimer;
class JobTray;
class KJobViewerApp : public KUniqueApplication, public KPReloadObject
class KJobViewerApp : public TDEUniqueApplication, public KPReloadObject
{
TQ_OBJECT
friend class JobTray;

@ -166,7 +166,7 @@ namespace KWinInternal
be used, and it's old; also, creation timestamp is changed to
the time the instance starts (re-)initializing the window,
this ensures creation timestamp will still work somewhat even in this case
- KUniqueApplication - when the window is already visible, and the new instance
- TDEUniqueApplication - when the window is already visible, and the new instance
wants it to activate
- without focus stealing prevention - _NET_ACTIVE_WINDOW - no problem
- with ASN - ASN is forwarded, and set on the already visible window, KWin

Loading…
Cancel
Save