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

Rename KStartup for enhanced compatibility with KDE4

Browse Source
pull/21/head
Timothy Pearson 12 years ago
parent f2225fc1f9
commit 339bb51ad3
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
kaddressbook/main.cpp
Unescape View File

@ -72,7 +72,7 @@ int KAddressBookApp::newInstance()
mMainWin->hide(); mMainWin->hide();
} }
// otherwise, leave the window like it is (hidden or shown) // otherwise, leave the window like it is (hidden or shown)
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
} else { } else {
TQString file; TQString file;
if ( args->isSet( "document" ) ) { if ( args->isSet( "document" ) ) {
@ -101,7 +101,7 @@ int KAddressBookApp::newInstance()
static bool firstInstance = true; static bool firstInstance = true;
if ( !firstInstance ) if ( !firstInstance )
KStartupInfo::setNewStartupId( mMainWin, kapp->startupId() ); TDEStartupInfo::setNewStartupId( mMainWin, kapp->startupId() );
firstInstance = false; firstInstance = false;
#endif #endif

2
kalarm/kalarmd/admain.cpp
Unescape View File

@ -50,7 +50,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();
KStartupInfo::disableAutoAppStartedSending(); TDEStartupInfo::disableAutoAppStartedSending();
if (!AlarmDaemonApp::start()) if (!AlarmDaemonApp::start())
exit(0); exit(0);

8
kmail/kmkernel.cpp
Unescape View File

@ -376,7 +376,7 @@ void KMKernel::openReader( bool onlyCheck )
// Activate window - doing this instead of KWin::activateWindow(mWin->winId()); // Activate window - doing this instead of KWin::activateWindow(mWin->winId());
// so that it also works when called from KMailApplication::newInstance() // so that it also works when called from KMailApplication::newInstance()
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
KStartupInfo::setNewStartupId( mWin, kapp->startupId() ); TDEStartupInfo::setNewStartupId( mWin, kapp->startupId() );
#endif #endif
} }
} }
@ -446,7 +446,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
// Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
// so that it also works when called from KMailApplication::newInstance() // so that it also works when called from KMailApplication::newInstance()
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
KStartupInfo::setNewStartupId( cWin, kapp->startupId() ); TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
#endif #endif
} }
return 1; return 1;
@ -593,7 +593,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
// Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
// so that it also works when called from KMailApplication::newInstance() // so that it also works when called from KMailApplication::newInstance()
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
KStartupInfo::setNewStartupId( cWin, kapp->startupId() ); TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
#endif #endif
} else { } else {
cWin->setAutoDeleteWindow( true ); cWin->setAutoDeleteWindow( true );
@ -639,7 +639,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc,
// Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
// so that it also works when called from KMailApplication::newInstance() // so that it also works when called from KMailApplication::newInstance()
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
KStartupInfo::setNewStartupId( cWin, kapp->startupId() ); TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
#endif #endif
} }

2
kontact/interfaces/uniqueapphandler.cpp
Unescape View File

@ -82,7 +82,7 @@ int UniqueAppHandler::newInstance()
if ( kapp->mainWidget() ) { if ( kapp->mainWidget() ) {
kapp->mainWidget()->show(); kapp->mainWidget()->show();
KWin::forceActiveWindow( kapp->mainWidget()->winId() ); KWin::forceActiveWindow( kapp->mainWidget()->winId() );
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
} }
// Then ensure the part appears in kontact // Then ensure the part appears in kontact

2
kontact/plugins/korganizer/korg_uniqueapp.cpp
Unescape View File

@ -45,7 +45,7 @@ int KOrganizerUniqueAppHandler::newInstance()
if ( kapp->mainWidget() ) { if ( kapp->mainWidget() ) {
kapp->mainWidget()->show(); kapp->mainWidget()->show();
KWin::forceActiveWindow( kapp->mainWidget()->winId() ); KWin::forceActiveWindow( kapp->mainWidget()->winId() );
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
} }
// Then ensure the part appears in kontact. // Then ensure the part appears in kontact.

2
korganizer/koapp.cpp
Unescape View File

@ -150,7 +150,7 @@ void KOrganizerApp::processCalendar( const KURL &url )
// Handle window activation // Handle window activation
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() ); TDEStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() );
#endif #endif
} }

Write Preview
Loading…
Cancel
Save