diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
| commit | 8856e75c203aa69be210b2fee1095ab9761aca7e (patch) | |
| tree | d59810016bc093e8dd7f2f886f07c45fa25447a5 /superkaramba | |
| parent | ed70cd1b539ac2e02319b55183a5be7a28f2d116 (diff) | |
| download | tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba')
| -rw-r--r-- | superkaramba/src/karambaapp.cpp | 2 | ||||
| -rw-r--r-- | superkaramba/src/karambaapp.h | 4 | ||||
| -rw-r--r-- | superkaramba/src/main.cpp | 4 | ||||
| -rw-r--r-- | superkaramba/src/taskbartest.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index f8b2c1b..cd2e77c 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -126,7 +126,7 @@ void KarambaApplication::checkSuperKarambaDir() } } -void KarambaApplication::setUpSysTray(KAboutData* about) +void KarambaApplication::setUpSysTray(TDEAboutData* about) { //kdDebug() << k_funcinfo << endl; KAction* action; diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h index 30f40e6..d4470aa 100644 --- a/superkaramba/src/karambaapp.h +++ b/superkaramba/src/karambaapp.h @@ -34,7 +34,7 @@ class TDECmdLineArgs; class ThemesDlg; class dcopIface_stub; class KHelpMenu; -class KAboutData; +class TDEAboutData; class KarambaApplication : public TDEApplication { @@ -65,7 +65,7 @@ class KarambaApplication : public TDEApplication TQStringList getKarambas(); bool themeExists(TQString pretty_name); void initDcopStub(TQCString app = ""); - void setUpSysTray(KAboutData* about); + void setUpSysTray(TDEAboutData* about); void checkPreviousSession(TDEApplication &app, TQStringList &lst); void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst); bool startThemes(TQStringList &lst); diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 7b31653..b0055cc 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -89,9 +89,9 @@ int main(int argc, char **argv) #ifdef KARAMBA_LOG tqInstallMsgHandler(karambaMessageOutput); #endif - KAboutData about("superkaramba", I18N_NOOP("SuperKaramba"), + TDEAboutData about("superkaramba", I18N_NOOP("SuperKaramba"), version, description, - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2003-2006 The SuperKaramba developers"); about.addAuthor("Adam Geitgey", 0, "adam@rootnode.org"); about.addAuthor("Hans Karlsson", 0, "karlsson.h@home.se"); diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp index 45f0be2..2c65e2a 100644 --- a/superkaramba/src/taskbartest.cpp +++ b/superkaramba/src/taskbartest.cpp @@ -50,8 +50,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("karamba", I18N_NOOP("karamba"), version, description, - KAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se"); + TDEAboutData about("karamba", I18N_NOOP("karamba"), version, description, + TDEAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se"); about.addAuthor( "Hans Karlsson", 0, "karlsson.h@home.se" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |