diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/kuniqueapplication.h | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kuniqueapplication.h')
| -rw-r--r-- | tdecore/kuniqueapplication.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h index eaa79dc57..ede89ef19 100644 --- a/tdecore/kuniqueapplication.h +++ b/tdecore/kuniqueapplication.h @@ -113,7 +113,7 @@ public: * Typically this is used like: * \code * int main(int argc, char **argv) { - * KAboutData about("myappname", "myAppName", .....); + * TDEAboutData about("myappname", "myAppName", .....); * TDECmdLineArgs::init(argc, argv, &about); * TDECmdLineArgs::addCmdLineOptions( myCmdOptions ); * KUniqueApplication::addCmdLineOptions(); @@ -204,7 +204,7 @@ private slots: void newInstanceNoFork(); - static KInstance* initHack( bool configUnique ); + static TDEInstance* initHack( bool configUnique ); private: static bool s_nofork; |