summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/scalixadmin/main.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /kresources/scalix/scalixadmin/main.cpp
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kresources/scalix/scalixadmin/main.cpp')
-rw-r--r--kresources/scalix/scalixadmin/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp
index b455d963..b317d90d 100644
--- a/kresources/scalix/scalixadmin/main.cpp
+++ b/kresources/scalix/scalixadmin/main.cpp
@@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv )
{
- KAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description,
- KAboutData::License_GPL, "(c) 2007, Tobias Koenig" );
+ TDEAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description,
+ TDEAboutData::License_GPL, "(c) 2007, Tobias Koenig" );
aboutData.addAuthor( "Tobias Koenig",0, "tokoe@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );