diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
| commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
| tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kwin/main.cpp | |
| parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
| download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/main.cpp')
| -rw-r--r-- | kwin/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kwin/main.cpp b/kwin/main.cpp index b24e86712..edceeb6bf 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -96,9 +96,9 @@ Application::Application( ) if (screen_number == -1) screen_number = DefaultScreen(qt_xdisplay()); - if( !owner.claim( args->isSet( "tqreplace" ), true )) + if( !owner.claim( args->isSet( "replace" ), true )) { - fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --tqreplace)\n").local8Bit(), stderr); + fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); @@ -142,7 +142,7 @@ Application::Application( ) Application::~Application() { delete Workspace::self(); - if( owner.ownerWindow() != None ) // if there was no --tqreplace (no new WM) + if( owner.ownerWindow() != None ) // if there was no --replace (no new WM) { XSetInputFocus( qt_xdisplay(), PointerRoot, RevertToPointerRoot, qt_x_time ); DCOPRef ref( "kded", "kded" ); @@ -184,7 +184,7 @@ static const char description[] = I18N_NOOP( "KDE window manager" ); static KCmdLineOptions args[] = { { "lock", I18N_NOOP("Disable configuration options"), 0 }, - { "tqreplace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, + { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, KCmdLineLastOption }; |