|
|
@ -28,7 +28,7 @@
|
|
|
|
#include <dcopclient.h>
|
|
|
|
#include <dcopclient.h>
|
|
|
|
#include <kdebug.h>
|
|
|
|
#include <kdebug.h>
|
|
|
|
#include <tdelocale.h>
|
|
|
|
#include <tdelocale.h>
|
|
|
|
#include <kuniqueapplication.h>
|
|
|
|
#include <tdeuniqueapplication.h>
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
Test plan for the various cases of interaction between standalone apps and kontact:
|
|
|
|
Test plan for the various cases of interaction between standalone apps and kontact:
|
|
|
@ -78,7 +78,7 @@ using namespace Kontact;
|
|
|
|
|
|
|
|
|
|
|
|
int UniqueAppHandler::newInstance()
|
|
|
|
int UniqueAppHandler::newInstance()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// This bit is duplicated from KUniqueApplication::newInstance()
|
|
|
|
// This bit is duplicated from TDEUniqueApplication::newInstance()
|
|
|
|
if ( kapp->mainWidget() ) {
|
|
|
|
if ( kapp->mainWidget() ) {
|
|
|
|
kapp->mainWidget()->show();
|
|
|
|
kapp->mainWidget()->show();
|
|
|
|
KWin::forceActiveWindow( kapp->mainWidget()->winId() );
|
|
|
|
KWin::forceActiveWindow( kapp->mainWidget()->winId() );
|
|
|
@ -99,7 +99,7 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
|
|
|
|
TDECmdLineArgs::reset(); // forget options defined by other "applications"
|
|
|
|
TDECmdLineArgs::reset(); // forget options defined by other "applications"
|
|
|
|
loadCommandLineOptions(); // implemented by plugin
|
|
|
|
loadCommandLineOptions(); // implemented by plugin
|
|
|
|
|
|
|
|
|
|
|
|
// This bit is duplicated from KUniqueApplication::processDelayed()
|
|
|
|
// This bit is duplicated from TDEUniqueApplication::processDelayed()
|
|
|
|
TQDataStream ds( data, IO_ReadOnly );
|
|
|
|
TQDataStream ds( data, IO_ReadOnly );
|
|
|
|
TDECmdLineArgs::loadAppArgs( ds );
|
|
|
|
TDECmdLineArgs::loadAppArgs( ds );
|
|
|
|
if ( !ds.atEnd() ) { // backwards compatibility
|
|
|
|
if ( !ds.atEnd() ) { // backwards compatibility
|
|
|
@ -196,7 +196,7 @@ static TDECmdLineOptions options[] =
|
|
|
|
void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
|
|
|
|
void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TDECmdLineArgs::addCmdLineOptions( options );
|
|
|
|
TDECmdLineArgs::addCmdLineOptions( options );
|
|
|
|
KUniqueApplication::addCmdLineOptions();
|
|
|
|
TDEUniqueApplication::addCmdLineOptions();
|
|
|
|
TDEApplication::addCmdLineOptions();
|
|
|
|
TDEApplication::addCmdLineOptions();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|