diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-07-28 11:27:07 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-07-28 11:50:26 +0900 |
commit | 23bc8aedc7168ae9725e3ec64148f5a386718d45 (patch) | |
tree | d5e82954de222df4051b4d11631934aca3449364 /src | |
parent | 262a3bd5d72583a3e724356f1cf0a8c201b68fac (diff) | |
download | kvirc-23bc8aedc7168ae9725e3ec64148f5a386718d45.tar.gz kvirc-23bc8aedc7168ae9725e3ec64148f5a386718d45.zip |
Fixed FTBFS with clang.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b990faf1751073b8541642745f1fb379ed215b2c)
Diffstat (limited to 'src')
-rw-r--r-- | src/kvilib/tal/kvi_tal_application.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_app_fs.cpp | 10 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 4 | ||||
-rw-r--r-- | src/modules/editor/scripteditor.cpp | 2 | ||||
-rw-r--r-- | src/modules/editor/scripteditor.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp index 925af2b8..27942e1f 100644 --- a/src/kvilib/tal/kvi_tal_application.cpp +++ b/src/kvilib/tal/kvi_tal_application.cpp @@ -40,7 +40,7 @@ // to be safely used at this time. We'll rethink this when KDE 4 is out. KviTalApplication::KviTalApplication(int &argc,char ** argv) - : TDEApplication(argc,argv,"kvirc") + : TDEApplication(argc,argv,TQCString("kvirc")) { diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index ce2208dc..ec4ff77f 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -94,7 +94,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt case Tmp : debug("WARNING Global tmp directory requested!"); break; case Themes : szData.append("themes"); break; case Classes : szData.append("classes"); break; - case SmallIcons : szData.append("pics"KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; + case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; } if(!appendFile.isEmpty()) @@ -117,8 +117,8 @@ void KviApp::getLocalKvircDirectory(TQString &szData,KvircSubdir dir,const TQStr case Pics : szData.append("pics"); break; case EasyPlugins : szData.append("easyplugins"); break; case Config : szData.append("config"); break; - case ConfigPlugins : szData.append("config"KVI_PATH_SEPARATOR"modules"); break; - case ConfigScripts : szData.append("config"KVI_PATH_SEPARATOR"scripts"); break; + case ConfigPlugins : szData.append("config" KVI_PATH_SEPARATOR"modules"); break; + case ConfigScripts : szData.append("config" KVI_PATH_SEPARATOR"scripts"); break; case Log : szData.append("log"); break; case Incoming : szData = KVI_OPTION_STRING(KviOption_stringIncomingPath); @@ -150,7 +150,7 @@ void KviApp::getLocalKvircDirectory(TQString &szData,KvircSubdir dir,const TQStr } } break; - case HelpEN : szData.append("help"KVI_PATH_SEPARATOR"en"); break; + case HelpEN : szData.append("help" KVI_PATH_SEPARATOR "en"); break; case HelpNoIntl : szData.append("help"); break; case Audio : szData.append("audio"); break; case Scripts : szData.append("scripts"); break; @@ -167,7 +167,7 @@ void KviApp::getLocalKvircDirectory(TQString &szData,KvircSubdir dir,const TQStr case Themes : szData.append("themes"); break; case DefScript : szData.append("defscript"); /* should never happen! */ break; case Classes : szData.append("classes"); break; - case SmallIcons : szData.append("pics"KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; + case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; } if(bCreateIfNeeded)KviFileUtils::makeDir(szData); diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index ccbbe815..ae50a2b4 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -80,11 +80,11 @@ bool KviApp::checkGlobalKvircDirectory(const TQString dir) { //First check if the help subdir exists TQString szDir2 = dir; - szDir2+=KVI_PATH_SEPARATOR"help"; + szDir2+=KVI_PATH_SEPARATOR "help"; if(!KviFileUtils::directoryExists(szDir2))return false; //Then check if the pics subdir exists TQString szDir = dir; - szDir+=KVI_PATH_SEPARATOR"pics"; + szDir+=KVI_PATH_SEPARATOR "pics"; if(!KviFileUtils::directoryExists(szDir))return false; //Now make sure that it is the dir that we're looking for. //Check for an image file that we need. diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 9d704ec7..3150055b 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -74,7 +74,7 @@ static TQColor g_clrFind(0,0,0); static TQFont g_fntNormal("Courier New",8); -KviCompletionBox::KviCompletionBox(TQWidget * parent = 0) +KviCompletionBox::KviCompletionBox(TQWidget * parent) : KviTalListBox(parent) { setPaletteForegroundColor(TQColor(0,0,0)); diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index f7ff0b37..50602ecf 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -47,7 +47,7 @@ class KviCompletionBox: public KviTalListBox Q_OBJECT public: - KviCompletionBox(TQWidget * parent); + KviCompletionBox(TQWidget * parent = 0); ~KviCompletionBox(){}; void updateContents(TQString word); |