diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:08 -0600 |
| commit | d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch) | |
| tree | 56a87e6a48bdf5e310958f1943a834e59eddbba1 /kresources/scalix | |
| parent | 32b66c9ae78f439199a6d281cc33218e57c5106d (diff) | |
| download | tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kresources/scalix')
| -rw-r--r-- | kresources/scalix/kioslave/scalix.cpp | 4 | ||||
| -rw-r--r-- | kresources/scalix/scalixadmin/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 208fd3523..52384afad 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -49,11 +49,11 @@ static const KCmdLineOptions options[] = int kdemain( int argc, char **argv ) { putenv( strdup( "SESSION_MANAGER=" ) ); - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); Scalix slave( args->arg( 0 ), args->arg( 1 ), args->arg( 2 ) ); diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp index 133da8ec7..b455d963d 100644 --- a/kresources/scalix/scalixadmin/main.cpp +++ b/kresources/scalix/scalixadmin/main.cpp @@ -40,7 +40,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue( "scalixadmin" ); |