TDE
/
piklab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/piklab
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 13 years ago
parent 9ca7b92557
commit b6e3f52ce5
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape Escape View File

@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

4
src/common/global/about.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd
Q_ASSERT( !gui ); Q_ASSERT( !gui );
#else #else
printf("%s: version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION); printf("%s: version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION);
if ( !gui ) KApplication::disableAutoDcopRegistration(); if ( !gui ) TDEApplication::disableAutoDcopRegistration();
#endif #endif
TDECmdLineArgs::init(argc, argv, about); TDECmdLineArgs::init(argc, argv, about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
@ -65,7 +65,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd
(void)new TQCoreApplication(argc, argv); (void)new TQCoreApplication(argc, argv);
# endif # endif
#else #else
(void)new KApplication(gui, gui); (void)new TDEApplication(gui, gui);
#endif #endif
} }

10
src/common/nokde/nokde_kcmdlineargs.cpp
Unescape Escape View File

@ -205,7 +205,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool /*n
win32_slashify(mCwd, PATH_MAX); win32_slashify(mCwd, PATH_MAX);
#endif #endif
// if (!noKApp) // if (!noKApp)
// KApplication::addCmdLineOptions(); // TDEApplication::addCmdLineOptions();
} }
TQString TDECmdLineArgs::cwd() TQString TDECmdLineArgs::cwd()
@ -685,7 +685,7 @@ TDECmdLineArgs::parseAllArgs()
} }
/** /**
* For KApplication only: * For TDEApplication only:
* *
* Return argc * Return argc
*/ */
@ -693,7 +693,7 @@ int *
TDECmdLineArgs::tqt_argc() TDECmdLineArgs::tqt_argc()
{ {
// if (!argsList) // if (!argsList)
// KApplication::addCmdLineOptions(); // Lazy bastards! // TDEApplication::addCmdLineOptions(); // Lazy bastards!
static int tqt_argc = -1; static int tqt_argc = -1;
if( tqt_argc != -1 ) if( tqt_argc != -1 )
@ -716,7 +716,7 @@ TDECmdLineArgs::tqt_argc()
} }
/** /**
* For KApplication only: * For TDEApplication only:
* *
* Return argv * Return argv
*/ */
@ -724,7 +724,7 @@ char ***
TDECmdLineArgs::tqt_argv() TDECmdLineArgs::tqt_argv()
{ {
// if (!argsList) // if (!argsList)
// KApplication::addCmdLineOptions(); // Lazy bastards! // TDEApplication::addCmdLineOptions(); // Lazy bastards!
static char** tqt_argv; static char** tqt_argv;
if( tqt_argv != NULL ) if( tqt_argv != NULL )

20
src/common/nokde/nokde_kcmdlineargs.h
Unescape Escape View File

@ -79,7 +79,7 @@ struct TDECORE_EXPORT KCmdLineOptions
#define KCmdLineLastOption { 0, 0, 0 } #define KCmdLineLastOption { 0, 0, 0 }
class TDECmdLineArgsList; class TDECmdLineArgsList;
class KApplication; class TDEApplication;
class KUniqueApplication; class KUniqueApplication;
class KCmdLineParsedOptions; class KCmdLineParsedOptions;
class KCmdLineParsedArgs; class KCmdLineParsedArgs;
@ -118,7 +118,7 @@ class TDECmdLineArgsPrivate;
* .... * ....
* *
* // Handle our own options/arguments * // Handle our own options/arguments
* // A KApplication will usually do this in main but this is not * // A TDEApplication will usually do this in main but this is not
* // necessary. * // necessary.
* // A KUniqueApplication might want to handle it in newInstance(). * // A KUniqueApplication might want to handle it in newInstance().
* *
@ -232,7 +232,7 @@ class TDECmdLineArgsPrivate;
*/ */
class TDECORE_EXPORT TDECmdLineArgs class TDECORE_EXPORT TDECmdLineArgs
{ {
friend class KApplication; friend class TDEApplication;
friend class KUniqueApplication; friend class KUniqueApplication;
friend class TQPtrList<TDECmdLineArgs>; friend class TQPtrList<TDECmdLineArgs>;
public: public:
@ -253,7 +253,7 @@ public:
* @param _description A short description of what your application is about. * @param _description A short description of what your application is about.
* @param _version A version. * @param _version A version.
* @param noKApp Set this true to not add commandline options for * @param noKApp Set this true to not add commandline options for
* TQApplication / KApplication * TQApplication / TDEApplication
* *
* @since 3.2 * @since 3.2
*/ */
@ -281,7 +281,7 @@ public:
* @param _argv As passed to @p main(...). * @param _argv As passed to @p main(...).
* @param about A KAboutData object describing your program. * @param about A KAboutData object describing your program.
* @param noKApp Set this true to not add commandline options for * @param noKApp Set this true to not add commandline options for
* TQApplication / KApplication * TQApplication / TDEApplication
*/ */
static void init(int _argc, char **_argv, static void init(int _argc, char **_argv,
const KAboutData *about, bool noKApp = false); const KAboutData *about, bool noKApp = false);
@ -533,8 +533,8 @@ public:
/** /**
* Reset all option definitions, i.e. cancel all addCmdLineOptions calls. * Reset all option definitions, i.e. cancel all addCmdLineOptions calls.
* Note that KApplication's options are removed too, you might want to * Note that TDEApplication's options are removed too, you might want to
* call KApplication::addCmdLineOptions if you want them back. * call TDEApplication::addCmdLineOptions if you want them back.
* *
* You usually don't want to call this method. * You usually don't want to call this method.
*/ */
@ -593,14 +593,14 @@ private:
static void parseAllArgs(); static void parseAllArgs();
/** /**
* @internal for KApplication only: * @internal for TDEApplication only:
* *
* Return argc * Return argc
*/ */
static int *tqt_argc(); static int *tqt_argc();
/** /**
* @internal for KApplication only: * @internal for TDEApplication only:
* *
* Return argv * Return argv
*/ */
@ -659,7 +659,7 @@ private:
void load( TQDataStream &); void load( TQDataStream &);
/** /**
* @internal for KApplication only * @internal for TDEApplication only
* *
* Initialize class. * Initialize class.
* *

2
src/libgui/toplevel.cpp
Unescape Escape View File

@ -674,7 +674,7 @@ void MainWindow::updateGUI()
if ( Main::project() ) caption += " - "; if ( Main::project() ) caption += " - ";
caption += Main::currentEditor()->url().filepath(); caption += Main::currentEditor()->url().filepath();
} }
setCaption(KApplication::kApplication()->makeStdCaption(caption)); setCaption(TDEApplication::kApplication()->makeStdCaption(caption));
emit stateChanged(); emit stateChanged();
} }

Write Preview
Loading…
Cancel
Save