Browse Source

Rename KApplication to TDEApplication to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
e4e0479220
100 changed files with 212 additions and 212 deletions
  1. +2
    -2
      doc/faq/filemng.docbook
  2. +1
    -1
      drkonqi/crashtest.cpp
  3. +2
    -2
      drkonqi/main.cpp
  4. +1
    -1
      kappfinder/main.cpp
  5. +1
    -1
      kate/ChangeLog
  6. +1
    -1
      kate/app/kateapp.cpp
  7. +1
    -1
      kate/app/kateapp.h
  8. +1
    -1
      kate/app/kwritemain.cpp
  9. +1
    -1
      kcminit/main.cpp
  10. +2
    -2
      kcontrol/access/kaccess.cpp
  11. +9
    -9
      kcontrol/background/bgrender.cpp
  12. +1
    -1
      kcontrol/filetypes/keditfiletype.cpp
  13. +1
    -1
      kcontrol/icons/testicons.cpp
  14. +1
    -1
      kcontrol/input/mouse.cpp
  15. +1
    -1
      kcontrol/kcontrol/toplevel.cpp
  16. +1
    -1
      kcontrol/keys/commandShortcuts.cpp
  17. +1
    -1
      kcontrol/keys/shortcuts.cpp
  18. +1
    -1
      kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
  19. +1
    -1
      kcontrol/kfontinst/viewpart/FontViewerApp.h
  20. +1
    -1
      kcontrol/kicker/menutab_impl.cpp
  21. +1
    -1
      kcontrol/konq/desktopbehavior_impl.cpp
  22. +1
    -1
      kcontrol/konq/fontopts.cpp
  23. +1
    -1
      kcontrol/konq/main.cpp
  24. +2
    -2
      kcontrol/konq/rootopts.cpp
  25. +2
    -2
      kcontrol/konqhtml/advancedTabDialog.cpp
  26. +1
    -1
      kcontrol/krdb/krdb.cpp
  27. +1
    -1
      kcontrol/randr/krandrapp.cpp
  28. +1
    -1
      kcontrol/randr/krandrtray.cpp
  29. +1
    -1
      kcontrol/randr/main.cpp
  30. +1
    -1
      kcontrol/smartcard/smartcard.cpp
  31. +6
    -6
      kcontrol/smserver/kcmsmserver.cpp
  32. +2
    -2
      kcontrol/style/kcmstyle.cpp
  33. +1
    -1
      kdcop/kdcop.cpp
  34. +6
    -6
      kdcop/kdcopwindow.cpp
  35. +8
    -8
      kdesktop/bgmanager.cc
  36. +14
    -14
      kdesktop/desktop.cc
  37. +1
    -1
      kdesktop/desktop.h
  38. +1
    -1
      kdesktop/kdiconview.cc
  39. +4
    -4
      kdesktop/krootwm.cc
  40. +1
    -1
      kdesktop/kwebdesktop/kwebdesktop.cpp
  41. +1
    -1
      kdesktop/kxdglauncher.cpp
  42. +1
    -1
      kdesktop/lock/lockprocess.cc
  43. +2
    -2
      kdesktop/lock/main.cc
  44. +2
    -2
      kdesktop/lock/main.h
  45. +1
    -1
      kdesktop/minicli.cpp
  46. +3
    -3
      kdialog/kdialog.cpp
  47. +2
    -2
      kdialog/widgets.cpp
  48. +1
    -1
      kfind/main.cpp
  49. +1
    -1
      khelpcenter/application.cpp
  50. +1
    -1
      khelpcenter/docentry.cpp
  51. +1
    -1
      khelpcenter/htmlsearch/index.cpp
  52. +1
    -1
      khelpcenter/khc_indexbuilder.cpp
  53. +1
    -1
      khelpcenter/navigator.cpp
  54. +1
    -1
      khelpcenter/testmetainfo.cpp
  55. +1
    -1
      khotkeys/kcontrol/kcmkhotkeys.cpp
  56. +1
    -1
      khotkeys/kcontrol/menuedit.cpp
  57. +1
    -1
      khotkeys/update/update.cpp
  58. +10
    -10
      kicker/applets/clock/clock.cpp
  59. +12
    -12
      kicker/applets/clock/clockapplet.kcfg
  60. +1
    -1
      kicker/applets/launcher/quicklauncher.cpp
  61. +1
    -1
      kicker/extensions/kasbar/ChangeLog
  62. +2
    -2
      kicker/extensions/kasbar/kasbarapp.cpp
  63. +1
    -1
      kicker/extensions/kasbar/kasbarextension.cpp
  64. +1
    -1
      kicker/kicker/buttons/kbutton.cpp
  65. +1
    -1
      kicker/kicker/buttons/urlbutton.cpp
  66. +1
    -1
      kicker/kicker/core/kicker.cpp
  67. +1
    -1
      kicker/kicker/core/main.cpp
  68. +1
    -1
      kicker/kicker/core/menumanager.cpp
  69. +1
    -1
      kicker/kicker/kicker-3.4-reverseLayout.cpp
  70. +1
    -1
      kicker/kicker/plugins/kickoff-beagle-plugin.cpp
  71. +2
    -2
      kicker/kicker/ui/hidebutton.cpp
  72. +1
    -1
      kicker/kicker/ui/k_mnu.cpp
  73. +12
    -12
      kicker/kicker/ui/k_new_mnu.cpp
  74. +1
    -1
      kicker/kicker/ui/recentapps.cpp
  75. +1
    -1
      kicker/kicker/ui/service_mnu.cpp
  76. +2
    -2
      kicker/libkicker/panelbutton.cpp
  77. +3
    -3
      kicker/libkicker/panelbutton.h
  78. +2
    -2
      kicker/libkicker/simplebutton.cpp
  79. +1
    -1
      kicker/menuext/find/findmenu.cpp
  80. +3
    -3
      kicker/menuext/konsole/konsole_mnu.cpp
  81. +2
    -2
      kicker/menuext/prefmenu/prefmenu.cpp
  82. +1
    -1
      kicker/menuext/tom/tom.cc
  83. +2
    -2
      kicker/proxy/appletproxy.cpp
  84. +2
    -2
      kicker/proxy/extensiondebugger.cpp
  85. +2
    -2
      kicker/proxy/extensionproxy.cpp
  86. +1
    -1
      kicker/taskbar/taskbar.cpp
  87. +2
    -2
      kioslave/home/kio_home.cpp
  88. +2
    -2
      kioslave/home/testhome.cpp
  89. +1
    -1
      kioslave/man/kio_man_test.cpp
  90. +2
    -2
      kioslave/media/kio_media.cpp
  91. +3
    -3
      kioslave/media/mounthelper/kio_media_mounthelper.cpp
  92. +1
    -1
      kioslave/media/mounthelper/kio_media_mounthelper.h
  93. +2
    -2
      kioslave/media/testmedia.cpp
  94. +2
    -2
      kioslave/remote/kio_remote.cpp
  95. +2
    -2
      kioslave/remote/testremote.cpp
  96. +2
    -2
      kioslave/system/kio_system.cpp
  97. +2
    -2
      kioslave/system/testsystem.cpp
  98. +5
    -5
      kioslave/thumbnail/thumbnail.cpp
  99. +3
    -3
      kioslave/trash/kio_trash.cpp
  100. +2
    -2
      kioslave/trash/ktrash.cpp

+ 2
- 2
doc/faq/filemng.docbook View File

@@ -137,8 +137,8 @@ of <guilabel>Services Preference Order.</guilabel></para></listitem>
</question>
<answer>
<para>They are used by all &tde; applications (since they are implemented in
<classname>KApplication</classname> and all good &tde; programs create a
<classname>KApplication</classname> object before they even look at the
<classname>TDEApplication</classname> and all good &tde; programs create a
<classname>TDEApplication</classname> object before they even look at the
command line arguments).</para> <para>A standard line for a &tde;
application looks like this: <userinput><command>foo</command>
<option>... %i %m -caption \"%c\"</option></userinput>. Pretty confusing,


+ 1
- 1
drkonqi/crashtest.cpp View File

@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

KApplication app(false, false);
TDEApplication app(false, false);
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString type = args->count() ? args->arg(0) : "";
int crashtype = Crash;


+ 2
- 2
drkonqi/main.cpp View File

@@ -80,9 +80,9 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );

KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();

KApplication a;
TDEApplication a;

KrashConfig krashconf;



+ 1
- 1
kappfinder/main.cpp View File

@@ -43,7 +43,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::addCmdLineOptions( options );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

KApplication app;
TDEApplication app;

TopLevel *dlg = new TopLevel( args->getOption( "dir" ) );
app.setMainWidget( dlg );


+ 1
- 1
kate/ChangeLog View File

@@ -208,7 +208,7 @@
* QPopupMenu for filelist

2001-03-20 Christoph Cullmann <cullmann@kde.org>
* kate is now a normal KApplication
* kate is now a normal TDEApplication

2001-03-18 Christoph Cullmann <cullmann@kde.org>
* big location changes of source files


+ 1
- 1
kate/app/kateapp.cpp View File

@@ -52,7 +52,7 @@
#include <sys/types.h>

KateApp::KateApp (TDECmdLineArgs *args)
: KApplication ()
: TDEApplication ()
, m_args (args)
, m_shouldExit (false)
{


+ 1
- 1
kate/app/kateapp.h View File

@@ -39,7 +39,7 @@ class TDECmdLineArgs;
* Kate Application
* This class represents the core kate application object
*/
class KDE_EXPORT KateApp : public KApplication
class KDE_EXPORT KateApp : public TDEApplication
{
Q_OBJECT



+ 1
- 1
kate/app/kwritemain.cpp View File

@@ -591,7 +591,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication a;
TDEApplication a;

KGlobal::locale()->insertCatalogue("katepart");



+ 1
- 1
kcminit/main.cpp View File

@@ -241,7 +241,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.

KApplication app;
TDEApplication app;
app.dcopClient()->registerAs( "kcminit", false );
KLocale::setMainCatalogue(0);
KCMInit kcminit( TDECmdLineArgs::parsedArgs());


+ 2
- 2
kcontrol/access/kaccess.cpp View File

@@ -357,7 +357,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
}

// process other events as usual
return KApplication::x11EventFilter(event);
return TDEApplication::x11EventFilter(event);
}


@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
lay->setSpacing(KDialog::spacingHint());

TQLabel *label1 = new TQLabel( contents);
TQPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
if (pixmap.isNull())
pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
label1->setPixmap(pixmap);


+ 9
- 9
kcontrol/background/bgrender.cpp View File

@@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_isBusyCursor = false;
m_enableBusyCursor = false;
m_pDirs = KGlobal::dirs();
m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
m_pProc = 0L;
m_Tempfile = 0L;
m_bPreview = false;
@@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
void KBackgroundRenderer::desktopResized()
{
m_State = 0;
m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size();
m_rSize = drawBackgroundPerScreen() ? TDEApplication::desktop()->screenGeometry(screen()).size() : TDEApplication::desktop()->geometry().size();
if( !m_bPreview )
m_Size = m_rSize;
}
@@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
}

initRenderers();
m_size = KApplication::desktop()->geometry().size();
m_size = TDEApplication::desktop()->geometry().size();
}

KVirtualBGRenderer::~KVirtualBGRenderer()
@@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)

void KVirtualBGRenderer::desktopResized()
{
m_size = KApplication::desktop()->geometry().size();
m_size = TDEApplication::desktop()->geometry().size();

if (m_pPixmap)
{
@@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)

TQSize KVirtualBGRenderer::renderSize(int screen)
{
return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
return m_bDrawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
}


@@ -1205,7 +1205,7 @@ void KVirtualBGRenderer::initRenderers()

m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);

m_numRenderers = m_bDrawBackgroundPerScreen ? KApplication::desktop()->numScreens() : 1;
m_numRenderers = m_bDrawBackgroundPerScreen ? TDEApplication::desktop()->numScreens() : 1;

m_bFinished.resize(m_numRenderers);
m_bFinished.fill(false);
@@ -1264,11 +1264,11 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen)
// There's more than one renderer, so we are drawing each output to our own pixmap

TQRect overallGeometry;
for (int i=0; i < KApplication::desktop()->numScreens(); ++i) {
overallGeometry |= KApplication::desktop()->screenGeometry(i);
for (int i=0; i < TDEApplication::desktop()->numScreens(); ++i) {
overallGeometry |= TDEApplication::desktop()->screenGeometry(i);
}

TQPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft();
TQPoint drawPos = TDEApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft();
drawPos.setX( int(drawPos.x() * m_scaleX) );
drawPos.setY( int(drawPos.y() * m_scaleY) );



+ 1
- 1
kcontrol/filetypes/keditfiletype.cpp View File

@@ -120,7 +120,7 @@ int main(int argc, char ** argv)

TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

if (args->count() == 0)


+ 1
- 1
kcontrol/icons/testicons.cpp View File

@@ -5,7 +5,7 @@

int main(int argc, char **argv)
{
KApplication app(argc, argv, "testicons");
TDEApplication app(argc, argv, "testicons");
KIconConfig *w = new KIconConfig(0L, "testicons");
app.setMainWidget(w);
w->show();


+ 1
- 1
kcontrol/input/mouse.cpp View File

@@ -827,7 +827,7 @@ void MouseSettings::save(KConfig *config)
}
#endif
config->sync();
KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_MOUSE);
KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_MOUSE);
}

void MouseConfig::slotScrollPolarityChanged()


+ 1
- 1
kcontrol/kcontrol/toplevel.cpp View File

@@ -99,7 +99,7 @@ TopLevel::TopLevel(const char* name)
searchLayout->setMargin( 6 );

TQPushButton *clearButton = new TQPushButton( mSearchFrame );
clearButton->setIconSet( KApplication::reverseLayout() ?
clearButton->setIconSet( TDEApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton );
TQToolTip::add( clearButton, i18n("Clear search") );


+ 1
- 1
kcontrol/keys/commandShortcuts.cpp View File

@@ -130,7 +130,7 @@ void CommandShortcutsModule::initGUI()

void CommandShortcutsModule::launchMenuEditor()
{
if ( KApplication::startServiceByDesktopName( "kmenuedit",
if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
TQString() /*url*/,
0 /*error*/,
0 /*dcopservice*/,


+ 1
- 1
kcontrol/keys/shortcuts.cpp View File

@@ -81,7 +81,7 @@ void ShortcutsModule::save()
m_actionsGeneral.writeActions( "Global Shortcuts", 0, true, true );
m_actionsSequence.writeActions( "Global Shortcuts", 0, true, true );

KIPC::sendMessageAll( KIPC::SettingsChanged, KApplication::SETTINGS_SHORTCUTS );
KIPC::sendMessageAll( KIPC::SettingsChanged, TDEApplication::SETTINGS_SHORTCUTS );
}

void ShortcutsModule::defaults()


+ 1
- 1
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp View File

@@ -188,7 +188,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)

void CKFileFontView::selected(TQListViewItem *item)
{
if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
KGlobalSettings::singleClick())
{
const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();


+ 1
- 1
kcontrol/kfontinst/viewpart/FontViewerApp.h View File

@@ -55,7 +55,7 @@ class CFontViewerAppMainWindow : public KParts::MainWindow

};

class CFontViewerApp : public KApplication
class CFontViewerApp : public TDEApplication
{
public:



+ 1
- 1
kcontrol/kicker/menutab_impl.cpp View File

@@ -289,7 +289,7 @@ void MenuTab::defaults()

void MenuTab::launchMenuEditor()
{
if ( KApplication::startServiceByDesktopName( "kmenuedit",
if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
TQString::null /*url*/,
0 /*error*/,
0 /*dcopservice*/,


+ 1
- 1
kcontrol/konq/desktopbehavior_impl.cpp View File

@@ -400,7 +400,7 @@ void DesktopBehavior::save()
kapp->dcopClient()->attach();
TQByteArray data;

int konq_screen_number = KApplication::desktop()->primaryScreen();
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";


+ 1
- 1
kcontrol/konq/fontopts.cpp View File

@@ -335,7 +335,7 @@ void KonqFontOptions::save()
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );

// Tell kdesktop about the new config file
int konq_screen_number = KApplication::desktop()->primaryScreen();
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";


+ 1
- 1
kcontrol/konq/main.cpp View File

@@ -35,7 +35,7 @@

static TQCString configname()
{
int desktop = KApplication::desktop()->primaryScreen();
int desktop = TDEApplication::desktop()->primaryScreen();
TQCString name;
if (desktop == 0)
name = "kdesktoprc";


+ 2
- 2
kcontrol/konq/rootopts.cpp View File

@@ -251,7 +251,7 @@ void DesktopPathConfig::save()
if (pathChanged)
{
kdDebug() << "DesktopPathConfig::save sending message SettingsChanged" << endl;
KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS);
KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS);
}

// Tell kdesktop about the new config file
@@ -259,7 +259,7 @@ void DesktopPathConfig::save()
kapp->dcopClient()->attach();
TQByteArray data;

int konq_screen_number = KApplication::desktop()->primaryScreen();
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";


+ 2
- 2
kcontrol/konqhtml/advancedTabDialog.cpp View File

@@ -106,9 +106,9 @@ void advancedTabDialog::save()
else m_pConfig->writeEntry( "MultipleTabConfirm", true );

TQByteArray data;
if ( !KApplication::kApplication()->dcopClient()->isAttached() )
if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );

actionButton(Apply)->setEnabled(false);
}


+ 1
- 1
kcontrol/krdb/krdb.cpp View File

@@ -422,7 +422,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version
void runRdb( uint flags )
{
// Obtain the application palette that is about to be set.
TQPalette newPal = KApplication::createApplicationPalette();
TQPalette newPal = TDEApplication::createApplicationPalette();
bool exportColors = flags & KRdbExportColors;
bool exportQtColors = flags & KRdbExportQtColors;
bool exportQtSettings = flags & KRdbExportQtSettings;


+ 1
- 1
kcontrol/randr/krandrapp.cpp View File

@@ -43,5 +43,5 @@ bool KRandRApp::x11EventFilter(XEvent* e)
if (e->type == m_tray->screenChangeNotifyEvent()) {
m_eventMergingTimer.start(1000, TRUE);
}
return KApplication::x11EventFilter( e );
return TDEApplication::x11EventFilter( e );
}

+ 1
- 1
kcontrol/randr/krandrtray.cpp View File

@@ -537,7 +537,7 @@ void KRandRSystemTray::slotDisplayConfig()

void KRandRSystemTray::slotSettingsChanged(int category)
{
if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
globalKeys->readSettings();
globalKeys->updateConnections();
}


+ 1
- 1
kcontrol/randr/main.cpp View File

@@ -44,7 +44,7 @@ int main(int argc, char **argv)

TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();

KRandRApp app;



+ 1
- 1
kcontrol/smartcard/smartcard.cpp View File

@@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
config = new KConfig("ksmartcardrc", false, false);

DCOPClient *dc = KApplication::kApplication()->dcopClient();
DCOPClient *dc = TDEApplication::kApplication()->dcopClient();

_ok = false;
dc->remoteInterfaces("kded", "kardsvc", &_ok);


+ 6
- 6
kcontrol/smserver/kcmsmserver.cpp View File

@@ -79,11 +79,11 @@ void SMServerConfig::load(bool useDefaults )
else // "restorePreviousLogout"
dialog->previousSessionRadio->setChecked(true);

switch (c->readNumEntry("shutdownType", int(KApplication::ShutdownTypeNone))) {
case int(KApplication::ShutdownTypeHalt):
switch (c->readNumEntry("shutdownType", int(TDEApplication::ShutdownTypeNone))) {
case int(TDEApplication::ShutdownTypeHalt):
dialog->haltRadio->setChecked(true);
break;
case int(KApplication::ShutdownTypeReboot):
case int(TDEApplication::ShutdownTypeReboot):
dialog->rebootRadio->setChecked(true);
break;
default:
@@ -116,10 +116,10 @@ void SMServerConfig::save()

c->writeEntry( "shutdownType",
dialog->haltRadio->isChecked() ?
int(KApplication::ShutdownTypeHalt) :
int(TDEApplication::ShutdownTypeHalt) :
dialog->rebootRadio->isChecked() ?
int(KApplication::ShutdownTypeReboot) :
int(KApplication::ShutdownTypeNone));
int(TDEApplication::ShutdownTypeReboot) :
int(TDEApplication::ShutdownTypeNone));
c->writeEntry("excludeApps", dialog->excludeLineedit->text());
c->setGroup("Logout");
c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());


+ 2
- 2
kcontrol/style/kcmstyle.cpp View File

@@ -648,7 +648,7 @@ void KCMStyle::save()

if ( m_bToolbarsDirty )
// ##### FIXME - Doesn't apply all settings correctly due to bugs in
// KApplication/KToolbar
// TDEApplication/KToolbar
KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);

if (m_bEffectsDirty) {
@@ -866,7 +866,7 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
// for other styles being previewed. (e.g SGI style)
w->unsetPalette();

TQPalette newPalette(KApplication::createApplicationPalette());
TQPalette newPalette(TDEApplication::createApplicationPalette());
s->polish( newPalette );
w->setPalette(newPalette);



+ 1
- 1
kdcop/kdcop.cpp View File

@@ -27,7 +27,7 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication a;
TDEApplication a;

KDCOPWindow* kdcopwindow = new KDCOPWindow;
a.setMainWidget( kdcopwindow );


+ 6
- 6
kdcop/kdcopwindow.cpp View File

@@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
void
DCOPBrowserApplicationItem::populate()
{
KApplication::setOverrideCursor(tqwaitCursor);
TDEApplication::setOverrideCursor(tqwaitCursor);

bool ok = false;
bool isDefault = false;
@@ -175,7 +175,7 @@ DCOPBrowserApplicationItem::populate()
isDefault = false;
}

KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
@@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
void
DCOPBrowserInterfaceItem::populate()
{
KApplication::setOverrideCursor(tqwaitCursor);
TDEApplication::setOverrideCursor(tqwaitCursor);

bool ok = false;

@@ -250,7 +250,7 @@ DCOPBrowserInterfaceItem::populate()
if ((*it) != "QCStringList functions()")
new DCOPBrowserFunctionItem(this, app_, object_, *it);

KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

// ------------------------------------------------------------------------
@@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )

void KDCOPWindow::slotFillApplications()
{
KApplication::setOverrideCursor(tqwaitCursor);
TDEApplication::setOverrideCursor(tqwaitCursor);

QCStringList apps = dcopClient->registeredApplications();
TQCString appId = dcopClient->appId();
@@ -917,7 +917,7 @@ void KDCOPWindow::slotFillApplications()
}
}

KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

bool KDCOPWindow::demarshal


+ 8
- 8
kdesktop/bgmanager.cc View File

@@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule

m_pDesktop = desktop;
if (desktop == 0L)
desktop = TQT_TQWIDGET(KApplication::desktop()->screen());
desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());

m_Renderer.resize( 1 );
m_Cache.resize( 1 );
@@ -529,14 +529,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
root_cleared = true;
TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
// but make the pixmap visible until m_pDesktop is visible
TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
}
}
else
{
TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
}

// and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)

void KBackgroundManager::clearRoot()
{
TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap());
TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
}

/*
@@ -925,7 +925,7 @@ void KBackgroundManager::repaintBackground()
if (m_pDesktop)
m_pDesktop->repaint();
else
TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
}

void KBackgroundManager::desktopResized()


+ 14
- 14
kdesktop/desktop.cc View File

@@ -794,13 +794,13 @@ void KDesktop::configure()
void KDesktop::slotSettingsChanged(int category)
{
//kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl;
if (category == KApplication::SETTINGS_PATHS)
if (category == TDEApplication::SETTINGS_PATHS)
{
kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl;
if (m_pIconView)
m_pIconView->recheckDesktopURL();
}
else if (category == KApplication::SETTINGS_SHORTCUTS)
else if (category == TDEApplication::SETTINGS_SHORTCUTS)
{
kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl;
keys->readSettings();
@@ -1021,12 +1021,12 @@ void KDesktop::slotNewWallpaper(const KURL &url)
// for dcop interface backward compatibility
void KDesktop::logout()
{
logout( KApplication::ShutdownConfirmDefault,
KApplication::ShutdownTypeNone );
logout( TDEApplication::ShutdownConfirmDefault,
TDEApplication::ShutdownTypeNone );
}

void KDesktop::logout( KApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype )
void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
TDEApplication::ShutdownType sdtype )
{
if( !kapp->requestShutDown( confirm, sdtype ) )
// this i18n string is also in kicker/applets/run/runapplet
@@ -1038,26 +1038,26 @@ void KDesktop::logout( KApplication::ShutdownConfirm confirm,

void KDesktop::slotLogout()
{
logout( KApplication::ShutdownConfirmDefault,
KApplication::ShutdownTypeDefault );
logout( TDEApplication::ShutdownConfirmDefault,
TDEApplication::ShutdownTypeDefault );
}

void KDesktop::slotLogoutNoCnf()
{
logout( KApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeNone );
logout( TDEApplication::ShutdownConfirmNo,
TDEApplication::ShutdownTypeNone );
}

void KDesktop::slotHaltNoCnf()
{
logout( KApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeHalt );
logout( TDEApplication::ShutdownConfirmNo,
TDEApplication::ShutdownTypeHalt );
}

void KDesktop::slotRebootNoCnf()
{
logout( KApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeReboot );
logout( TDEApplication::ShutdownConfirmNo,
TDEApplication::ShutdownTypeReboot );
}

void KDesktop::setVRoot( bool enable )


+ 1
- 1
kdesktop/desktop.h View File

@@ -94,7 +94,7 @@ public:

virtual void desktopIconsAreaChanged(const TQRect &area, int screen);

void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype );
void logout( TDEApplication::ShutdownConfirm confirm, TDEApplication::ShutdownType sdtype );

KWinModule* twinModule() const { return m_pKwinmodule; }



+ 1
- 1
kdesktop/kdiconview.cc View File

@@ -780,7 +780,7 @@ void KDIconView::saveMediaListView()

// Reload kdesktop configuration to apply changes
TQByteArray data;
int konq_screen_number = KApplication::desktop()->primaryScreen();
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";


+ 4
- 4
kdesktop/krootwm.cc View File

@@ -523,7 +523,7 @@ void KRootWm::slotToggleAutoAlign( bool b )
KDesktopSettings::writeConfig();

// Also save it globally...
int desktop = KApplication::desktop()->primaryScreen();
int desktop = TDEApplication::desktop()->primaryScreen();
TQCString cfilename;
if (desktop == 0)
cfilename = "kdesktoprc";
@@ -627,7 +627,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
void KRootWm::slotWindowList() {
// kdDebug() << "KRootWm::slotWindowList" << endl;
// Popup at the center of the screen, this is from keyboard shortcut.
TQDesktopWidget* desktop = KApplication::desktop();
TQDesktopWidget* desktop = TDEApplication::desktop();
TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();
@@ -647,7 +647,7 @@ void KRootWm::slotSwitchUser() {
// kdDebug() << "KRootWm::slotSwitchUser" << endl;
if (!sessionsMenu)
return;
TQDesktopWidget* desktop = KApplication::desktop();
TQDesktopWidget* desktop = TDEApplication::desktop();
TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();
@@ -830,7 +830,7 @@ void KRootWm::slotSave() {


void KRootWm::slotLogout() {
m_pDesktop->logout(KApplication::ShutdownConfirmDefault, KApplication::ShutdownTypeDefault);
m_pDesktop->logout(TDEApplication::ShutdownConfirmDefault, TDEApplication::ShutdownTypeDefault);
}

void KRootWm::slotPopulateSessions()


+ 1
- 1
kdesktop/kwebdesktop/kwebdesktop.cpp View File

@@ -97,7 +97,7 @@ int main( int argc, char **argv )

TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 3 && args->count() != 4 )


+ 1
- 1
kdesktop/kxdglauncher.cpp View File

@@ -94,7 +94,7 @@ int main( int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions( options );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

KApplication app;
TDEApplication app;
app.disableSessionManagement();

if (args->isSet( "xdgname" ) == true) {


+ 1
- 1
kdesktop/lock/lockprocess.cc View File

@@ -776,7 +776,7 @@ void LockProcess::startSecureDialog()
}
if (ret == 3) {
trinity_desktop_lock_closing_windows = 1;
DCOPRef("ksmserver","ksmserver").send("logout", (int)KApplication::ShutdownConfirmYes, (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeInteractive);
DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
kapp->quit();
}
// FIXME


+ 2
- 2
kdesktop/lock/main.cc View File

@@ -149,7 +149,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
}
}
#endif
return KApplication::x11EventFilter( ev );
return TDEApplication::x11EventFilter( ev );
}


@@ -213,7 +213,7 @@ int main( int argc, char **argv )

putenv(strdup("SESSION_MANAGER="));

KApplication::disableAutoDcopRegistration(); // not needed
TDEApplication::disableAutoDcopRegistration(); // not needed

XSetErrorHandler(trapXErrors);



+ 2
- 2
kdesktop/lock/main.h View File

@@ -24,10 +24,10 @@

#include <time.h>

class MyApp : public KApplication {
class MyApp : public TDEApplication {
Q_OBJECT
public:
MyApp() : KApplication(), lastTick( 0 ) {}
MyApp() : TDEApplication(), lastTick( 0 ) {}
protected:
bool x11EventFilter( XEvent * );
signals:


+ 1
- 1
kdesktop/minicli.cpp View File

@@ -650,7 +650,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
}



+ 3
- 3
kdialog/kdialog.cpp View File

@@ -311,9 +311,9 @@ static int directCommand(TDECmdLineArgs *args)
int w, h;
int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
if ( (m & XNegative) )
x = KApplication::desktop()->width() + x - w;
x = TDEApplication::desktop()->width() + x - w;
if ( (m & YNegative) )
y = KApplication::desktop()->height() + y - h;
y = TDEApplication::desktop()->height() + y - h;
popup->setAnchor( TQPoint(x, y) );
}
#endif
@@ -691,7 +691,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();



+ 2
- 2
kdialog/widgets.cpp View File

@@ -47,9 +47,9 @@ void Widgets::handleXGeometry(TQWidget * dlg)
int w, h;
int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
if ( (m & XNegative) )
x = KApplication::desktop()->width() + x - w;
x = TDEApplication::desktop()->width() + x - w;
if ( (m & YNegative) )
y = KApplication::desktop()->height() + y - h;
y = TDEApplication::desktop()->height() + y - h;
dlg->setGeometry(x, y, w, h);
// kdDebug() << "x: " << x << " y: " << y << " w: " << w << " h: " << h << endl;
}


+ 1
- 1
kfind/main.cpp View File

@@ -45,7 +45,7 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs();



+ 1
- 1
khelpcenter/application.cpp View File

@@ -76,7 +76,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )

TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();

KHC::Application app;



+ 1
- 1
khelpcenter/docentry.cpp View File

@@ -113,7 +113,7 @@ void DocEntry::setIdentifier( const TQString &identifier )

TQString DocEntry::identifier() const
{
if ( mIdentifier.isEmpty() ) mIdentifier = KApplication::randomString( 15 );
if ( mIdentifier.isEmpty() ) mIdentifier = TDEApplication::randomString( 15 );
return mIdentifier;
}



+ 1
- 1
khelpcenter/htmlsearch/index.cpp View File

@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions( options );

KGlobal::locale()->setMainCatalogue("htmlsearch");
KApplication app;
TDEApplication app;
HTMLSearch search;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();


+ 1
- 1
khelpcenter/khc_indexbuilder.cpp View File

@@ -183,7 +183,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions();

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();



+ 1
- 1
khelpcenter/navigator.cpp View File

@@ -100,7 +100,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
searchLayout->setMargin( 6 );

TQPushButton *clearButton = new TQPushButton( mSearchFrame );
clearButton->setIconSet( KApplication::reverseLayout() ?
clearButton->setIconSet( TDEApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton );
connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );


+ 1
- 1
khelpcenter/testmetainfo.cpp View File

@@ -91,7 +91,7 @@ int main(int argc,char **argv)
KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

KApplication app;
TDEApplication app;

kdDebug() << "Scanning Meta Info" << endl;



+ 1
- 1
khotkeys/kcontrol/kcmkhotkeys.cpp View File

@@ -133,7 +133,7 @@ void Module::save()
if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
KApplication::tdeinitExec( "khotkeys" );
TDEApplication::tdeinitExec( "khotkeys" );
}
else
{


+ 1
- 1
khotkeys/kcontrol/menuedit.cpp View File

@@ -194,7 +194,7 @@ void khotkeys_send_reread_config()
if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
KApplication::tdeinitExec( "khotkeys" );
TDEApplication::tdeinitExec( "khotkeys" );
}
else
{


+ 1
- 1
khotkeys/update/update.cpp View File

@@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
"KHotKeys update utility", "1.0" );
TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
TDEApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
TQCString id = args->getOption( "id" );
TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );


+ 10
- 10
kicker/applets/clock/clock.cpp View File

@@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
settings = new SettingsWidgetImp(prefs, zone, 0, "General");
connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));

settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());

// Digital
digitalPage = new DigitalWidget(0, "DigitalClock");
settings->widgetStack->addWidget(digitalPage, 1);
digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());

// Analog
analogPage = new AnalogWidget(0, "AnalogClock");
settings->widgetStack->addWidget(analogPage, 2);
analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());

// Fuzzy
fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
settings->widgetStack->addWidget(fuzzyPage, 3);
fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());

connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
@@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
}
else if (_prefs->digitalBackgroundColor() !=
KApplication::palette().active().background())
TDEApplication::palette().active().background())
{
p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
}
@@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )

paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
}
else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
else if (_prefs->analogBackgroundColor() != TDEApplication::palette().active().background())
{
_spPx->fill(_prefs->analogBackgroundColor());
}
@@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)

void ClockApplet::updateFollowBackground()
{
TQColor globalBgroundColor = KApplication::palette().active().background();
TQColor globalBgroundColor = TDEApplication::palette().active().background();
TQColor bgColor;
switch (_prefs->type())
@@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()

void ClockApplet::setBackground()
{
TQColor globalBgroundColor = KApplication::palette().active().background();
TQColor globalBgroundColor = TDEApplication::palette().active().background();
TQColor fgColor, bgColor;
if (!_clock)
@@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
return;
TQColor globalBgroundColor = KApplication::palette().active().background();
TQColor globalBgroundColor = TDEApplication::palette().active().background();
if (m_dateFollowBackgroundSetting)
_prefs->setDateBackgroundColor(globalBgroundColor);


+ 12
- 12
kicker/applets/clock/clockapplet.kcfg View File

@@ -20,11 +20,11 @@
<group name="Date">
<entry name="DateForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
<default code="true">KApplication::palette().active().text()</default>
<default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="DateBackgroundColor" type="Color" key="Background_Color">
<label>Foreground color.</label>
<default code="true">KApplication::palette().active().background()</default>
<default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label>
@@ -63,11 +63,11 @@ defFont.setBold(true);
</entry>
<entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
<default code="true">KApplication::palette().active().text()</default>
<default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="PlainBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
<default code="true">KApplication::palette().active().background()</default>
<default code="true">TDEApplication::palette().active().background()</default>
</entry>
</group>
<group name="Digital">
@@ -89,15 +89,15 @@ defFont.setBold(true);
</entry>
<entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
<default code="true">KApplication::palette().active().text()</default>
<default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
<default code="true">KApplication::palette().active().background()</default>
<default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label>
<default code="true">KApplication::palette().active().mid()</default>
<default code="true">TDEApplication::palette().active().mid()</default>
</entry>
<entry name="DigitalBlink" type="Bool" key="Blink">
<label>Blink</label>
@@ -127,15 +127,15 @@ defFont.setBold(true);
</entry>
<entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
<default code="true">KApplication::palette().active().text()</default>
<default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
<default code="true">KApplication::palette().active().background()</default>
<default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label>
<default code="true">KApplication::palette().active().mid()</default>
<default code="true">TDEApplication::palette().active().mid()</default>
</entry>
<entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
<label>LCD Style</label>
@@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
</entry>
<entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label>
<default code="true">KApplication::palette().active().text()</default>
<default code="true">TDEApplication::palette().active().text()</default>
</entry>
<entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label>
<default code="true">KApplication::palette().active().background()</default>
<default code="true">TDEApplication::palette().active().background()</default>
</entry>
<entry name="Fuzzyness" type="Int">
<label>Fuzzyness</label>


+ 1
- 1
kicker/applets/launcher/quicklauncher.cpp View File

@@ -129,7 +129,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
DEBUGSTR << " QuickLauncher::QuickLauncher(" << configFile <<
",...) END" << endl << flush;

DCOPClient *dcopClient = KApplication::dcopClient();
DCOPClient *dcopClient = TDEApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher",
"serviceStartedByStorageId(TQString,TQString)",
"QuickLauncherApplet",


+ 1
- 1
kicker/extensions/kasbar/ChangeLog View File

@@ -510,7 +510,7 @@
2003-08-07 Thursday 19:51 lunakl

* Rewrite handling of _NET_WM_ICON_NAME. This together with the
recent KApplication change should hopefully make taskbar again
recent TDEApplication change should hopefully make taskbar again
display what it's supposed to display. Please yell if something
is still wrong.



+ 2
- 2
kicker/extensions/kasbar/kasbarapp.cpp View File

@@ -78,7 +78,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue( "kasbarextension" );
KApplication app;
TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

kdDebug(1345) << "Kasbar starting..." << endl;
@@ -116,7 +116,7 @@ int main( int argc, char **argv )
KWin::setOnAllDesktops( kasbar->winId(), true );
kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;

KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );

app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );



+ 1
- 1
kicker/extensions/kasbar/kasbarextension.cpp View File

@@ -92,7 +92,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
detached_( false )
{
kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl;
// KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
// TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );

// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );


+ 1
- 1
kicker/kicker/buttons/kbutton.cpp View File

@@ -66,7 +66,7 @@ KButton::~KButton()

void KButton::properties()
{
KApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
0, 0, 0, "", true);
}



+ 1
- 1
kicker/kicker/buttons/urlbutton.cpp View File

@@ -146,7 +146,7 @@ void URLButton::dropEvent(TQDropEvent *ev)
KURL url( fileItem->url() );
if(!execList.isEmpty()) {
if (KDesktopFile::isDesktopFile(url.path())){
KApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
0, 0, 0, "", true);
}
else // attempt to interpret path as directory


+ 1
- 1
kicker/kicker/core/kicker.cpp View File

@@ -188,7 +188,7 @@ bool Kicker::desktopShowing()

void Kicker::slotSettingsChanged(int category)
{
if (category == (int)KApplication::SETTINGS_SHORTCUTS)
if (category == (int)TDEApplication::SETTINGS_SHORTCUTS)
{
keys->readSettings();
keys->updateConnections();


+ 1
- 1
kicker/kicker/core/main.cpp View File

@@ -139,7 +139,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
if (signal(SIGHUP, sighandler) == SIG_IGN)
signal(SIGHUP, SIG_IGN);

// send it even before KApplication ctor, because ksmserver will launch another app as soon
// send it even before TDEApplication ctor, because ksmserver will launch another app as soon
// as TQApplication registers with it
DCOPClient* cl = new DCOPClient;
cl->attach();


+ 1
- 1
kicker/kicker/core/menumanager.cpp View File

@@ -150,7 +150,7 @@ void MenuManager::kmenuAccelActivated()
// no button to use, make it behave like a desktop menu
TQPoint p;
// Popup the K-menu at the center of the screen.
TQDesktopWidget* desktop = KApplication::desktop();
TQDesktopWidget* desktop = TDEApplication::desktop();
TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();


+ 1
- 1
kicker/kicker/kicker-3.4-reverseLayout.cpp View File

@@ -23,7 +23,7 @@ int main(int argc, char** argv)
{
// We must disguise as Kicker in order to obtain the correct reverseLayout setting.
TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
KApplication app(false, false);
TDEApplication app(false, false);

TQStringList stretchableApplets;
stretchableApplets << "taskbarapplet.desktop";


+ 1
- 1
kicker/kicker/plugins/kickoff-beagle-plugin.cpp View File

@@ -132,7 +132,7 @@ void KickoffBeaglePlugin::query(TQString term, bool _genericTitle)
kdDebug () << "Previous client w/id " << current_beagle_client->id << " still running ... ignoring it." << endl;
current_beagle_client->stopClient ();
}
current_beagle_client_id = KApplication::random ();
current_beagle_client_id = TDEApplication::random ();
kdDebug () << "Creating client with id:" << current_beagle_client_id << endl;

BeagleClient *beagle_client = beagle_client_new (NULL);


+ 2
- 2
kicker/kicker/ui/hidebutton.cpp View File

@@ -44,7 +44,7 @@ HideButton::HideButton(TQWidget *parent, const char *name)
kapp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged);

slotSettingsChanged(KApplication::SETTINGS_MOUSE);
slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
}

void HideButton::drawButton(TQPainter *p)
@@ -148,7 +148,7 @@ void HideButton::generateIcons()

void HideButton::slotSettingsChanged(int category)
{
if (category != KApplication::SETTINGS_MOUSE)
if (category != TDEApplication::SETTINGS_MOUSE)
{
return;
}


+ 1
- 1
kicker/kicker/ui/k_mnu.cpp View File

@@ -87,7 +87,7 @@ PanelKMenu::PanelKMenu()
setCaption(i18n("TDE Menu"));
connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
this, TQT_SLOT(configChanged()));
DCOPClient *dcopClient = KApplication::dcopClient();
DCOPClient *dcopClient = TDEApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher",
"serviceStartedByStorageId(TQString,TQString)",
dcopObjId,


+ 12
- 12
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -2554,7 +2554,7 @@ void KMenu::slotStartService(KService::Ptr ptr)
accept();

addToHistory();
KApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
TDEApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
updateRecentlyUsedApps(ptr);
}
@@ -2587,12 +2587,12 @@ void KMenu::slotStartURL(const TQString& u)
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
#else
DCOPRef mediamanager("ksmserver", "ksmserver");
DCOPReply reply = mediamanager.call( "logoutTimed", (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeDefault );
DCOPReply reply = mediamanager.call( "logoutTimed", (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeDefault );
if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"),
i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
kapp->requestShutDown( KApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeNone,
KApplication::ShutdownModeDefault );
kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
TDEApplication::ShutdownTypeNone,
TDEApplication::ShutdownModeDefault );

#endif
}
@@ -2610,9 +2610,9 @@ void KMenu::slotStartURL(const TQString& u)
#else
if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"),
i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
kapp->requestShutDown( KApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeHalt,
KApplication::ShutdownModeDefault );
kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
TDEApplication::ShutdownTypeHalt,
TDEApplication::ShutdownModeDefault );
#endif
}
else if ( u == "kicker:/restart" ) {
@@ -2625,9 +2625,9 @@ void KMenu::slotStartURL(const TQString& u)
#else
if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"),
i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
kapp->requestShutDown( KApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeReboot,
KApplication::ShutdownModeDefault );
kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
TDEApplication::ShutdownTypeReboot,
TDEApplication::ShutdownModeDefault );
#endif
}
#ifdef KDELIBS_SUSE
@@ -3197,7 +3197,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
}



+ 1
- 1
kicker/kicker/ui/recentapps.cpp View File

@@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << launchDCOPSignalSource() << strApp;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);

for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();


+ 1
- 1
kicker/kicker/ui/service_mnu.cpp View File

@@ -554,7 +554,7 @@ void PanelServiceMenu::slotExec(int id)
kapp->propagateSessionManager();

KService::Ptr service = static_cast<KService *>(e);
KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);

updateRecentlyUsedApps(service);


+ 2
- 2
kicker/libkicker/panelbutton.cpp View File

@@ -86,7 +86,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard

m_textColor = KGlobalSettings::textColor();

updateSettings(KApplication::SETTINGS_MOUSE);
updateSettings(TDEApplication::SETTINGS_MOUSE);

kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);

@@ -219,7 +219,7 @@ void PanelButton::updateIcon(int group)

void PanelButton::updateSettings(int category)
{
if (category != KApplication::SETTINGS_MOUSE)
if (category != TDEApplication::SETTINGS_MOUSE)
{
return;
}


+ 3
- 3
kicker/libkicker/panelbutton.h View File

@@ -352,14 +352,14 @@ protected:

protected slots:
/**
* Called from KApplication when global icon settings have changed.
* Called from TDEApplication when global icon settings have changed.
* @param group the new group
*/
void updateIcon(int group);

/**
* Called from KApplication when global settings have changed.
* @param category the settings category, see KApplication::SettingsCategory
* Called from TDEApplication when global settings have changed.
* @param category the settings category, see TDEApplication::SettingsCategory
*/
void updateSettings(int category);



+ 2
- 2
kicker/libkicker/simplebutton.cpp View File

@@ -55,7 +55,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
kapp->addKipcEventMask( KIPC::SettingsChanged );
kapp->addKipcEventMask( KIPC::IconChanged );

slotSettingsChanged( KApplication::SETTINGS_MOUSE );
slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
}

void SimpleButton::setPixmap(const TQPixmap &pix)
@@ -165,7 +165,7 @@ void SimpleButton::generateIcons()

void SimpleButton::slotSettingsChanged(int category)
{
if (category != KApplication::SETTINGS_MOUSE)
if (category != TDEApplication::SETTINGS_MOUSE)
{
return;
}


+ 1
- 1
kicker/menuext/find/findmenu.cpp View File

@@ -77,7 +77,7 @@ void FindMenu::slotExec( int pos )
}
else
{
KApplication::startServiceByDesktopPath( app );
TDEApplication::startServiceByDesktopPath( app );
}
}



+ 3
- 3
kicker/menuext/konsole/konsole_mnu.cpp View File

@@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
args << "-r";
args << screenList[id - sessionList.count()];
}
KApplication::tdeinitExec("konsole", args);
TDEApplication::tdeinitExec("konsole", args);
return;
}

@@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{
args << "-T" << title;
args << "--workdir" << url.path();
KApplication::tdeinitExec("konsole", args);
TDEApplication::tdeinitExec("konsole", args);
return;
}
else if ((!url.protocol().isEmpty()) && (url.hasHost()))
@@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
args << "-l" << url.user().latin1();
}
args << host.latin1();
KApplication::tdeinitExec("konsole", args);
TDEApplication::tdeinitExec("konsole", args);
return;
}
/*


+ 2
- 2
kicker/menuext/prefmenu/prefmenu.cpp View File

@@ -331,7 +331,7 @@ void PrefMenu::slotExec(int id)
kapp->propagateSessionManager();
KSycocaEntry *e = m_entryMap[id];
KService::Ptr service = static_cast<KService *>(e);
KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
m_dragStartPos = TQPoint(-1,-1);
}
@@ -378,7 +378,7 @@ void PrefMenu::aboutToClose()

void PrefMenu::launchControlCenter()
{
KApplication::startServiceByDesktopName("kcontrol", TQStringList(),
TDEApplication::startServiceByDesktopName("kcontrol", TQStringList(),
0, 0, 0, "", true);
}



+ 1
- 1
kicker/menuext/tom/tom.cc View File

@@ -827,7 +827,7 @@ void TOM::runTask(int id)
if (!m_tasks.contains(id)) return;

kapp->propagateSessionManager();
KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
}



+ 2
- 2
kicker/proxy/appletproxy.cpp View File

@@ -78,10 +78,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.

KApplication a;
TDEApplication a;
a.disableSessionManagement();

KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +


+ 2
- 2
kicker/proxy/extensiondebugger.cpp View File

@@ -82,10 +82,10 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.

KApplication a;
TDEApplication a;
a.disableSessionManagement();

KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +


+ 2
- 2
kicker/proxy/extensionproxy.cpp View File

@@ -64,10 +64,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.

KApplication a;
TDEApplication a;
a.disableSessionManagement();

KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +


+ 1
- 1
kicker/taskbar/taskbar.cpp View File

@@ -1176,7 +1176,7 @@ void TaskBar::slotActivatePreviousTask()

void TaskBar::slotSettingsChanged( int category )
{
if( category == (int) KApplication::SETTINGS_SHORTCUTS )
if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
{
keys->readSettings();
keys->updateConnections();


+ 2
- 2
kioslave/home/kio_home.cpp View File

@@ -40,11 +40,11 @@ static const KCmdLineOptions options[] =
extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv )
{
// KApplication is necessary to use other ioslaves
// TDEApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
TDEApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();



+ 2
- 2
kioslave/home/testhome.cpp View File

@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)

int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0);
KApplication app;
TDEApplication app;

TestHome test;
test.setup();


+ 1
- 1
kioslave/man/kio_man_test.cpp View File

@@ -27,7 +27,7 @@ protected:

int main(int argc, char **argv)
{
KApplication a( argc, argv , "p2");
TDEApplication a( argc, argv , "p2");

MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out");
testproto.showIndex("3");


+ 2
- 2
kioslave/media/kio_media.cpp View File

@@ -42,11 +42,11 @@ static const KCmdLineOptions options[] =
extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv )
{
// KApplication is necessary to use other ioslaves
// TDEApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
TDEApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();



+ 3
- 3
kioslave/media/mounthelper/kio_media_mounthelper.cpp View File

@@ -61,7 +61,7 @@ const Medium MountHelper::findMedium(const KURL &url)
}
}

MountHelper::MountHelper() : KApplication()
MountHelper::MountHelper() : TDEApplication()
{
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

@@ -269,10 +269,10 @@ int main(int argc, char **argv)

TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("kio_media");
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();

if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
KApplication *app = new MountHelper();
TDEApplication *app = new MountHelper();

KStartupInfo::appStarted();
app->dcopClient()->attach();


+ 1
- 1
kioslave/media/mounthelper/kio_media_mounthelper.h View File

@@ -30,7 +30,7 @@

class Dialog;

class MountHelper : public KApplication
class MountHelper : public TDEApplication
{
Q_OBJECT
public:


+ 2
- 2
kioslave/media/testmedia.cpp View File

@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)

int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0);
KApplication app;
TDEApplication app;

TestMedia test;
test.setup();


+ 2
- 2
kioslave/remote/kio_remote.cpp View File

@@ -40,11 +40,11 @@ static const KCmdLineOptions options[] =
extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv )
{
// KApplication is necessary to use other ioslaves
// TDEApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
TDEApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();