From 88ea2c636db2bebed82155198f8710617686d6ec Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q* This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-qtcurve@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- common/common.h | 4 ++-- common/config_file.c | 4 ++-- style/qtcurve.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/common.h b/common/common.h index e7b1974..a5fb2fc 100644 --- a/common/common.h +++ b/common/common.h @@ -456,8 +456,8 @@ typedef enum #endif #if defined CONFIG_DIALOG || ( (0x039999 >= 0x040000)) -#define TQTCURVE_PREVIEW_CONFIG "TQTCURVE_PREVIEW_CONFIG" -#define TQTCURVE_PREVIEW_CONFIG_FULL "TQTCURVE_PREVIEW_CONFIG_FULL" +#define TQTCURVE_PREVIEW_CONFIG "QTCURVE_PREVIEW_CONFIG" +#define TQTCURVE_PREVIEW_CONFIG_FULL "QTCURVE_PREVIEW_CONFIG_FULL" typedef enum { diff --git a/common/config_file.c b/common/config_file.c index a144ae6..126838f 100644 --- a/common/config_file.c +++ b/common/config_file.c @@ -1599,7 +1599,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts) #ifdef __cplusplus if(file.isEmpty()) { - const char *env=getenv("TQTCURVE_CONFIG_FILE"); + const char *env=getenv("QTCURVE_CONFIG_FILE"); if(NULL!=env) return readConfig(env, opts, defOpts); @@ -1620,7 +1620,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts) #else if(!file) { - const char *env=getenv("TQTCURVE_CONFIG_FILE"); + const char *env=getenv("QTCURVE_CONFIG_FILE"); if(NULL!=env) return readConfig(env, opts, defOpts); diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp index 91eaa24..6661d3b 100644 --- a/style/qtcurve.cpp +++ b/style/qtcurve.cpp @@ -1155,7 +1155,7 @@ void TQtCurveStyle::polish(TQApplication *app) { TQString appName(getFile(app->argv()[0])); - if(NULL!=getenv("TQTCURVE_DEBUG")) + if(NULL!=getenv("QTCURVE_DEBUG")) std::cout << "TQtCurve: Application name: \"" << appName.latin1() << "\"\n"; if ("kicker"==appName || "appletproxy"==appName) -- cgit v1.2.3