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

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/2/head
Timothy Pearson 11 years ago
parent d41050ea3f
commit e4e0479220
172 changed files with 412 additions and 412 deletions
Show Stats Download Patch File Download Diff File

4
doc/faq/filemng.docbook
Unescape View File

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

2
drkonqi/crashtest.cpp
Unescape View File

@ -77,7 +77,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app(false, false); TDEApplication app(false, false);
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString type = args->count() ? args->arg(0) : ""; TQCString type = args->count() ? args->arg(0) : "";
int crashtype = Crash; int crashtype = Crash;

4
drkonqi/main.cpp
Unescape View File

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

2
kappfinder/main.cpp
Unescape View File

@ -43,7 +43,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KApplication app; TDEApplication app;
TopLevel *dlg = new TopLevel( args->getOption( "dir" ) ); TopLevel *dlg = new TopLevel( args->getOption( "dir" ) );
app.setMainWidget( dlg ); app.setMainWidget( dlg );

2
kate/ChangeLog
Unescape View File

@ -208,7 +208,7 @@
* QPopupMenu for filelist * QPopupMenu for filelist
2001-03-20 Christoph Cullmann <cullmann@kde.org> 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> 2001-03-18 Christoph Cullmann <cullmann@kde.org>
* big location changes of source files * big location changes of source files

2
kate/app/kateapp.cpp
Unescape View File

@ -52,7 +52,7 @@
#include <sys/types.h> #include <sys/types.h>
KateApp::KateApp (TDECmdLineArgs *args) KateApp::KateApp (TDECmdLineArgs *args)
: KApplication () : TDEApplication ()
, m_args (args) , m_args (args)
, m_shouldExit (false) , m_shouldExit (false)
{ {

2
kate/app/kateapp.h
Unescape View File

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

2
kate/app/kwritemain.cpp
Unescape View File

@ -591,7 +591,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication a; TDEApplication a;
KGlobal::locale()->insertCatalogue("katepart"); KGlobal::locale()->insertCatalogue("katepart");

2
kcminit/main.cpp
Unescape View File

@ -241,7 +241,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
app.dcopClient()->registerAs( "kcminit", false ); app.dcopClient()->registerAs( "kcminit", false );
KLocale::setMainCatalogue(0); KLocale::setMainCatalogue(0);
KCMInit kcminit( TDECmdLineArgs::parsedArgs()); KCMInit kcminit( TDECmdLineArgs::parsedArgs());

4
kcontrol/access/kaccess.cpp
Unescape View File

@ -357,7 +357,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
} }
// process other events as usual // process other events as usual
return KApplication::x11EventFilter(event); return TDEApplication::x11EventFilter(event);
} }
@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
lay->setSpacing(KDialog::spacingHint()); lay->setSpacing(KDialog::spacingHint());
TQLabel *label1 = new TQLabel( contents); 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()) if (pixmap.isNull())
pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning); pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
label1->setPixmap(pixmap); label1->setPixmap(pixmap);

18
kcontrol/background/bgrender.cpp
Unescape View File

@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_isBusyCursor = false; m_isBusyCursor = false;
m_enableBusyCursor = false; m_enableBusyCursor = false;
m_pDirs = KGlobal::dirs(); 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_pProc = 0L;
m_Tempfile = 0L; m_Tempfile = 0L;
m_bPreview = false; m_bPreview = false;
@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
void KBackgroundRenderer::desktopResized() void KBackgroundRenderer::desktopResized()
{ {
m_State = 0; 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 ) if( !m_bPreview )
m_Size = m_rSize; m_Size = m_rSize;
} }
@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
} }
initRenderers(); initRenderers();
m_size = KApplication::desktop()->geometry().size(); m_size = TDEApplication::desktop()->geometry().size();
} }
KVirtualBGRenderer::~KVirtualBGRenderer() KVirtualBGRenderer::~KVirtualBGRenderer()
@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)
void KVirtualBGRenderer::desktopResized() void KVirtualBGRenderer::desktopResized()
{ {
m_size = KApplication::desktop()->geometry().size(); m_size = TDEApplication::desktop()->geometry().size();
if (m_pPixmap) if (m_pPixmap)
{ {
@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)
TQSize KVirtualBGRenderer::renderSize(int screen) 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_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.resize(m_numRenderers);
m_bFinished.fill(false); 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 // There's more than one renderer, so we are drawing each output to our own pixmap
TQRect overallGeometry; TQRect overallGeometry;
for (int i=0; i < KApplication::desktop()->numScreens(); ++i) { for (int i=0; i < TDEApplication::desktop()->numScreens(); ++i) {
overallGeometry |= KApplication::desktop()->screenGeometry(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.setX( int(drawPos.x() * m_scaleX) );
drawPos.setY( int(drawPos.y() * m_scaleY) ); drawPos.setY( int(drawPos.y() * m_scaleY) );

2
kcontrol/filetypes/keditfiletype.cpp
Unescape View File

@ -120,7 +120,7 @@ int main(int argc, char ** argv)
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() == 0) if (args->count() == 0)

2
kcontrol/icons/testicons.cpp
Unescape View File

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

2
kcontrol/input/mouse.cpp
Unescape View File

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

2
kcontrol/kcontrol/toplevel.cpp
Unescape View File

@ -99,7 +99,7 @@ TopLevel::TopLevel(const char* name)
searchLayout->setMargin( 6 ); searchLayout->setMargin( 6 );
TQPushButton *clearButton = new TQPushButton( mSearchFrame ); TQPushButton *clearButton = new TQPushButton( mSearchFrame );
clearButton->setIconSet( KApplication::reverseLayout() ? clearButton->setIconSet( TDEApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") ); SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton ); searchLayout->addWidget( clearButton );
TQToolTip::add( clearButton, i18n("Clear search") ); TQToolTip::add( clearButton, i18n("Clear search") );

2
kcontrol/keys/commandShortcuts.cpp
Unescape View File

@ -130,7 +130,7 @@ void CommandShortcutsModule::initGUI()
void CommandShortcutsModule::launchMenuEditor() void CommandShortcutsModule::launchMenuEditor()
{ {
if ( KApplication::startServiceByDesktopName( "kmenuedit", if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
TQString() /*url*/, TQString() /*url*/,
0 /*error*/, 0 /*error*/,
0 /*dcopservice*/, 0 /*dcopservice*/,

2
kcontrol/keys/shortcuts.cpp
Unescape View File

@ -81,7 +81,7 @@ void ShortcutsModule::save()
m_actionsGeneral.writeActions( "Global Shortcuts", 0, true, true ); m_actionsGeneral.writeActions( "Global Shortcuts", 0, true, true );
m_actionsSequence.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() void ShortcutsModule::defaults()

2
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
Unescape View File

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

2
kcontrol/kfontinst/viewpart/FontViewerApp.h
Unescape View File

@ -55,7 +55,7 @@ class CFontViewerAppMainWindow : public KParts::MainWindow
}; };
class CFontViewerApp : public KApplication class CFontViewerApp : public TDEApplication
{ {
public: public:

2
kcontrol/kicker/menutab_impl.cpp
Unescape View File

@ -289,7 +289,7 @@ void MenuTab::defaults()
void MenuTab::launchMenuEditor() void MenuTab::launchMenuEditor()
{ {
if ( KApplication::startServiceByDesktopName( "kmenuedit", if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
TQString::null /*url*/, TQString::null /*url*/,
0 /*error*/, 0 /*error*/,
0 /*dcopservice*/, 0 /*dcopservice*/,

2
kcontrol/konq/desktopbehavior_impl.cpp
Unescape View File

@ -400,7 +400,7 @@ void DesktopBehavior::save()
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
TQByteArray data; TQByteArray data;
int konq_screen_number = KApplication::desktop()->primaryScreen(); int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname; TQCString appname;
if (konq_screen_number == 0) if (konq_screen_number == 0)
appname = "kdesktop"; appname = "kdesktop";

2
kcontrol/konq/fontopts.cpp
Unescape View File

@ -335,7 +335,7 @@ void KonqFontOptions::save()
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
// Tell kdesktop about the new config file // Tell kdesktop about the new config file
int konq_screen_number = KApplication::desktop()->primaryScreen(); int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname; TQCString appname;
if (konq_screen_number == 0) if (konq_screen_number == 0)
appname = "kdesktop"; appname = "kdesktop";

2
kcontrol/konq/main.cpp
Unescape View File

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

4
kcontrol/konq/rootopts.cpp
Unescape View File

@ -251,7 +251,7 @@ void DesktopPathConfig::save()
if (pathChanged) if (pathChanged)
{ {
kdDebug() << "DesktopPathConfig::save sending message SettingsChanged" << endl; 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 // Tell kdesktop about the new config file
@ -259,7 +259,7 @@ void DesktopPathConfig::save()
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
TQByteArray data; TQByteArray data;
int konq_screen_number = KApplication::desktop()->primaryScreen(); int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname; TQCString appname;
if (konq_screen_number == 0) if (konq_screen_number == 0)
appname = "kdesktop"; appname = "kdesktop";

4
kcontrol/konqhtml/advancedTabDialog.cpp
Unescape View File

@ -106,9 +106,9 @@ void advancedTabDialog::save()
else m_pConfig->writeEntry( "MultipleTabConfirm", true ); else m_pConfig->writeEntry( "MultipleTabConfirm", true );
TQByteArray data; TQByteArray data;
if ( !KApplication::kApplication()->dcopClient()->isAttached() ) if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
actionButton(Apply)->setEnabled(false); actionButton(Apply)->setEnabled(false);
} }

2
kcontrol/krdb/krdb.cpp
Unescape View File

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

2
kcontrol/randr/krandrapp.cpp
Unescape View File

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

2
kcontrol/randr/krandrtray.cpp
Unescape View File

@ -537,7 +537,7 @@ void KRandRSystemTray::slotDisplayConfig()
void KRandRSystemTray::slotSettingsChanged(int category) void KRandRSystemTray::slotSettingsChanged(int category)
{ {
if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) { if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
globalKeys->readSettings(); globalKeys->readSettings();
globalKeys->updateConnections(); globalKeys->updateConnections();
} }

2
kcontrol/randr/main.cpp
Unescape View File

@ -44,7 +44,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
KRandRApp app; KRandRApp app;

2
kcontrol/smartcard/smartcard.cpp
Unescape View File

@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
config = new KConfig("ksmartcardrc", false, false); config = new KConfig("ksmartcardrc", false, false);
DCOPClient *dc = KApplication::kApplication()->dcopClient(); DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
_ok = false; _ok = false;
dc->remoteInterfaces("kded", "kardsvc", &_ok); dc->remoteInterfaces("kded", "kardsvc", &_ok);

12
kcontrol/smserver/kcmsmserver.cpp
Unescape View File

@ -79,11 +79,11 @@ void SMServerConfig::load(bool useDefaults )
else // "restorePreviousLogout" else // "restorePreviousLogout"
dialog->previousSessionRadio->setChecked(true); dialog->previousSessionRadio->setChecked(true);
switch (c->readNumEntry("shutdownType", int(KApplication::ShutdownTypeNone))) { switch (c->readNumEntry("shutdownType", int(TDEApplication::ShutdownTypeNone))) {
case int(KApplication::ShutdownTypeHalt): case int(TDEApplication::ShutdownTypeHalt):
dialog->haltRadio->setChecked(true); dialog->haltRadio->setChecked(true);
break; break;
case int(KApplication::ShutdownTypeReboot): case int(TDEApplication::ShutdownTypeReboot):
dialog->rebootRadio->setChecked(true); dialog->rebootRadio->setChecked(true);
break; break;
default: default:
@ -116,10 +116,10 @@ void SMServerConfig::save()
c->writeEntry( "shutdownType", c->writeEntry( "shutdownType",
dialog->haltRadio->isChecked() ? dialog->haltRadio->isChecked() ?
int(KApplication::ShutdownTypeHalt) : int(TDEApplication::ShutdownTypeHalt) :
dialog->rebootRadio->isChecked() ? dialog->rebootRadio->isChecked() ?
int(KApplication::ShutdownTypeReboot) : int(TDEApplication::ShutdownTypeReboot) :
int(KApplication::ShutdownTypeNone)); int(TDEApplication::ShutdownTypeNone));
c->writeEntry("excludeApps", dialog->excludeLineedit->text()); c->writeEntry("excludeApps", dialog->excludeLineedit->text());
c->setGroup("Logout"); c->setGroup("Logout");
c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked()); c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());

4
kcontrol/style/kcmstyle.cpp
Unescape View File

@ -648,7 +648,7 @@ void KCMStyle::save()
if ( m_bToolbarsDirty ) if ( m_bToolbarsDirty )
// ##### FIXME - Doesn't apply all settings correctly due to bugs in // ##### FIXME - Doesn't apply all settings correctly due to bugs in
// KApplication/KToolbar // TDEApplication/KToolbar
KIPC::sendMessageAll(KIPC::ToolbarStyleChanged); KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
if (m_bEffectsDirty) { if (m_bEffectsDirty) {
@ -866,7 +866,7 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
// for other styles being previewed. (e.g SGI style) // for other styles being previewed. (e.g SGI style)
w->unsetPalette(); w->unsetPalette();
TQPalette newPalette(KApplication::createApplicationPalette()); TQPalette newPalette(TDEApplication::createApplicationPalette());
s->polish( newPalette ); s->polish( newPalette );
w->setPalette(newPalette); w->setPalette(newPalette);

2
kdcop/kdcop.cpp
Unescape View File

@ -27,7 +27,7 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication a; TDEApplication a;
KDCOPWindow* kdcopwindow = new KDCOPWindow; KDCOPWindow* kdcopwindow = new KDCOPWindow;
a.setMainWidget( kdcopwindow ); a.setMainWidget( kdcopwindow );

12
kdcop/kdcopwindow.cpp
Unescape View File

@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
void void
DCOPBrowserApplicationItem::populate() DCOPBrowserApplicationItem::populate()
{ {
KApplication::setOverrideCursor(tqwaitCursor); TDEApplication::setOverrideCursor(tqwaitCursor);
bool ok = false; bool ok = false;
bool isDefault = false; bool isDefault = false;
@ -175,7 +175,7 @@ DCOPBrowserApplicationItem::populate()
isDefault = false; isDefault = false;
} }
KApplication::restoreOverrideCursor(); TDEApplication::restoreOverrideCursor();
} }
void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData) void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
void void
DCOPBrowserInterfaceItem::populate() DCOPBrowserInterfaceItem::populate()
{ {
KApplication::setOverrideCursor(tqwaitCursor); TDEApplication::setOverrideCursor(tqwaitCursor);
bool ok = false; bool ok = false;
@ -250,7 +250,7 @@ DCOPBrowserInterfaceItem::populate()
if ((*it) != "QCStringList functions()") if ((*it) != "QCStringList functions()")
new DCOPBrowserFunctionItem(this, app_, object_, *it); new DCOPBrowserFunctionItem(this, app_, object_, *it);
KApplication::restoreOverrideCursor(); TDEApplication::restoreOverrideCursor();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
void KDCOPWindow::slotFillApplications() void KDCOPWindow::slotFillApplications()
{ {
KApplication::setOverrideCursor(tqwaitCursor); TDEApplication::setOverrideCursor(tqwaitCursor);
QCStringList apps = dcopClient->registeredApplications(); QCStringList apps = dcopClient->registeredApplications();
TQCString appId = dcopClient->appId(); TQCString appId = dcopClient->appId();
@ -917,7 +917,7 @@ void KDCOPWindow::slotFillApplications()
} }
} }
KApplication::restoreOverrideCursor(); TDEApplication::restoreOverrideCursor();
} }
bool KDCOPWindow::demarshal bool KDCOPWindow::demarshal

16
kdesktop/bgmanager.cc
Unescape View File

@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
m_pDesktop = desktop; m_pDesktop = desktop;
if (desktop == 0L) if (desktop == 0L)
desktop = TQT_TQWIDGET(KApplication::desktop()->screen()); desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
m_Renderer.resize( 1 ); m_Renderer.resize( 1 );
m_Cache.resize( 1 ); m_Cache.resize( 1 );
@ -529,14 +529,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
root_cleared = true; root_cleared = true;
TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
// but make the pixmap visible until m_pDesktop is visible // but make the pixmap visible until m_pDesktop is visible
TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
} }
} }
else else
{ {
TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
} }
// and export it via Esetroot-style for gnome/GTK apps to share in the pretties // 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() void KBackgroundManager::clearRoot()
{ {
TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap()); TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
} }
/* /*
@ -925,7 +925,7 @@ void KBackgroundManager::repaintBackground()
if (m_pDesktop) if (m_pDesktop)
m_pDesktop->repaint(); m_pDesktop->repaint();
else else
TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
} }
void KBackgroundManager::desktopResized() void KBackgroundManager::desktopResized()

28
kdesktop/desktop.cc
Unescape View File

@ -794,13 +794,13 @@ void KDesktop::configure()
void KDesktop::slotSettingsChanged(int category) void KDesktop::slotSettingsChanged(int category)
{ {
//kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl; //kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl;
if (category == KApplication::SETTINGS_PATHS) if (category == TDEApplication::SETTINGS_PATHS)
{ {
kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl; kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl;
if (m_pIconView) if (m_pIconView)
m_pIconView->recheckDesktopURL(); m_pIconView->recheckDesktopURL();
} }
else if (category == KApplication::SETTINGS_SHORTCUTS) else if (category == TDEApplication::SETTINGS_SHORTCUTS)
{ {
kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl; kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl;
keys->readSettings(); keys->readSettings();
@ -1021,12 +1021,12 @@ void KDesktop::slotNewWallpaper(const KURL &url)
// for dcop interface backward compatibility // for dcop interface backward compatibility
void KDesktop::logout() void KDesktop::logout()
{ {
logout( KApplication::ShutdownConfirmDefault, logout( TDEApplication::ShutdownConfirmDefault,
KApplication::ShutdownTypeNone ); TDEApplication::ShutdownTypeNone );
} }
void KDesktop::logout( KApplication::ShutdownConfirm confirm, void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype ) TDEApplication::ShutdownType sdtype )
{ {
if( !kapp->requestShutDown( confirm, sdtype ) ) if( !kapp->requestShutDown( confirm, sdtype ) )
// this i18n string is also in kicker/applets/run/runapplet // this i18n string is also in kicker/applets/run/runapplet
@ -1038,26 +1038,26 @@ void KDesktop::logout( KApplication::ShutdownConfirm confirm,
void KDesktop::slotLogout() void KDesktop::slotLogout()
{ {
logout( KApplication::ShutdownConfirmDefault, logout( TDEApplication::ShutdownConfirmDefault,
KApplication::ShutdownTypeDefault ); TDEApplication::ShutdownTypeDefault );
} }
void KDesktop::slotLogoutNoCnf() void KDesktop::slotLogoutNoCnf()
{ {
logout( KApplication::ShutdownConfirmNo, logout( TDEApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeNone ); TDEApplication::ShutdownTypeNone );
} }
void KDesktop::slotHaltNoCnf() void KDesktop::slotHaltNoCnf()
{ {
logout( KApplication::ShutdownConfirmNo, logout( TDEApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeHalt ); TDEApplication::ShutdownTypeHalt );
} }
void KDesktop::slotRebootNoCnf() void KDesktop::slotRebootNoCnf()
{ {
logout( KApplication::ShutdownConfirmNo, logout( TDEApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeReboot ); TDEApplication::ShutdownTypeReboot );
} }
void KDesktop::setVRoot( bool enable ) void KDesktop::setVRoot( bool enable )

2
kdesktop/desktop.h
Unescape View File

@ -94,7 +94,7 @@ public:
virtual void desktopIconsAreaChanged(const TQRect &area, int screen); 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; } KWinModule* twinModule() const { return m_pKwinmodule; }

2
kdesktop/kdiconview.cc
Unescape View File

@ -780,7 +780,7 @@ void KDIconView::saveMediaListView()
// Reload kdesktop configuration to apply changes // Reload kdesktop configuration to apply changes
TQByteArray data; TQByteArray data;
int konq_screen_number = KApplication::desktop()->primaryScreen(); int konq_screen_number = TDEApplication::desktop()->primaryScreen();
TQCString appname; TQCString appname;
if (konq_screen_number == 0) if (konq_screen_number == 0)
appname = "kdesktop"; appname = "kdesktop";

8
kdesktop/krootwm.cc
Unescape View File

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

2
kdesktop/kwebdesktop/kwebdesktop.cpp
Unescape View File

@ -97,7 +97,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 3 && args->count() != 4 ) if ( args->count() != 3 && args->count() != 4 )

2
kdesktop/kxdglauncher.cpp
Unescape View File

@ -94,7 +94,7 @@ int main( int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KApplication app; TDEApplication app;
app.disableSessionManagement(); app.disableSessionManagement();
if (args->isSet( "xdgname" ) == true) { if (args->isSet( "xdgname" ) == true) {

2
kdesktop/lock/lockprocess.cc
Unescape View File

@ -776,7 +776,7 @@ void LockProcess::startSecureDialog()
} }
if (ret == 3) { if (ret == 3) {
trinity_desktop_lock_closing_windows = 1; 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(); kapp->quit();
} }
// FIXME // FIXME

4
kdesktop/lock/main.cc
Unescape View File

@ -149,7 +149,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
} }
} }
#endif #endif
return KApplication::x11EventFilter( ev ); return TDEApplication::x11EventFilter( ev );
} }
@ -213,7 +213,7 @@ int main( int argc, char **argv )
putenv(strdup("SESSION_MANAGER=")); putenv(strdup("SESSION_MANAGER="));
KApplication::disableAutoDcopRegistration(); // not needed TDEApplication::disableAutoDcopRegistration(); // not needed
XSetErrorHandler(trapXErrors); XSetErrorHandler(trapXErrors);

4
kdesktop/lock/main.h
Unescape View File

@ -24,10 +24,10 @@
#include <time.h> #include <time.h>
class MyApp : public KApplication { class MyApp : public TDEApplication {
Q_OBJECT Q_OBJECT
public: public:
MyApp() : KApplication(), lastTick( 0 ) {} MyApp() : TDEApplication(), lastTick( 0 ) {}
protected: protected:
bool x11EventFilter( XEvent * ); bool x11EventFilter( XEvent * );
signals: signals:

2
kdesktop/minicli.cpp
Unescape View File

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

6
kdialog/kdialog.cpp
Unescape View File

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

4
kdialog/widgets.cpp
Unescape View File

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

2
kfind/main.cpp
Unescape View File

@ -45,7 +45,7 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs();

2
khelpcenter/application.cpp
Unescape View File

@ -76,7 +76,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
KHC::Application app; KHC::Application app;

2
khelpcenter/docentry.cpp
Unescape View File

@ -113,7 +113,7 @@ void DocEntry::setIdentifier( const TQString &identifier )
TQString DocEntry::identifier() const TQString DocEntry::identifier() const
{ {
if ( mIdentifier.isEmpty() ) mIdentifier = KApplication::randomString( 15 ); if ( mIdentifier.isEmpty() ) mIdentifier = TDEApplication::randomString( 15 );
return mIdentifier; return mIdentifier;
} }

2
khelpcenter/htmlsearch/index.cpp
Unescape View File

@ -23,7 +23,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("htmlsearch"); KGlobal::locale()->setMainCatalogue("htmlsearch");
KApplication app; TDEApplication app;
HTMLSearch search; HTMLSearch search;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

2
khelpcenter/khc_indexbuilder.cpp
Unescape View File

@ -183,7 +183,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();
KApplication app; TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

2
khelpcenter/navigator.cpp
Unescape View File

@ -100,7 +100,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
searchLayout->setMargin( 6 ); searchLayout->setMargin( 6 );
TQPushButton *clearButton = new TQPushButton( mSearchFrame ); TQPushButton *clearButton = new TQPushButton( mSearchFrame );
clearButton->setIconSet( KApplication::reverseLayout() ? clearButton->setIconSet( TDEApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") ); SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton ); searchLayout->addWidget( clearButton );
connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) ); connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );

2
khelpcenter/testmetainfo.cpp
Unescape View File

@ -91,7 +91,7 @@ int main(int argc,char **argv)
KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KApplication app; TDEApplication app;
kdDebug() << "Scanning Meta Info" << endl; kdDebug() << "Scanning Meta Info" << endl;

2
khotkeys/kcontrol/kcmkhotkeys.cpp
Unescape View File

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

2
khotkeys/kcontrol/menuedit.cpp
Unescape View File

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

2
khotkeys/update/update.cpp
Unescape View File

@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update", TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
"KHotKeys update utility", "1.0" ); "KHotKeys update utility", "1.0" );
TDECmdLineArgs::addCmdLineOptions( options ); 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(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
TQCString id = args->getOption( "id" ); TQCString id = args->getOption( "id" );
TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" ); TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );

20
kicker/applets/clock/clock.cpp
Unescape View File

@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
settings = new SettingsWidgetImp(prefs, zone, 0, "General"); settings = new SettingsWidgetImp(prefs, zone, 0, "General");
connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background()); settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
// Digital // Digital
digitalPage = new DigitalWidget(0, "DigitalClock"); digitalPage = new DigitalWidget(0, "DigitalClock");
settings->widgetStack->addWidget(digitalPage, 1); settings->widgetStack->addWidget(digitalPage, 1);
digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background()); digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
// Analog // Analog
analogPage = new AnalogWidget(0, "AnalogClock"); analogPage = new AnalogWidget(0, "AnalogClock");
settings->widgetStack->addWidget(analogPage, 2); settings->widgetStack->addWidget(analogPage, 2);
analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background()); analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
// Fuzzy // Fuzzy
fuzzyPage = new FuzzyWidget(0, "FuzzyClock"); fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
settings->widgetStack->addWidget(fuzzyPage, 3); 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)), connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled())); TQT_SLOT(dateToggled()));
@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
p.drawTiledPixmap(0, 0, width(), height(), lcdPattern); p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
} }
else if (_prefs->digitalBackgroundColor() != else if (_prefs->digitalBackgroundColor() !=
KApplication::palette().active().background()) TDEApplication::palette().active().background())
{ {
p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor()); p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
} }
@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern); 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()); _spPx->fill(_prefs->analogBackgroundColor());
} }
@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)
void ClockApplet::updateFollowBackground() void ClockApplet::updateFollowBackground()
{ {
TQColor globalBgroundColor = KApplication::palette().active().background(); TQColor globalBgroundColor = TDEApplication::palette().active().background();
TQColor bgColor; TQColor bgColor;
switch (_prefs->type()) switch (_prefs->type())
@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()
void ClockApplet::setBackground() void ClockApplet::setBackground()
{ {
TQColor globalBgroundColor = KApplication::palette().active().background(); TQColor globalBgroundColor = TDEApplication::palette().active().background();
TQColor fgColor, bgColor; TQColor fgColor, bgColor;
if (!_clock) if (!_clock)
@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting) if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
return; return;
TQColor globalBgroundColor = KApplication::palette().active().background(); TQColor globalBgroundColor = TDEApplication::palette().active().background();
if (m_dateFollowBackgroundSetting) if (m_dateFollowBackgroundSetting)
_prefs->setDateBackgroundColor(globalBgroundColor); _prefs->setDateBackgroundColor(globalBgroundColor);

24
kicker/applets/clock/clockapplet.kcfg
Unescape View File

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

2
kicker/applets/launcher/quicklauncher.cpp
Unescape View File

@ -129,7 +129,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
DEBUGSTR << " QuickLauncher::QuickLauncher(" << configFile << DEBUGSTR << " QuickLauncher::QuickLauncher(" << configFile <<
",...) END" << endl << flush; ",...) END" << endl << flush;
DCOPClient *dcopClient = KApplication::dcopClient(); DCOPClient *dcopClient = TDEApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher", dcopClient->connectDCOPSignal(0, "appLauncher",
"serviceStartedByStorageId(TQString,TQString)", "serviceStartedByStorageId(TQString,TQString)",
"QuickLauncherApplet", "QuickLauncherApplet",

2
kicker/extensions/kasbar/ChangeLog
Unescape View File

@ -510,7 +510,7 @@
2003-08-07 Thursday 19:51 lunakl 2003-08-07 Thursday 19:51 lunakl
* Rewrite handling of _NET_WM_ICON_NAME. This together with the * 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 display what it's supposed to display. Please yell if something
is still wrong. is still wrong.

4
kicker/extensions/kasbar/kasbarapp.cpp
Unescape 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::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue( "kasbarextension" ); KGlobal::locale()->setMainCatalogue( "kasbarextension" );
KApplication app; TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
kdDebug(1345) << "Kasbar starting..." << endl; kdDebug(1345) << "Kasbar starting..." << endl;
@ -116,7 +116,7 @@ int main( int argc, char **argv )
KWin::setOnAllDesktops( kasbar->winId(), true ); KWin::setOnAllDesktops( kasbar->winId(), true );
kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl; 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()) ); app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );

2
kicker/extensions/kasbar/kasbarextension.cpp
Unescape View File

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

2
kicker/kicker/buttons/kbutton.cpp
Unescape View File

@ -66,7 +66,7 @@ KButton::~KButton()
void KButton::properties() void KButton::properties()
{ {
KApplication::startServiceByDesktopName("kmenuedit", TQStringList(), TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
0, 0, 0, "", true); 0, 0, 0, "", true);
} }

2
kicker/kicker/buttons/urlbutton.cpp
Unescape View File

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

2
kicker/kicker/core/kicker.cpp
Unescape View File

@ -188,7 +188,7 @@ bool Kicker::desktopShowing()
void Kicker::slotSettingsChanged(int category) void Kicker::slotSettingsChanged(int category)
{ {
if (category == (int)KApplication::SETTINGS_SHORTCUTS) if (category == (int)TDEApplication::SETTINGS_SHORTCUTS)
{ {
keys->readSettings(); keys->readSettings();
keys->updateConnections(); keys->updateConnections();

2
kicker/kicker/core/main.cpp
Unescape View File

@ -139,7 +139,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
if (signal(SIGHUP, sighandler) == SIG_IGN) if (signal(SIGHUP, sighandler) == SIG_IGN)
signal(SIGHUP, 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 // as TQApplication registers with it
DCOPClient* cl = new DCOPClient; DCOPClient* cl = new DCOPClient;
cl->attach(); cl->attach();

2
kicker/kicker/core/menumanager.cpp
Unescape View File

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

2
kicker/kicker/kicker-3.4-reverseLayout.cpp
Unescape 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. // We must disguise as Kicker in order to obtain the correct reverseLayout setting.
TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false); TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
KApplication app(false, false); TDEApplication app(false, false);
TQStringList stretchableApplets; TQStringList stretchableApplets;
stretchableApplets << "taskbarapplet.desktop"; stretchableApplets << "taskbarapplet.desktop";

2
kicker/kicker/plugins/kickoff-beagle-plugin.cpp
Unescape 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; kdDebug () << "Previous client w/id " << current_beagle_client->id << " still running ... ignoring it." << endl;
current_beagle_client->stopClient (); 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; kdDebug () << "Creating client with id:" << current_beagle_client_id << endl;
BeagleClient *beagle_client = beagle_client_new (NULL); BeagleClient *beagle_client = beagle_client_new (NULL);

4
kicker/kicker/ui/hidebutton.cpp
Unescape View File

@ -44,7 +44,7 @@ HideButton::HideButton(TQWidget *parent, const char *name)
kapp->addKipcEventMask(KIPC::SettingsChanged); kapp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged); kapp->addKipcEventMask(KIPC::IconChanged);
slotSettingsChanged(KApplication::SETTINGS_MOUSE); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
} }
void HideButton::drawButton(TQPainter *p) void HideButton::drawButton(TQPainter *p)
@ -148,7 +148,7 @@ void HideButton::generateIcons()
void HideButton::slotSettingsChanged(int category) void HideButton::slotSettingsChanged(int category)
{ {
if (category != KApplication::SETTINGS_MOUSE) if (category != TDEApplication::SETTINGS_MOUSE)
{ {
return; return;
} }

2
kicker/kicker/ui/k_mnu.cpp
Unescape View File

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

24
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -2554,7 +2554,7 @@ void KMenu::slotStartService(KService::Ptr ptr)
accept(); accept();
addToHistory(); addToHistory();
KApplication::startServiceByDesktopPath(ptr->desktopEntryPath(), TDEApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true); TQStringList(), 0, 0, 0, "", true);
updateRecentlyUsedApps(ptr); updateRecentlyUsedApps(ptr);
} }
@ -2587,12 +2587,12 @@ void KMenu::slotStartURL(const TQString& u)
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
#else #else
DCOPRef mediamanager("ksmserver", "ksmserver"); 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?"), if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"),
i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo"))) i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
kapp->requestShutDown( KApplication::ShutdownConfirmNo, kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeNone, TDEApplication::ShutdownTypeNone,
KApplication::ShutdownModeDefault ); TDEApplication::ShutdownModeDefault );
#endif #endif
} }
@ -2610,9 +2610,9 @@ void KMenu::slotStartURL(const TQString& u)
#else #else
if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"), if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"),
i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit"))) i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
kapp->requestShutDown( KApplication::ShutdownConfirmNo, kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeHalt, TDEApplication::ShutdownTypeHalt,
KApplication::ShutdownModeDefault ); TDEApplication::ShutdownModeDefault );
#endif #endif
} }
else if ( u == "kicker:/restart" ) { else if ( u == "kicker:/restart" ) {
@ -2625,9 +2625,9 @@ void KMenu::slotStartURL(const TQString& u)
#else #else
if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"), 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"))) i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
kapp->requestShutDown( KApplication::ShutdownConfirmNo, kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
KApplication::ShutdownTypeReboot, TDEApplication::ShutdownTypeReboot,
KApplication::ShutdownModeDefault ); TDEApplication::ShutdownModeDefault );
#endif #endif
} }
#ifdef KDELIBS_SUSE #ifdef KDELIBS_SUSE
@ -3197,7 +3197,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly); TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId(); stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl; kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params); "serviceStartedByStorageId(TQString,TQString)", params);
} }

2
kicker/kicker/ui/recentapps.cpp
Unescape View File

@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
TQByteArray params; TQByteArray params;
TQDataStream stream(params, IO_WriteOnly); TQDataStream stream(params, IO_WriteOnly);
stream << launchDCOPSignalSource() << strApp; stream << launchDCOPSignalSource() << strApp;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params); "serviceStartedByStorageId(TQString,TQString)", params);
for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();

2
kicker/kicker/ui/service_mnu.cpp
Unescape View File

@ -554,7 +554,7 @@ void PanelServiceMenu::slotExec(int id)
kapp->propagateSessionManager(); kapp->propagateSessionManager();
KService::Ptr service = static_cast<KService *>(e); KService::Ptr service = static_cast<KService *>(e);
KApplication::startServiceByDesktopPath(service->desktopEntryPath(), TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true); TQStringList(), 0, 0, 0, "", true);
updateRecentlyUsedApps(service); updateRecentlyUsedApps(service);

4
kicker/libkicker/panelbutton.cpp
Unescape View File

@ -86,7 +86,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
m_textColor = KGlobalSettings::textColor(); m_textColor = KGlobalSettings::textColor();
updateSettings(KApplication::SETTINGS_MOUSE); updateSettings(TDEApplication::SETTINGS_MOUSE);
kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
@ -219,7 +219,7 @@ void PanelButton::updateIcon(int group)
void PanelButton::updateSettings(int category) void PanelButton::updateSettings(int category)
{ {
if (category != KApplication::SETTINGS_MOUSE) if (category != TDEApplication::SETTINGS_MOUSE)
{ {
return; return;
} }

6
kicker/libkicker/panelbutton.h
Unescape View File

@ -352,14 +352,14 @@ protected:
protected slots: 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 * @param group the new group
*/ */
void updateIcon(int group); void updateIcon(int group);
/** /**
* Called from KApplication when global settings have changed. * Called from TDEApplication when global settings have changed.
* @param category the settings category, see KApplication::SettingsCategory * @param category the settings category, see TDEApplication::SettingsCategory
*/ */
void updateSettings(int category); void updateSettings(int category);

4
kicker/libkicker/simplebutton.cpp
Unescape View File

@ -55,7 +55,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::SettingsChanged );
kapp->addKipcEventMask( KIPC::IconChanged ); kapp->addKipcEventMask( KIPC::IconChanged );
slotSettingsChanged( KApplication::SETTINGS_MOUSE ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
} }
void SimpleButton::setPixmap(const TQPixmap &pix) void SimpleButton::setPixmap(const TQPixmap &pix)
@ -165,7 +165,7 @@ void SimpleButton::generateIcons()
void SimpleButton::slotSettingsChanged(int category) void SimpleButton::slotSettingsChanged(int category)
{ {
if (category != KApplication::SETTINGS_MOUSE) if (category != TDEApplication::SETTINGS_MOUSE)
{ {
return; return;
} }

2
kicker/menuext/find/findmenu.cpp
Unescape View File

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

6
kicker/menuext/konsole/konsole_mnu.cpp
Unescape View File

@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
args << "-r"; args << "-r";
args << screenList[id - sessionList.count()]; args << screenList[id - sessionList.count()];
} }
KApplication::tdeinitExec("konsole", args); TDEApplication::tdeinitExec("konsole", args);
return; return;
} }
@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{ {
args << "-T" << title; args << "-T" << title;
args << "--workdir" << url.path(); args << "--workdir" << url.path();
KApplication::tdeinitExec("konsole", args); TDEApplication::tdeinitExec("konsole", args);
return; return;
} }
else if ((!url.protocol().isEmpty()) && (url.hasHost())) 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 << "-l" << url.user().latin1();
} }
args << host.latin1(); args << host.latin1();
KApplication::tdeinitExec("konsole", args); TDEApplication::tdeinitExec("konsole", args);
return; return;
} }
/* /*

4
kicker/menuext/prefmenu/prefmenu.cpp
Unescape View File

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

2
kicker/menuext/tom/tom.cc
Unescape View File

@ -827,7 +827,7 @@ void TOM::runTask(int id)
if (!m_tasks.contains(id)) return; if (!m_tasks.contains(id)) return;
kapp->propagateSessionManager(); kapp->propagateSessionManager();
KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true); TQStringList(), 0, 0, 0, "", true);
} }

4
kicker/proxy/appletproxy.cpp
Unescape View File

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

4
kicker/proxy/extensiondebugger.cpp
Unescape View File

@ -82,10 +82,10 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData ); TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
KApplication a; TDEApplication a;
a.disableSessionManagement(); a.disableSessionManagement();
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +

4
kicker/proxy/extensionproxy.cpp
Unescape View File

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

2
kicker/taskbar/taskbar.cpp
Unescape View File

@ -1176,7 +1176,7 @@ void TaskBar::slotActivatePreviousTask()
void TaskBar::slotSettingsChanged( int category ) void TaskBar::slotSettingsChanged( int category )
{ {
if( category == (int) KApplication::SETTINGS_SHORTCUTS ) if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
{ {
keys->readSettings(); keys->readSettings();
keys->updateConnections(); keys->updateConnections();

4
kioslave/home/kio_home.cpp
Unescape View File

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

4
kioslave/home/testhome.cpp
Unescape View File

@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0); TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0);
KApplication app; TDEApplication app;
TestHome test; TestHome test;
test.setup(); test.setup();

2
kioslave/man/kio_man_test.cpp
Unescape View File

@ -27,7 +27,7 @@ protected:
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KApplication a( argc, argv , "p2"); TDEApplication a( argc, argv , "p2");
MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out"); MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out");
testproto.showIndex("3"); testproto.showIndex("3");

4
kioslave/media/kio_media.cpp
Unescape View File

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

6
kioslave/media/mounthelper/kio_media_mounthelper.cpp
Unescape View File

@ -61,7 +61,7 @@ const Medium MountHelper::findMedium(const KURL &url)
} }
} }
MountHelper::MountHelper() : KApplication() MountHelper::MountHelper() : TDEApplication()
{ {
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@ -269,10 +269,10 @@ int main(int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("kio_media"); KGlobal::locale()->setMainCatalogue("kio_media");
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage(); if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
KApplication *app = new MountHelper(); TDEApplication *app = new MountHelper();
KStartupInfo::appStarted(); KStartupInfo::appStarted();
app->dcopClient()->attach(); app->dcopClient()->attach();

2
kioslave/media/mounthelper/kio_media_mounthelper.h
Unescape View File

@ -30,7 +30,7 @@
class Dialog; class Dialog;
class MountHelper : public KApplication class MountHelper : public TDEApplication
{ {
Q_OBJECT Q_OBJECT
public: public:

4
kioslave/media/testmedia.cpp
Unescape View File

@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0); TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0);
KApplication app; TDEApplication app;
TestMedia test; TestMedia test;
test.setup(); test.setup();

4
kioslave/remote/kio_remote.cpp
Unescape View File

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

4
kioslave/remote/testremote.cpp
Unescape View File

@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0); TDECmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0);
KApplication app; TDEApplication app;
TestRemote test; TestRemote test;
test.setup(); test.setup();

4
kioslave/system/kio_system.cpp
Unescape View File

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

4
kioslave/system/testsystem.cpp
Unescape View File

@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0); TDECmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0);
KApplication app; TDEApplication app;
TestSystem test; TestSystem test;
test.setup(); test.setup();

10
kioslave/thumbnail/thumbnail.cpp
Unescape View File

@ -53,7 +53,7 @@
#include "thumbnail.h" #include "thumbnail.h"
#include <kio/thumbcreator.h> #include <kio/thumbcreator.h>
// Use correctly KInstance instead of KApplication (but then no TQPixmap) // Use correctly KInstance instead of TDEApplication (but then no TQPixmap)
#undef USE_KINSTANCE #undef USE_KINSTANCE
// Fix thumbnail: protocol // Fix thumbnail: protocol
#define THUMBNAIL_HACK (1) #define THUMBNAIL_HACK (1)
@ -98,16 +98,16 @@ int kdemain(int argc, char **argv)
#ifdef USE_KINSTANCE #ifdef USE_KINSTANCE
KInstance instance("kio_thumbnail"); KInstance instance("kio_thumbnail");
#else #else
// creating KApplication in a slave in not a very good idea, // creating TDEApplication in a slave in not a very good idea,
// as dispatchLoop() doesn't allow it to process its messages, // as dispatchLoop() doesn't allow it to process its messages,
// so it for example wouldn't reply to ksmserver - on the other // so it for example wouldn't reply to ksmserver - on the other
// hand, this slave uses QPixmaps for some reason, and they // hand, this slave uses QPixmaps for some reason, and they
// need QApplication // need QApplication
// and HTML previews need even KApplication :( // and HTML previews need even TDEApplication :(
putenv(strdup("SESSION_MANAGER=")); putenv(strdup("SESSION_MANAGER="));
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(argc, argv, "kio_thumbnail", false, true); TDEApplication app(argc, argv, "kio_thumbnail", false, true);
#endif #endif
if (argc != 4) if (argc != 4)

6
kioslave/trash/kio_trash.cpp
Unescape View File

@ -53,12 +53,12 @@ extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv ) int KDE_EXPORT kdemain( int argc, char **argv )
{ {
//KInstance instance( "kio_trash" ); //KInstance instance( "kio_trash" );
// KApplication is necessary to use kio_file // TDEApplication is necessary to use kio_file
putenv(strdup("SESSION_MANAGER=")); putenv(strdup("SESSION_MANAGER="));
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0); TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); TDEApplication app( false, false );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TrashProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); TrashProtocol slave( args->arg(0), args->arg(1), args->arg(2) );

4
kioslave/trash/ktrash.cpp
Unescape View File

@ -37,14 +37,14 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init( argc, argv, "ktrash", TDECmdLineArgs::init( argc, argv, "ktrash",
I18N_NOOP( "ktrash" ), I18N_NOOP( "ktrash" ),
I18N_NOOP( "Helper program to handle the TDE trash can\n" I18N_NOOP( "Helper program to handle the TDE trash can\n"
"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ), "Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ),
TDE_VERSION_STRING ); TDE_VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if ( args->isSet( "empty" ) ) { if ( args->isSet( "empty" ) ) {

4
kioslave/trash/testtrash.cpp
Unescape View File

@ -82,9 +82,9 @@ int main(int argc, char *argv[])
setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true ); setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); setenv( "TDE_FORK_SLAVES", "yes", true );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0); TDECmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0);
KApplication app; TDEApplication app;
TestTrash test; TestTrash test;
test.setup(); test.setup();

4
klipper/toplevel.cpp
Unescape View File

@ -527,7 +527,7 @@ void KlipperWidget::saveSession()
void KlipperWidget::slotSettingsChanged( int category ) void KlipperWidget::slotSettingsChanged( int category )
{ {
if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) { if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
globalKeys->readSettings(); globalKeys->readSettings();
globalKeys->updateConnections(); globalKeys->updateConnections();
toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions")); toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
@ -1034,7 +1034,7 @@ bool KlipperWidget::ignoreClipboardChanges() const
// which could possibly lead to TQClipboard reporting empty clipboard. // which could possibly lead to TQClipboard reporting empty clipboard.
// Therefore, tqt_x_time needs to be updated to current X server timestamp. // Therefore, tqt_x_time needs to be updated to current X server timestamp.
// Call KApplication::updateUserTime() only from functions that are // Call TDEApplication::updateUserTime() only from functions that are
// called from outside (DCOP), or from TQTimer timeout ! // called from outside (DCOP), or from TQTimer timeout !
static Time next_x_time; static Time next_x_time;

2
knetattach/main.cpp
Unescape View File

@ -35,7 +35,7 @@ int main(int argc, char **argv) {
about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "staikos@kde.org"); about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "staikos@kde.org");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KApplication a; TDEApplication a;
KNetAttach na; KNetAttach na;
a.setMainWidget(&na); a.setMainWidget(&na);

2
konqueror/about/konq_aboutpage.cc
Unescape View File

@ -503,7 +503,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) ); TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) );
TQString executable = args[ 0 ]; TQString executable = args[ 0 ];
args.remove( args.begin() ); args.remove( args.begin() );
KApplication::tdeinitExec( executable, args ); TDEApplication::tdeinitExec( executable, args );
return; return;
} }

26
konqueror/client/kfmclient.cc
Unescape View File

@ -167,7 +167,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
The URL is safe, if the view used to view it is listed in the allowed KPart's. The URL is safe, if the view used to view it is listed in the allowed KPart's.
In order to find out the part, mimetype is needed, and KTrader is needed. In order to find out the part, mimetype is needed, and KTrader is needed.
If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
URLs, but oh well). Since this function may be running without a KApplication URLs, but oh well). Since this function may be running without a TDEApplication
instance, I'm actually quite surprised it works, and it may sooner or later break. instance, I'm actually quite surprised it works, and it may sooner or later break.
Nice, isn't it? Nice, isn't it?
@ -234,7 +234,7 @@ static int currentScreen()
{ {
if( tqt_xdisplay() != NULL ) if( tqt_xdisplay() != NULL )
return tqt_xscreen(); return tqt_xscreen();
// case when there's no KApplication instance // case when there's no TDEApplication instance
const char* env = getenv( "DISPLAY" ); const char* env = getenv( "DISPLAY" );
if( env == NULL ) if( env == NULL )
return 0; return 0;
@ -271,7 +271,7 @@ static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, co
TQByteArray data; TQByteArray data;
TQDataStream str( data, IO_WriteOnly ); TQDataStream str( data, IO_WriteOnly );
str << currentScreen(); str << currentScreen();
if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface", if( !TDEApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
"processCanBeReused( int )", data, ret, appObj, false, 3000 ) ) "processCanBeReused( int )", data, ret, appObj, false, 3000 ) )
return ""; return "";
return ret; return ret;
@ -337,7 +337,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
TQCString foundApp, foundObj; TQCString foundApp, foundObj;
TQByteArray data; TQByteArray data;
TQDataStream str( data, IO_WriteOnly ); TQDataStream str( data, IO_WriteOnly );
if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*", if( TDEApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
"windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) ) "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
{ {
DCOPRef ref( foundApp, foundObj ); DCOPRef ref( foundApp, foundObj );
@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
{ {
TQString error; TQString error;
/* Well, we can't pass a mimetype through startServiceByDesktopPath ! /* Well, we can't pass a mimetype through startServiceByDesktopPath !
if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), if ( TDEApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
url.url(), &error ) > 0 ) url.url(), &error ) > 0 )
{ {
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@ -391,7 +391,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
if( appId.isEmpty()) if( appId.isEmpty())
{ {
TQString error; TQString error;
if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), if ( TDEApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
{ {
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@ -460,10 +460,10 @@ bool clientApp::doIt()
if ( command == "openURL" || command == "newTab" ) if ( command == "openURL" || command == "newTab" )
{ {
KInstance inst(appName); KInstance inst(appName);
if( !KApplication::dcopClient()->attach()) if( !TDEApplication::dcopClient()->attach())
{ {
KApplication::startKdeinit(); TDEApplication::startKdeinit();
KApplication::dcopClient()->attach(); TDEApplication::dcopClient()->attach();
} }
checkArgumentCount(argc, 1, 3); checkArgumentCount(argc, 1, 3);
bool tempFile = TDECmdLineArgs::isTempFileSet(); bool tempFile = TDECmdLineArgs::isTempFileSet();
@ -485,10 +485,10 @@ bool clientApp::doIt()
else if ( command == "openProfile" ) else if ( command == "openProfile" )
{ {
KInstance inst(appName); KInstance inst(appName);
if( !KApplication::dcopClient()->attach()) if( !TDEApplication::dcopClient()->attach())
{ {
KApplication::startKdeinit(); TDEApplication::startKdeinit();
KApplication::dcopClient()->attach(); TDEApplication::dcopClient()->attach();
} }
checkArgumentCount(argc, 2, 3); checkArgumentCount(argc, 2, 3);
TQString url; TQString url;
@ -497,7 +497,7 @@ bool clientApp::doIt()
return openProfile( TQString::fromLocal8Bit(args->arg(1)), url ); return openProfile( TQString::fromLocal8Bit(args->arg(1)), url );
} }
// the following commands need KApplication // the following commands need TDEApplication
clientApp app; clientApp app;
if ( command == "openProperties" ) if ( command == "openProperties" )

2
konqueror/client/kfmclient.h
Unescape View File

@ -23,7 +23,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <krun.h> #include <krun.h>
class clientApp : public KApplication class clientApp : public TDEApplication
{ {
Q_OBJECT Q_OBJECT
public: public:

4
konqueror/keditbookmarks/kbookmarkmerger.cpp
Unescape View File

@ -70,9 +70,9 @@ int main( int argc, char**argv )
TDECmdLineArgs::addCmdLineOptions( cmdLineOptions ); TDECmdLineArgs::addCmdLineOptions( cmdLineOptions );
if ( !kdeRunning ) { if ( !kdeRunning ) {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
} }
KApplication app( false, false ); TDEApplication app( false, false );
app.disableSessionManagement(); app.disableSessionManagement();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

8
konqueror/keditbookmarks/main.cpp
Unescape View File

@ -83,7 +83,7 @@ static void continueInWindow(TQString _wname) {
} }
// TODO - make this register() or something like that and move dialog into main // TODO - make this register() or something like that and move dialog into main
static int askUser(KApplication &app, TQString filename, bool &readonly) { static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
TQCString requestedName("keditbookmarks"); TQCString requestedName("keditbookmarks");
if (!filename.isEmpty()) if (!filename.isEmpty())
@ -122,7 +122,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "lypanov@kde.org"); aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "lypanov@kde.org");
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@ -133,8 +133,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
bool browser = args->isSet("browser"); bool browser = args->isSet("browser");
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(isGui, isGui); TDEApplication app(isGui, isGui);
bool gotArg = (args->count() == 1); bool gotArg = (args->count() == 1);

2
konqueror/kfmclient.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
# This desktop file is the one used by KApplication::invokeBrowser # This desktop file is the one used by TDEApplication::invokeBrowser
Type=Application Type=Application
Exec=kfmclient openURL %u Exec=kfmclient openURL %u
Icon=konqueror Icon=konqueror

6
konqueror/konq_main.h
Unescape View File

@ -6,16 +6,16 @@
// This is used to know if we are being closed by session management // This is used to know if we are being closed by session management
// or by the user. See KonqMainWindow::~KonqMainWindow. // or by the user. See KonqMainWindow::~KonqMainWindow.
// Credits to Matthias Ettrich for the idea. // Credits to Matthias Ettrich for the idea.
class KonquerorApplication : public KApplication class KonquerorApplication : public TDEApplication
{ {
public: public:
KonquerorApplication() : KApplication(), KonquerorApplication() : TDEApplication(),
closed_by_sm( false ) {} closed_by_sm( false ) {}
bool closedByUser() const { return !closed_by_sm; } bool closedByUser() const { return !closed_by_sm; }
void commitData(TQSessionManager& sm) { void commitData(TQSessionManager& sm) {
closed_by_sm = true; closed_by_sm = true;
KApplication::commitData( sm ); TDEApplication::commitData( sm );
closed_by_sm = false; closed_by_sm = false;
} }

8
konqueror/konq_mainwindow.cc
Unescape View File

@ -1145,7 +1145,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
req.newTabInFront = KonqSettings::newTabsInFront(); req.newTabInFront = KonqSettings::newTabsInFront();
req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
if (KApplication::keyboardMouseState() & TQt::ShiftButton) if (TDEApplication::keyboardMouseState() & TQt::ShiftButton)
req.newTabInFront = !req.newTabInFront; req.newTabInFront = !req.newTabInFront;
req.args = args; req.args = args;
openURL( 0L, url, TQString::null, req ); openURL( 0L, url, TQString::null, req );
@ -2016,7 +2016,7 @@ void KonqMainWindow::slotConfigure()
void KonqMainWindow::slotConfigureSpellChecking() void KonqMainWindow::slotConfigureSpellChecking()
{ {
KApplication::startServiceByDesktopName("spellchecking"); TDEApplication::startServiceByDesktopName("spellchecking");
} }
void KonqMainWindow::slotConfigureToolbars() void KonqMainWindow::slotConfigureToolbars()
@ -2739,7 +2739,7 @@ void KonqMainWindow::slotPopupNewTab()
bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
bool newTabsInFront = KonqSettings::newTabsInFront(); bool newTabsInFront = KonqSettings::newTabsInFront();
if (KApplication::keyboardMouseState() & TQt::ShiftButton) if (TDEApplication::keyboardMouseState() & TQt::ShiftButton)
newTabsInFront = !newTabsInFront; newTabsInFront = !newTabsInFront;
popupNewTab(newTabsInFront, openAfterCurrentPage); popupNewTab(newTabsInFront, openAfterCurrentPage);
@ -2749,7 +2749,7 @@ void KonqMainWindow::slotPopupNewTabRight()
{ {
bool newTabsInFront = KonqSettings::newTabsInFront(); bool newTabsInFront = KonqSettings::newTabsInFront();
if (KApplication::keyboardMouseState() & ShiftButton) if (TDEApplication::keyboardMouseState() & ShiftButton)
newTabsInFront = !newTabsInFront; newTabsInFront = !newTabsInFront;
popupNewTab(newTabsInFront, false); popupNewTab(newTabsInFront, false);

2
konqueror/konq_view.cc
Unescape View File

@ -77,7 +77,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
m_pPart = 0L; m_pPart = 0L;
m_dcopObject = 0L; m_dcopObject = 0L;
m_randID = KApplication::random(); m_randID = TDEApplication::random();
m_service = service; m_service = service;
m_partServiceOffers = partServiceOffers; m_partServiceOffers = partServiceOffers;

2
konqueror/listview/konq_listview.kcfg
Unescape View File

@ -20,7 +20,7 @@
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>
<entry key="FileNameColumnWidth" type="Int"> <entry key="FileNameColumnWidth" type="Int">
<default code="true">25 * KApplication::kApplication()->fontMetrics().width( "m" )</default> <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
<label>Width of the FileName Column</label> <label>Width of the FileName Column</label>
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>

4
konsole/konsole/konsole.cpp
Unescape View File

@ -316,7 +316,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
if (isRestored) { if (isRestored) {
n_tabbar = wanted_tabbar; n_tabbar = wanted_tabbar;
KConfig *c = KApplication::kApplication()->sessionConfig(); KConfig *c = TDEApplication::kApplication()->sessionConfig();
// c->setDesktopGroup(); // Reads from wrong group // c->setDesktopGroup(); // Reads from wrong group
b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false); b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false);
} }
@ -2073,7 +2073,7 @@ void Konsole::slotConfigure()
{ {
TQStringList args; TQStringList args;
args << "kcmkonsole"; args << "kcmkonsole";
KApplication::tdeinitExec( "kcmshell", args ); TDEApplication::tdeinitExec( "kcmshell", args );
} }
void Konsole::reparseConfiguration() void Konsole::reparseConfiguration()

6
konsole/konsole/main.cpp
Unescape View File

@ -247,12 +247,12 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
if( qtargs->isSet("font") ) if( qtargs->isSet("font") )
kdWarning() << "The Qt option -fn, --font has no effect." << endl; kdWarning() << "The Qt option -fn, --font has no effect." << endl;
KApplication* a = NULL; TDEApplication* a = NULL;
#ifdef COMPOSITE #ifdef COMPOSITE
a = new KApplication(KApplication::openX11RGBADisplay()); a = new TDEApplication(TDEApplication::openX11RGBADisplay());
argb_visual = a->isX11CompositionAvailable(); argb_visual = a->isX11CompositionAvailable();
#else #else
a = new KApplication; a = new TDEApplication;
#endif #endif
TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/"); TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");

2
konsole/konsole/schema.cpp
Unescape View File

@ -356,7 +356,7 @@ bool ColorSchema::rereadSchemaFile()
continue; continue;
if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (random_hue == -1) if (random_hue == -1)
random_hue = (KApplication::random()%32) * 11; random_hue = (TDEApplication::random()%32) * 11;
ch = random_hue; ch = random_hue;
if (!(0 <= cs && cs <= 255 )) continue; if (!(0 <= cs && cs <= 255 )) continue;
if (!(0 <= cv && cv <= 255 )) continue; if (!(0 <= cv && cv <= 255 )) continue;

2
kpager/main.cpp
Unescape View File

@ -88,7 +88,7 @@ int main(int argc, char **argv)
} }
KApplication * app = new KPagerApplication; TDEApplication * app = new KPagerApplication;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KPagerMainWindow *kpager = new KPagerMainWindow(0,"KPager"); KPagerMainWindow *kpager = new KPagerMainWindow(0,"KPager");

2
kpersonalizer/main.cpp
Unescape View File

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
KLocale::setMainCatalogue("kpersonalizer"); KLocale::setMainCatalogue("kpersonalizer");
KApplication a; TDEApplication a;
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();

4
krootbacking/krootbacking.cpp
Unescape View File

@ -52,7 +52,7 @@ public:
KRootBacking::KRootBacking() KRootBacking::KRootBacking()
: TQObject(KApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0) : TQObject(TDEApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0)
{ {
enableExports(); enableExports();
@ -146,7 +146,7 @@ void KRootBacking::repaint()
void KRootBacking::repaint(bool force) void KRootBacking::repaint(bool force)
{ {
TQWidget* desktopWidget = KApplication::desktop(); TQWidget* desktopWidget = TDEApplication::desktop();
TQPoint p1 = desktopWidget->mapToGlobal(desktopWidget->rect().topLeft()); TQPoint p1 = desktopWidget->mapToGlobal(desktopWidget->rect().topLeft());
TQPoint p2 = desktopWidget->mapToGlobal(desktopWidget->rect().bottomRight()); TQPoint p2 = desktopWidget->mapToGlobal(desktopWidget->rect().bottomRight());
if (!force && (m_Rect == TQRect(p1, p2))) if (!force && (m_Rect == TQRect(p1, p2)))

2
krootbacking/main.cpp
Unescape View File

@ -52,7 +52,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
// no session.. just start up normally // no session.. just start up normally
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

2
kscreensaver/random.cpp
Unescape View File

@ -105,7 +105,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; TDEApplication app;
Window windowId = 0; Window windowId = 0;

4
ksmserver/README
Unescape View File

@ -123,7 +123,7 @@ bogus value.
In addition, ksmserver propagates both its network address and its In addition, ksmserver propagates both its network address and its
process id in ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. A process id in ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. A
utility function KApplication::propagateSessionManager() reads this utility function TDEApplication::propagateSessionManager() reads this
setting and sets SESSION_MANAGER accordingly, so that child processes setting and sets SESSION_MANAGER accordingly, so that child processes
can pick it up. The function is called by clients that are started can pick it up. The function is called by clients that are started
outside the session ( i.e. before ksmserver is started), but want to outside the session ( i.e. before ksmserver is started), but want to
@ -146,7 +146,7 @@ Requesting a shutdown
If an application wants to request a shutdown (i.e. a logout), it does If an application wants to request a shutdown (i.e. a logout), it does
this via an SmcRequestSaveYourself message to the server. In TDE, a this via an SmcRequestSaveYourself message to the server. In TDE, a
utility function KApplication::requestShutDown() does exactly utility function TDEApplication::requestShutDown() does exactly
this. It's for example called by TDE's panel or by the context menu of this. It's for example called by TDE's panel or by the context menu of
the desktop. the desktop.

2
ksmserver/client.cpp
Unescape View File

@ -99,7 +99,7 @@ static char * safeSmsGenerateClientID( SmsConn /*c*/ )
(1 would be IP, 2 would be DEC-NET format) */ (1 would be IP, 2 would be DEC-NET format) */
char hostname[ 256 ]; char hostname[ 256 ];
if( gethostname( hostname, 255 ) != 0 ) if( gethostname( hostname, 255 ) != 0 )
my_addr->sprintf("0%.8x", KApplication::random()); my_addr->sprintf("0%.8x", TDEApplication::random());
else { else {
// create some kind of hash for the hostname // create some kind of hash for the hostname
int addr[ 4 ] = { 0, 0, 0, 0 }; int addr[ 4 ] = { 0, 0, 0, 0 };

2
ksmserver/main.cpp
Unescape View File

@ -190,7 +190,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
putenv((char*)"SESSION_MANAGER="); putenv((char*)"SESSION_MANAGER=");
KApplication a(KApplication::openX11RGBADisplay(), false); // Disable styles until we need them. TDEApplication a(TDEApplication::openX11RGBADisplay(), false); // Disable styles until we need them.
fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, 1); fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, 1);

12
ksmserver/server.cpp
Unescape View File

@ -195,10 +195,10 @@ void KSMSaveYourselfRequestProc (
{ {
if ( shutdown ) { if ( shutdown ) {
the_server->shutdown( fast ? the_server->shutdown( fast ?
KApplication::ShutdownConfirmNo : TDEApplication::ShutdownConfirmNo :
KApplication::ShutdownConfirmDefault, TDEApplication::ShutdownConfirmDefault,
KApplication::ShutdownTypeDefault, TDEApplication::ShutdownTypeDefault,
KApplication::ShutdownModeDefault ); TDEApplication::ShutdownModeDefault );
} else if ( !global ) { } else if ( !global ) {
SmsSaveYourself( smsConn, saveType, false, interactStyle, fast ); SmsSaveYourself( smsConn, saveType, false, interactStyle, fast );
SmsSaveComplete( smsConn ); SmsSaveComplete( smsConn );
@ -586,7 +586,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
wm = windowManager; wm = windowManager;
wmAddArgs = windowManagerAddArgs; wmAddArgs = windowManagerAddArgs;
shutdownType = KApplication::ShutdownTypeNone; shutdownType = TDEApplication::ShutdownTypeNone;
state = Idle; state = Idle;
dialogActive = false; dialogActive = false;
@ -609,7 +609,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
only_local = false; only_local = false;
#endif #endif
launcher = KApplication::launcher(); launcher = TDEApplication::launcher();
char errormsg[256]; char errormsg[256];
if (!SmsInitialize ( (char*) KSMVendorString, (char*) KSMReleaseString, if (!SmsInitialize ( (char*) KSMVendorString, (char*) KSMReleaseString,

28
ksmserver/server.h
Unescape View File

@ -86,17 +86,17 @@ public:
void restoreSession( TQString sessionName ); void restoreSession( TQString sessionName );
void startDefaultSession(); void startDefaultSession();
void shutdown( KApplication::ShutdownConfirm confirm, void shutdown( TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype, TDEApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode ); TDEApplication::ShutdownMode sdmode );
virtual void suspendStartup( TQCString app ); virtual void suspendStartup( TQCString app );
virtual void resumeStartup( TQCString app ); virtual void resumeStartup( TQCString app );
bool checkStatus( bool &logoutConfirmed, bool &maysd, bool checkStatus( bool &logoutConfirmed, bool &maysd,
KApplication::ShutdownConfirm confirm, TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype, TDEApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode ); TDEApplication::ShutdownMode sdmode );
public slots: public slots:
void cleanUp(); void cleanUp();
@ -150,9 +150,9 @@ private:
bool defaultSession() const; // empty session bool defaultSession() const; // empty session
void setupXIOErrorHandler(); void setupXIOErrorHandler();
void shutdownInternal( KApplication::ShutdownConfirm confirm, void shutdownInternal( TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype, TDEApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode, TDEApplication::ShutdownMode sdmode,
TQString bootOption = TQString::null ); TQString bootOption = TQString::null );
void performLegacySessionSave(); void performLegacySessionSave();
@ -196,8 +196,8 @@ private:
int saveType; int saveType;
TQMap< TQCString, int > startupSuspendCount; TQMap< TQCString, int > startupSuspendCount;
KApplication::ShutdownType shutdownType; TDEApplication::ShutdownType shutdownType;
KApplication::ShutdownMode shutdownMode; TDEApplication::ShutdownMode shutdownMode;
TQString bootOption; TQString bootOption;
bool clean; bool clean;
@ -216,9 +216,9 @@ private:
bool waitAutoStart2; bool waitAutoStart2;
bool waitKcmInit2; bool waitKcmInit2;
TQTimer pendingShutdown; TQTimer pendingShutdown;
KApplication::ShutdownConfirm pendingShutdown_confirm; TDEApplication::ShutdownConfirm pendingShutdown_confirm;
KApplication::ShutdownType pendingShutdown_sdtype; TDEApplication::ShutdownType pendingShutdown_sdtype;
KApplication::ShutdownMode pendingShutdown_sdmode; TDEApplication::ShutdownMode pendingShutdown_sdmode;
// ksplash interface // ksplash interface
void upAndRunning( const TQString& msg ); void upAndRunning( const TQString& msg );

54
ksmserver/shutdown.cpp
Unescape View File

@ -97,15 +97,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
void KSMServer::logout( int confirm, int sdtype, int sdmode ) void KSMServer::logout( int confirm, int sdtype, int sdmode )
{ {
shutdown( (KApplication::ShutdownConfirm)confirm, shutdown( (TDEApplication::ShutdownConfirm)confirm,
(KApplication::ShutdownType)sdtype, (TDEApplication::ShutdownType)sdtype,
(KApplication::ShutdownMode)sdmode ); (TDEApplication::ShutdownMode)sdmode );
} }
bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
KApplication::ShutdownConfirm confirm, TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype, TDEApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode ) TDEApplication::ShutdownMode sdmode )
{ {
pendingShutdown.stop(); pendingShutdown.stop();
if( dialogActive ) if( dialogActive )
@ -130,15 +130,15 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
config->setGroup("General" ); config->setGroup("General" );
logoutConfirmed = logoutConfirmed =
(confirm == KApplication::ShutdownConfirmYes) ? false : (confirm == TDEApplication::ShutdownConfirmYes) ? false :
(confirm == KApplication::ShutdownConfirmNo) ? true : (confirm == TDEApplication::ShutdownConfirmNo) ? true :
!config->readBoolEntry( "confirmLogout", true ); !config->readBoolEntry( "confirmLogout", true );
maysd = false; maysd = false;
if (config->readBoolEntry( "offerShutdown", true ) && DM().canShutdown()) if (config->readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
maysd = true; maysd = true;
if (!maysd) { if (!maysd) {
if (sdtype != KApplication::ShutdownTypeNone && if (sdtype != TDEApplication::ShutdownTypeNone &&
sdtype != KApplication::ShutdownTypeDefault && sdtype != TDEApplication::ShutdownTypeDefault &&
logoutConfirmed) logoutConfirmed)
return false; /* unsupported fast shutdown */ return false; /* unsupported fast shutdown */
} }
@ -146,9 +146,9 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
return true; return true;
} }
void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm, void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype, TDEApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode, TDEApplication::ShutdownMode sdmode,
TQString bopt ) TQString bopt )
{ {
bool maysd = false; bool maysd = false;
@ -160,12 +160,12 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
config->setGroup("General" ); config->setGroup("General" );
if (!maysd) { if (!maysd) {
sdtype = KApplication::ShutdownTypeNone; sdtype = TDEApplication::ShutdownTypeNone;
} else if (sdtype == KApplication::ShutdownTypeDefault) } else if (sdtype == TDEApplication::ShutdownTypeDefault)
sdtype = (KApplication::ShutdownType) sdtype = (TDEApplication::ShutdownType)
config->readNumEntry( "shutdownType", (int)KApplication::ShutdownTypeNone ); config->readNumEntry( "shutdownType", (int)TDEApplication::ShutdownTypeNone );
if (sdmode == KApplication::ShutdownModeDefault) if (sdmode == TDEApplication::ShutdownModeDefault)
sdmode = KApplication::ShutdownModeInteractive; sdmode = TDEApplication::ShutdownModeInteractive;
// shall we show a logout status dialog box? // shall we show a logout status dialog box?
bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
@ -282,8 +282,8 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
dialogActive = false; dialogActive = false;
} }
void KSMServer::shutdown( KApplication::ShutdownConfirm confirm, void KSMServer::shutdown( TDEApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode ) TDEApplication::ShutdownType sdtype, TDEApplication::ShutdownMode sdmode )
{ {
shutdownInternal( confirm, sdtype, sdmode ); shutdownInternal( confirm, sdtype, sdmode );
} }
@ -297,9 +297,9 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
KConfig* config = KGlobal::config(); KConfig* config = KGlobal::config();
config->setGroup( "General" ); config->setGroup( "General" );
if ( sdtype == KApplication::ShutdownTypeHalt ) if ( sdtype == TDEApplication::ShutdownTypeHalt )
confirmDelay = config->readNumEntry( "confirmShutdownDelay", 31 ); confirmDelay = config->readNumEntry( "confirmShutdownDelay", 31 );
else if ( sdtype == KApplication::ShutdownTypeReboot ) else if ( sdtype == TDEApplication::ShutdownTypeReboot )
confirmDelay = config->readNumEntry( "confirmRebootDelay", 31 ); confirmDelay = config->readNumEntry( "confirmRebootDelay", 31 );
else else
confirmDelay = config->readNumEntry( "confirmLogoutDelay", 31 ); confirmDelay = config->readNumEntry( "confirmLogoutDelay", 31 );
@ -307,14 +307,14 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
bool result = true; bool result = true;
if (confirmDelay) { if (confirmDelay) {
KSMShutdownFeedback::start(); // make the screen gray KSMShutdownFeedback::start(); // make the screen gray
result = KSMDelayedMessageBox::showTicker( (KApplication::ShutdownType)sdtype, bootOption, confirmDelay ); result = KSMDelayedMessageBox::showTicker( (TDEApplication::ShutdownType)sdtype, bootOption, confirmDelay );
KSMShutdownFeedback::stop(); // make the screen become normal again KSMShutdownFeedback::stop(); // make the screen become normal again
} }
if ( result ) if ( result )
shutdownInternal( KApplication::ShutdownConfirmNo, shutdownInternal( TDEApplication::ShutdownConfirmNo,
(KApplication::ShutdownType)sdtype, (TDEApplication::ShutdownType)sdtype,
(KApplication::ShutdownMode)sdmode, (TDEApplication::ShutdownMode)sdmode,
bootOption ); bootOption );
} }

28
ksmserver/shutdowndlg.cpp
Unescape View File

@ -674,7 +674,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
////// //////
KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
bool maysd, KApplication::ShutdownType sdtype, int* selection ) bool maysd, TDEApplication::ShutdownType sdtype, int* selection )
: TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0), m_selection(selection) : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0), m_selection(selection)
// this is a WType_Popup on purpose. Do not change that! Not // this is a WType_Popup on purpose. Do not change that! Not
// having a popup here has severe side effects. // having a popup here has severe side effects.
@ -903,7 +903,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnReboot); hbuttonbox2->addWidget ( btnReboot);
connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
if ( sdtype == KApplication::ShutdownTypeReboot ) if ( sdtype == TDEApplication::ShutdownTypeReboot )
btnReboot->setFocus(); btnReboot->setFocus();
// BAD CARMA .. this code is copied line by line from standard konqy dialog // BAD CARMA .. this code is copied line by line from standard konqy dialog
@ -938,7 +938,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnHalt ); hbuttonbox2->addWidget ( btnHalt );
connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
if ( sdtype == KApplication::ShutdownTypeHalt ) if ( sdtype == TDEApplication::ShutdownTypeHalt )
btnHalt->setFocus(); btnHalt->setFocus();
// cancel buttonbox // cancel buttonbox
@ -959,7 +959,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
btnHalt->setFont( btnFont ); btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt ); buttonlay->addWidget( btnHalt );
connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
if ( sdtype == KApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") ) if ( sdtype == TDEApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") )
btnHalt->setFocus(); btnHalt->setFocus();
// Reboot // Reboot
@ -969,7 +969,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
buttonlay->addWidget( btnReboot ); buttonlay->addWidget( btnReboot );
connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
if ( sdtype == KApplication::ShutdownTypeReboot ) if ( sdtype == TDEApplication::ShutdownTypeReboot )
btnReboot->setFocus(); btnReboot->setFocus();
// this section is copied as-is into ubuntulogout as well // this section is copied as-is into ubuntulogout as well
@ -1078,7 +1078,7 @@ KSMShutdownDlg::~KSMShutdownDlg()
void KSMShutdownDlg::slotLogout() void KSMShutdownDlg::slotLogout()
{ {
m_shutdownType = KApplication::ShutdownTypeNone; m_shutdownType = TDEApplication::ShutdownTypeNone;
accept(); accept();
} }
@ -1087,7 +1087,7 @@ void KSMShutdownDlg::slotReboot()
{ {
// no boot option selected -> current // no boot option selected -> current
m_bootOption = TQString::null; m_bootOption = TQString::null;
m_shutdownType = KApplication::ShutdownTypeReboot; m_shutdownType = TDEApplication::ShutdownTypeReboot;
accept(); accept();
} }
@ -1095,7 +1095,7 @@ void KSMShutdownDlg::slotReboot(int opt)
{ {
if (int(rebootOptions.size()) > opt) if (int(rebootOptions.size()) > opt)
m_bootOption = rebootOptions[opt]; m_bootOption = rebootOptions[opt];
m_shutdownType = KApplication::ShutdownTypeReboot; m_shutdownType = TDEApplication::ShutdownTypeReboot;
accept(); accept();
} }
@ -1103,7 +1103,7 @@ void KSMShutdownDlg::slotReboot(int opt)
void KSMShutdownDlg::slotHalt() void KSMShutdownDlg::slotHalt()
{ {
m_bootOption = TQString::null; m_bootOption = TQString::null;
m_shutdownType = KApplication::ShutdownTypeHalt; m_shutdownType = TDEApplication::ShutdownTypeHalt;
accept(); accept();
} }
@ -1160,7 +1160,7 @@ void KSMShutdownDlg::slotHibernate()
reject(); // continue on resume reject(); // continue on resume
} }
bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bootOption, int* selection ) bool KSMShutdownDlg::confirmShutdown( bool maysd, TDEApplication::ShutdownType& sdtype, TQString& bootOption, int* selection )
{ {
kapp->enableStyles(); kapp->enableStyles();
KSMShutdownDlg* l = new KSMShutdownDlg( 0, KSMShutdownDlg* l = new KSMShutdownDlg( 0,
@ -1245,16 +1245,16 @@ void KSMDelayedPushButton::slotTimeout()
setDown(false); setDown(false);
} }
KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay ) KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
: TimedLogoutDlg( 0, 0, true, (WFlags)WType_Popup ), m_remaining(confirmDelay) : TimedLogoutDlg( 0, 0, true, (WFlags)WType_Popup ), m_remaining(confirmDelay)
{ {
if ( sdtype == KApplication::ShutdownTypeHalt ) if ( sdtype == TDEApplication::ShutdownTypeHalt )
{ {
m_title->setText( i18n( "Would you like to turn off your computer?" ) ); m_title->setText( i18n( "Would you like to turn off your computer?" ) );
m_template = i18n( "This computer will turn off automatically\n" m_template = i18n( "This computer will turn off automatically\n"
"after %1 seconds." ); "after %1 seconds." );
m_logo->setPixmap( BarIcon( "exit", 48 ) ); m_logo->setPixmap( BarIcon( "exit", 48 ) );
} else if ( sdtype == KApplication::ShutdownTypeReboot ) } else if ( sdtype == TDEApplication::ShutdownTypeReboot )
{ {
if (bootOption.isEmpty()) if (bootOption.isEmpty())
m_title->setText( i18n( "Would you like to reboot your computer?" ) ); m_title->setText( i18n( "Would you like to reboot your computer?" ) );
@ -1294,7 +1294,7 @@ void KSMDelayedMessageBox::updateText()
m_text->setText( m_template.arg( m_remaining ) ); m_text->setText( m_template.arg( m_remaining ) );
} }
bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay ) bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
{ {
kapp->enableStyles(); kapp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );

10
ksmserver/shutdowndlg.h
Unescape View File

@ -129,7 +129,7 @@ class KSMShutdownDlg : public TQDialog
Q_OBJECT Q_OBJECT
public: public:
static bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 ); static bool confirmShutdown( bool maysd, TDEApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 );
public slots: public slots:
void slotLogout(); void slotLogout();
@ -143,8 +143,8 @@ protected:
~KSMShutdownDlg(); ~KSMShutdownDlg();
private: private:
KSMShutdownDlg( TQWidget* parent, bool maysd, KApplication::ShutdownType sdtype, int* selection=0 ); KSMShutdownDlg( TQWidget* parent, bool maysd, TDEApplication::ShutdownType sdtype, int* selection=0 );
KApplication::ShutdownType m_shutdownType; TDEApplication::ShutdownType m_shutdownType;
TQString m_bootOption; TQString m_bootOption;
TQPopupMenu *targets; TQPopupMenu *targets;
TQStringList rebootOptions; TQStringList rebootOptions;
@ -248,8 +248,8 @@ class KSMDelayedMessageBox : public TimedLogoutDlg
Q_OBJECT Q_OBJECT
public: public:
KSMDelayedMessageBox( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay ); KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
static bool showTicker( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay ); static bool showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
protected slots: protected slots:
void updateText(); void updateText();

4
ksmserver/test.cpp
Unescape View File

@ -10,14 +10,14 @@ main(int argc, char *argv[])
KAboutData about("kapptest", "kapptest", "version"); KAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KApplication a; TDEApplication a;
a.iconLoader()->addAppDir("ksmserver"); a.iconLoader()->addAppDir("ksmserver");
KSMShutdownFeedback::start(); KSMShutdownFeedback::start();
// ShutdownTypeNone == Logout == 0 // ShutdownTypeNone == Logout == 0
// ShutdownTypeReboot == 1 // ShutdownTypeReboot == 1
// ShutdownTypeHalt == 2 // ShutdownTypeHalt == 2
KApplication::ShutdownType sdtype = KApplication::ShutdownTypeNone; TDEApplication::ShutdownType sdtype = TDEApplication::ShutdownTypeNone;
TQString bopt; TQString bopt;
KSMDelayedMessageBox::showTicker( sdtype ); KSMDelayedMessageBox::showTicker( sdtype );
/* /*

8
ksplashml/main.cpp
Unescape View File

@ -55,11 +55,11 @@ int main( int argc, char **argv )
TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs();
if ( !( arg->isSet( "dcop" ) ) ) if ( !( arg->isSet( "dcop" ) ) )
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
else if ( KApplication::dcopClient()->attach() ) else if ( TDEApplication::dcopClient()->attach() )
KApplication::dcopClient()->registerAs( "ksplash", false ); TDEApplication::dcopClient()->registerAs( "ksplash", false );
KApplication app; TDEApplication app;
KSplash wndMain("ksplash"); KSplash wndMain("ksplash");
if ( arg->isSet( "steps" ) ) if ( arg->isSet( "steps" ) )

2
kstart/kstart.cpp
Unescape View File

@ -302,7 +302,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

2
ksysguard/gui/SensorDisplayLib/ProcessController.h
Unescape View File

@ -40,7 +40,7 @@ class TQComboBox;
class KPushButton; class KPushButton;
class KListViewSearchLineWidget; class KListViewSearchLineWidget;
extern KApplication* Kapp; extern TDEApplication* Kapp;
/** /**
* This widget implements a process list page. Besides the process * This widget implements a process list page. Besides the process

4
ksysguard/gui/ksysguard.cc
Unescape View File

@ -571,9 +571,9 @@ int main( int argc, char** argv )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
// initialize KDE application // initialize KDE application
KApplication *app = new KApplication; TDEApplication *app = new TDEApplication;
KSGRD::SensorMgr = new KSGRD::SensorManager(); KSGRD::SensorMgr = new KSGRD::SensorManager();
KSGRD::Style = new KSGRD::StyleEngine(); KSGRD::Style = new KSGRD::StyleEngine();

2
ksystraycmd/main.cpp
Unescape View File

@ -58,7 +58,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
// //
// Setup the tray icon from the arguments. // Setup the tray icon from the arguments.

4
kxkb/kxkb.cpp
Unescape View File

@ -274,7 +274,7 @@ void KXKBApp::menuActivated(int id)
} }
else if (id == KxkbLabelController::HELP_MENU_ID) else if (id == KxkbLabelController::HELP_MENU_ID)
{ {
KApplication::kApplication()->invokeHelp(0, "kxkb"); TDEApplication::kApplication()->invokeHelp(0, "kxkb");
} }
else else
{ {
@ -321,7 +321,7 @@ void KXKBApp::windowChanged(WId winId)
void KXKBApp::slotSettingsChanged(int category) void KXKBApp::slotSettingsChanged(int category)
{ {
if ( category != KApplication::SETTINGS_SHORTCUTS) if ( category != TDEApplication::SETTINGS_SHORTCUTS)
return; return;
KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals

4
libkonq/konq_operations.cc
Unescape View File

@ -437,7 +437,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
{ {
stringList.append((*it).url()); stringList.append((*it).url());
} }
if ( KApplication::startServiceByDesktopPath( m_destURL.path(), stringList, &error ) > 0 ) if ( TDEApplication::startServiceByDesktopPath( m_destURL.path(), stringList, &error ) > 0 )
KMessageBox::error( 0L, error ); KMessageBox::error( 0L, error );
} }
else else
@ -645,7 +645,7 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL&
KConfigGroupSaver cgs( globalConfig, "Paths" ); KConfigGroupSaver cgs( globalConfig, "Paths" );
globalConfig->writePathEntry("Desktop" , newurl.path(), true, true ); globalConfig->writePathEntry("Desktop" , newurl.path(), true, true );
globalConfig->sync(); globalConfig->sync();
KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS); KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS);
} }
} }

2
libkonq/konq_popupmenu.cc
Unescape View File

@ -588,7 +588,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( sDeleting ) { if ( sDeleting ) {
if ( !isLocal ) if ( !isLocal )
addDel = true; addDel = true;
else if (KApplication::keyboardMouseState() & TQt::ShiftButton) { else if (TDEApplication::keyboardMouseState() & TQt::ShiftButton) {
addTrash = false; addTrash = false;
addDel = true; addDel = true;
} }

4
libkonq/tests/konqdragtest.cpp
Unescape View File

@ -53,9 +53,9 @@ void testKonqIconDrag2()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 ); TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
KApplication app; // GUI needed for QPixmaps TDEApplication app; // GUI needed for QPixmaps
testKonqIconDrag2(); testKonqIconDrag2();
return 0; return 0;

2
nsplugins/kcm_nsplugins.cpp
Unescape View File

@ -116,7 +116,7 @@ extern "C"
if ( scan || firstTime ) if ( scan || firstTime )
{ {
KApplication::tdeinitExec("nspluginscan"); TDEApplication::tdeinitExec("nspluginscan");
} }
if (firstTime) { if (firstTime) {

2
nsplugins/pluginscan.cpp
Unescape View File

@ -539,7 +539,7 @@ int main( int argc, char **argv )
printf("10\n"); fflush(stdout); printf("10\n"); fflush(stdout);
} }
KApplication app(false, false); TDEApplication app(false, false);
// Set up SIGCHLD handler // Set up SIGCHLD handler
struct sigaction act; struct sigaction act;

2
nsplugins/test/testnsplugin.cpp
Unescape View File

@ -126,7 +126,7 @@ int main(int argc, char *argv[])
setvbuf( stderr, NULL, _IONBF, 0 ); setvbuf( stderr, NULL, _IONBF, 0 );
TDECmdLineArgs::init(argc, argv, "nsplugin", "A Netscape Plugin test program", "0.1"); TDECmdLineArgs::init(argc, argv, "nsplugin", "A Netscape Plugin test program", "0.1");
KApplication app("nsplugin"); TDEApplication app("nsplugin");
app.dcopClient()->attach(); app.dcopClient()->attach();
app.dcopClient()->registerAs(app.name()); app.dcopClient()->registerAs(app.name());

4
nsplugins/viewer/kxt.cpp
Unescape View File

@ -314,7 +314,7 @@ KXtApplication::KXtApplication(int& argc, char** argv,
const TQCString& rAppName, bool allowStyles, bool GUIenabled, const TQCString& rAppName, bool allowStyles, bool GUIenabled,
XrmOptionDescRec *options, int num_options, XrmOptionDescRec *options, int num_options,
char** resources) char** resources)
: KApplication(argc, argv, rAppName, allowStyles, GUIenabled) : TDEApplication(argc, argv, rAppName, allowStyles, GUIenabled)
{ {
my_xt = TRUE; my_xt = TRUE;
@ -335,7 +335,7 @@ KXtApplication::KXtApplication(int& argc, char** argv,
*/ */
KXtApplication::KXtApplication(Display* dpy, int& argc, char** argv, KXtApplication::KXtApplication(Display* dpy, int& argc, char** argv,
const TQCString& rAppName, bool allowStyles, bool GUIenabled) const TQCString& rAppName, bool allowStyles, bool GUIenabled)
: KApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled) : TDEApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
{ {
my_xt = FALSE; my_xt = FALSE;
init(); init();

2
nsplugins/viewer/kxt.h
Unescape View File

@ -53,7 +53,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
class KXtApplication : public KApplication { class KXtApplication : public TDEApplication {
Q_OBJECT Q_OBJECT
void init(); void init();

2
nsplugins/viewer/nsplugin.cpp
Unescape View File

@ -1254,7 +1254,7 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
: DCOPObject(dcopId), TQObject( parent, name ) : DCOPObject(dcopId), TQObject( parent, name )
{ {
_classes.setAutoDelete( true ); _classes.setAutoDelete( true );
connect(KApplication::dcopClient(), connect(TDEApplication::dcopClient(),
TQT_SIGNAL(applicationRemoved(const TQCString&)), TQT_SIGNAL(applicationRemoved(const TQCString&)),
this, this,
TQT_SLOT(appUnregistered(const TQCString&))); TQT_SLOT(appUnregistered(const TQCString&)));

4
nsplugins/viewer/viewer.cpp
Unescape View File

@ -248,8 +248,8 @@ int main(int argc, char** argv)
parseCommandLine(argc, argv); parseCommandLine(argc, argv);
KLocale::setMainCatalogue("nsplugin"); KLocale::setMainCatalogue("nsplugin");
kdDebug(1430) << "4 - create KApplication" << endl; kdDebug(1430) << "4 - create TDEApplication" << endl;
KApplication app( argc, argv, "nspluginviewer" ); TDEApplication app( argc, argv, "nspluginviewer" );
GlibEvents glibevents; GlibEvents glibevents;
#endif #endif

4
tdeinit/displayconfig.cpp
Unescape View File

@ -57,8 +57,8 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app; TDEApplication app;
#ifdef WITH_XRANDR #ifdef WITH_XRANDR
// Load up user specific display settings // Load up user specific display settings

4
tdeinit/phase1.cpp
Unescape View File

@ -53,8 +53,8 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app; TDEApplication app;
KConfig config("twinrc", true); KConfig config("twinrc", true);
config.setGroup( "ThirdPartyWM" ); config.setGroup( "ThirdPartyWM" );

2
tdeprint/kprinter/main.cpp
Unescape View File

@ -46,7 +46,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
{ {
TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1");
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; TDEApplication app;
PrintWrapper *wrap = new PrintWrapper; PrintWrapper *wrap = new PrintWrapper;
app.setMainWidget(wrap); app.setMainWidget(wrap);
TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint())); TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint()));

2
tdeprint/slave/kio_print.cpp
Unescape View File

@ -148,7 +148,7 @@ int kdemain(int argc, char **argv)
KAboutData about( "kio_print", "kio_print", "fake_version", KAboutData about( "kio_print", "kio_print", "fake_version",
"TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" ); "TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
TDECmdLineArgs::init( &about ); TDECmdLineArgs::init( &about );
KApplication app; TDEApplication app;
KIO_Print slave(argv[2], argv[3]); KIO_Print slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();

4
tdeprint/tdeprintfax/main.cpp
Unescape View File

@ -53,9 +53,9 @@ int main(int argc, char *argv[])
aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
KApplication a; TDEApplication a;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KdeprintFax *w = new KdeprintFax; KdeprintFax *w = new KdeprintFax;

4
tdesu/tdesu/tdesu.cpp
Unescape View File

@ -108,11 +108,11 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
// tdesu doesn't process SM events, so don't even connect to ksmserver // tdesu doesn't process SM events, so don't even connect to ksmserver
TQCString session_manager = getenv( "SESSION_MANAGER" ); TQCString session_manager = getenv( "SESSION_MANAGER" );
unsetenv( "SESSION_MANAGER" ); unsetenv( "SESSION_MANAGER" );
KApplication app; TDEApplication app;
// but propagate it to the started app // but propagate it to the started app
if (session_manager.data()) if (session_manager.data())
{ {

6
tdm/kfrontend/kgapp.cpp
Unescape View File

@ -94,12 +94,12 @@ GreeterApp::GreeterApp()
init(); init();
} }
GreeterApp::GreeterApp(Display *dpy) : KApplication(dpy) GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy)
{ {
init(); init();
} }
GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : KApplication(dpy, visual, colormap) GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
{ {
init(); init();
} }
@ -199,7 +199,7 @@ kg_main( const char *argv0 )
kdDebug() << timestamp() << "start" << endl; kdDebug() << timestamp() << "start" << endl;
kde_have_kipc = false; kde_have_kipc = false;
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KCrash::setSafer( true ); KCrash::setSafer( true );
KProcess *tsak = 0; KProcess *tsak = 0;

4
tdm/kfrontend/kgapp.h
Unescape View File

@ -29,9 +29,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kapplication.h> #include <kapplication.h>
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
class GreeterApp : public KApplication { class GreeterApp : public TDEApplication {
Q_OBJECT Q_OBJECT
typedef KApplication inherited; typedef TDEApplication inherited;
public: public:
GreeterApp(); GreeterApp();

4
tdm/kfrontend/krootimage.cpp
Unescape View File

@ -48,7 +48,7 @@ static Atom prop_root;
static bool properties_inited = false; static bool properties_inited = false;
MyApplication::MyApplication( const char *conf ) MyApplication::MyApplication( const char *conf )
: KApplication(), : TDEApplication(),
renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
{ {
connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
@ -115,7 +115,7 @@ MyApplication::slotTimeout()
int int
main( int argc, char *argv[] ) main( int argc, char *argv[] )
{ {
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KLocale::setMainCatalogue( "kdesktop" ); KLocale::setMainCatalogue( "kdesktop" );
TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version );

2
tdm/kfrontend/krootimage.h
Unescape View File

@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
#include <bgrender.h> #include <bgrender.h>
class MyApplication : public KApplication class MyApplication : public TDEApplication
{ {
Q_OBJECT Q_OBJECT

22
tdmlib/dmctl.cpp
Unescape View File

@ -184,11 +184,11 @@ DM::canShutdown()
} }
void void
DM::shutdown( KApplication::ShutdownType shutdownType, DM::shutdown( TDEApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, /* NOT Default */ TDEApplication::ShutdownMode shutdownMode, /* NOT Default */
const TQString &bootOption ) const TQString &bootOption )
{ {
if (shutdownType == KApplication::ShutdownTypeNone) if (shutdownType == TDEApplication::ShutdownTypeNone)
return; return;
bool cap_ask; bool cap_ask;
@ -200,26 +200,26 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
return; return;
cap_ask = false; cap_ask = false;
} }
if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive) if (!cap_ask && shutdownMode == TDEApplication::ShutdownModeInteractive)
shutdownMode = KApplication::ShutdownModeForceNow; shutdownMode = TDEApplication::ShutdownModeForceNow;
TQCString cmd; TQCString cmd;
if (DMType == GDM) { if (DMType == GDM) {
cmd.append( shutdownMode == KApplication::ShutdownModeForceNow ? cmd.append( shutdownMode == TDEApplication::ShutdownModeForceNow ?
"SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " ); "SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " );
cmd.append( shutdownType == KApplication::ShutdownTypeReboot ? cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
"REBOOT\n" : "HALT\n" ); "REBOOT\n" : "HALT\n" );
} else { } else {
cmd.append( "shutdown\t" ); cmd.append( "shutdown\t" );
cmd.append( shutdownType == KApplication::ShutdownTypeReboot ? cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
"reboot\t" : "halt\t" ); "reboot\t" : "halt\t" );
if (!bootOption.isEmpty()) if (!bootOption.isEmpty())
cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" ); cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" );
cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ? cmd.append( shutdownMode == TDEApplication::ShutdownModeInteractive ?
"ask\n" : "ask\n" :
shutdownMode == KApplication::ShutdownModeForceNow ? shutdownMode == TDEApplication::ShutdownModeForceNow ?
"forcenow\n" : "forcenow\n" :
shutdownMode == KApplication::ShutdownModeTryNow ? shutdownMode == TDEApplication::ShutdownModeTryNow ?
"trynow\n" : "schedule\n" ); "trynow\n" : "schedule\n" );
} }
exec( cmd.data() ); exec( cmd.data() );

8
tdmlib/dmctl.h
Unescape View File

@ -40,8 +40,8 @@ public:
~DM(); ~DM();
bool canShutdown(); bool canShutdown();
void shutdown( KApplication::ShutdownType shutdownType, void shutdown( TDEApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, TDEApplication::ShutdownMode shutdownMode,
const TQString &bootOption = TQString::null ); const TQString &bootOption = TQString::null );
void setLock( bool on ); void setLock( bool on );
@ -72,8 +72,8 @@ public:
DM() {} DM() {}
bool canShutdown() { return false; } bool canShutdown() { return false; }
void shutdown( KApplication::ShutdownType shutdownType, void shutdown( TDEApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, TDEApplication::ShutdownMode shutdownMode,
const TQString &bootOption = TQString::null ) {} const TQString &bootOption = TQString::null ) {}
void setLock( bool ) {} void setLock( bool ) {}

2
tqt3integration/libqtkde/qtkde.cpp
Unescape View File

@ -87,7 +87,7 @@ static DCOPClient* dcopClient()
assert( tqApp != NULL ); // TODO assert( tqApp != NULL ); // TODO
prepared = true; prepared = true;
dcop->bindToApp(); dcop->bindToApp();
if( !tqApp->inherits( "KApplication" )) // KApp takes care of input blocking if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
{ {
static qtkde_EventLoop* loop = new qtkde_EventLoop; static qtkde_EventLoop* loop = new qtkde_EventLoop;
TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool ))); TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));

6
twin/README
Unescape View File

@ -189,10 +189,10 @@ from Konsole as 'dcop kdesktop KDesktopIface popupExecuteCommand" will lead
to showing the minicli, but the last user activity timestamp gained from events to showing the minicli, but the last user activity timestamp gained from events
sent by X server will be older than user activity timestamp of Konsole, and sent by X server will be older than user activity timestamp of Konsole, and
would normally result in minicli not being active. Therefore, before showing would normally result in minicli not being active. Therefore, before showing
the minicli, kdesktop needs to call KApplication::updateUserTimestamp(). the minicli, kdesktop needs to call TDEApplication::updateUserTimestamp().
However, this shouldn't be done with all DCOP calls. If a DCOP call is not However, this shouldn't be done with all DCOP calls. If a DCOP call is not
a result of direct user action, calling KApplication::updateUserTimestamp() a result of direct user action, calling TDEApplication::updateUserTimestamp()
would lead to focus stealing. For example, let's assume for a moment would lead to focus stealing. For example, let's assume for a moment
that KMail would use this DCOP call in case it detects the modem is not that KMail would use this DCOP call in case it detects the modem is not
connected, allowing to you to start KPPP or whatever tool you use. If KMail connected, allowing to you to start KPPP or whatever tool you use. If KMail
@ -201,6 +201,6 @@ possibly suddenly showing up at every check. Basically, doing the above change
to kdesktop's minicli means that the popupExecuteCommand() DCOP call is only to kdesktop's minicli means that the popupExecuteCommand() DCOP call is only
for user scripting. (TODO write about focus transferring?) for user scripting. (TODO write about focus transferring?)
Simply said, KApplication::updateUserTimestamp() should be called only Simply said, TDEApplication::updateUserTimestamp() should be called only
as a result of user action. Unfortunately, I'm not aware of any universal as a result of user action. Unfortunately, I'm not aware of any universal
way how to handle this, so every case will have to be considered separately. way how to handle this, so every case will have to be considered separately.

2
twin/clients/kwmtheme/cli_installer/main.cpp
Unescape View File

@ -41,7 +41,7 @@ int main(int argc, char **argv)
{ {
TDECmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1"); TDECmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1");
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app(argc, argv); TDEApplication app(argc, argv);
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if(!args->count()){ if(!args->count()){
kdWarning() << "You need to specify the path to a theme config file!" << endl; kdWarning() << "You need to specify the path to a theme config file!" << endl;

8
twin/geometry.cpp
Unescape View File

@ -42,7 +42,7 @@ namespace KWinInternal
void Workspace::desktopResized() void Workspace::desktopResized()
{ {
//printf("Workspace::desktopResized()\n\r"); //printf("Workspace::desktopResized()\n\r");
TQRect geom = KApplication::desktop()->geometry(); TQRect geom = TDEApplication::desktop()->geometry();
NETSize desktop_geometry; NETSize desktop_geometry;
desktop_geometry.width = geom.width(); desktop_geometry.width = geom.width();
desktop_geometry.height = geom.height(); desktop_geometry.height = geom.height();
@ -58,7 +58,7 @@ void Workspace::desktopResized()
void Workspace::kDestopResized() void Workspace::kDestopResized()
{ {
//printf("Workspace::kDesktopResized()\n\r"); //printf("Workspace::kDesktopResized()\n\r");
TQRect geom = KApplication::desktop()->geometry(); TQRect geom = TDEApplication::desktop()->geometry();
NETSize desktop_geometry; NETSize desktop_geometry;
desktop_geometry.width = geom.width(); desktop_geometry.width = geom.width();
desktop_geometry.height = geom.height(); desktop_geometry.height = geom.height();
@ -82,7 +82,7 @@ void Workspace::kDestopResized()
void Workspace::updateClientArea( bool force ) void Workspace::updateClientArea( bool force )
{ {
TQDesktopWidget *desktopwidget = KApplication::desktop(); TQDesktopWidget *desktopwidget = TDEApplication::desktop();
int nscreens = desktopwidget -> numScreens (); int nscreens = desktopwidget -> numScreens ();
// kdDebug () << "screens: " << nscreens << endl; // kdDebug () << "screens: " << nscreens << endl;
TQRect* new_wareas = new TQRect[ numberOfDesktops() + 1 ]; TQRect* new_wareas = new TQRect[ numberOfDesktops() + 1 ];
@ -295,7 +295,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co
TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int desktop ) const TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int desktop ) const
{ {
TQDesktopWidget *desktopwidget = KApplication::desktop(); TQDesktopWidget *desktopwidget = TDEApplication::desktop();
int screen = desktopwidget->screenNumber( p ); int screen = desktopwidget->screenNumber( p );
if( screen < 0 ) if( screen < 0 )
screen = desktopwidget->primaryScreen(); screen = desktopwidget->primaryScreen();

2
twin/kcmtwin/twinrules/main.cpp
Unescape View File

@ -279,7 +279,7 @@ KDE_EXPORT int kdemain( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ), TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ),
I18N_NOOP( "TWin helper utility" ), "1.0" ); I18N_NOOP( "TWin helper utility" ), "1.0" );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
bool id_ok = false; bool id_ok = false;
Window id = args->getOption( "wid" ).toULong( &id_ok ); Window id = args->getOption( "wid" ).toULong( &id_ok );

2
twin/killer/killer.cpp
Unescape View File

@ -49,7 +49,7 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ), TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ),
I18N_NOOP( "TWin helper utility" ), "1.0" ); I18N_NOOP( "TWin helper utility" ), "1.0" );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
TQCString hostname = args->getOption( "hostname" ); TQCString hostname = args->getOption( "hostname" );
bool pid_ok = false; bool pid_ok = false;

2
twin/lib/kcommondecoration.cpp
Unescape View File

@ -803,7 +803,7 @@ void KCommonDecoration::updateWindowShape()
bool tl=true,tr=true,bl=true,br=true; // is there a transparent rounded corner in top-left? etc bool tl=true,tr=true,bl=true,br=true; // is there a transparent rounded corner in top-left? etc
TQDesktopWidget *desktop=KApplication::desktop(); TQDesktopWidget *desktop=TDEApplication::desktop();
// no transparent rounded corners if this window corner lines up with a screen corner // no transparent rounded corners if this window corner lines up with a screen corner
for(int screen=0; screen < desktop->numScreens(); ++screen) for(int screen=0; screen < desktop->numScreens(); ++screen)
{ {

6
twin/main.cpp
Unescape View File

@ -82,7 +82,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
} }
Application::Application( ) Application::Application( )
: KApplication( ), owner( screen_number ) : TDEApplication( ), owner( screen_number )
{ {
#ifdef USE_QT4 #ifdef USE_QT4
// I'm special... // I'm special...
@ -216,7 +216,7 @@ bool Application::x11EventFilter( XEvent *e )
{ {
if ( Workspace::self()->workspaceEvent( e ) ) if ( Workspace::self()->workspaceEvent( e ) )
return TRUE; return TRUE;
return KApplication::x11EventFilter( e ); return TDEApplication::x11EventFilter( e );
} }
static void sighandler(int) static void sighandler(int)
@ -327,7 +327,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN) if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN)
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KWinInternal::Application a; KWinInternal::Application a;
KWinInternal::SessionManaged weAreIndeed; KWinInternal::SessionManaged weAreIndeed;
KWinInternal::SessionSaveDoneHelper helper; KWinInternal::SessionSaveDoneHelper helper;

2
twin/main.h
Unescape View File

@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
namespace KWinInternal namespace KWinInternal
{ {
class Application : public KApplication class Application : public TDEApplication
{ {
Q_OBJECT Q_OBJECT
public: public:

2
twin/resumer/resumer.cpp
Unescape View File

@ -48,7 +48,7 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ), TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ),
I18N_NOOP( "TWin helper utility" ), "1.0" ); I18N_NOOP( "TWin helper utility" ), "1.0" );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
TQCString hostname = args->getOption( "hostname" ); TQCString hostname = args->getOption( "hostname" );
bool pid_ok = false; bool pid_ok = false;

2
twin/rules.cpp
Unescape View File

@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app )
args << "--wid" << TQString::number( c->window()); args << "--wid" << TQString::number( c->window());
if( whole_app ) if( whole_app )
args << "--whole-app"; args << "--whole-app";
KApplication::tdeinitExec( "twin_rules_dialog", args ); TDEApplication::tdeinitExec( "twin_rules_dialog", args );
} }
void Workspace::loadWindowRules() void Workspace::loadWindowRules()

2
twin/tools/decobenchmark/main.cpp
Unescape View File

@ -100,7 +100,7 @@ void DecoBenchApplication::executeTest()
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
TQString style = "keramik"; TQString style = "keramik";
// KApplication app(argc, argv); // TDEApplication app(argc, argv);
KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

2
twin/tools/decobenchmark/main.h
Unescape View File

@ -29,7 +29,7 @@ enum Tests {
RecreationTest RecreationTest
}; };
class DecoBenchApplication : public KApplication class DecoBenchApplication : public TDEApplication
{ {
Q_OBJECT Q_OBJECT
public: public:

4
twin/workspace.cpp
Unescape View File

@ -999,7 +999,7 @@ void Workspace::reconfigure()
void Workspace::slotSettingsChanged(int category) void Workspace::slotSettingsChanged(int category)
{ {
kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl; kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl;
if( category == (int) KApplication::SETTINGS_SHORTCUTS ) if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
readShortcuts(); readShortcuts();
} }
@ -1220,7 +1220,7 @@ TQStringList Workspace::configModules(bool controlCenter)
void Workspace::configureWM() void Workspace::configureWM()
{ {
KApplication::tdeinitExec( "kcmshell", configModules(false) ); TDEApplication::tdeinitExec( "kcmshell", configModules(false) );
} }
/*! /*!

Write Preview
Loading…
Cancel
Save