summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2021-07-28 11:27:07 +0900
committerMichele Calgaro <[email protected]>2021-07-28 11:27:07 +0900
commitb990faf1751073b8541642745f1fb379ed215b2c (patch)
tree414c6407e147a0b00bf750241748b4adeaf90837
parentde9c4613fd8d101c4c0ebc950795b346ae8b342b (diff)
downloadkvirc-b990faf1751073b8541642745f1fb379ed215b2c.tar.gz
kvirc-b990faf1751073b8541642745f1fb379ed215b2c.zip
Fixed FTBFS with clang.
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--acinclude.m42
-rw-r--r--admin/acinclude.m4.in2
-rw-r--r--src/kvilib/tal/kvi_tal_application.cpp2
-rw-r--r--src/kvirc/kernel/kvi_app_fs.cpp10
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp4
-rw-r--r--src/modules/editor/scripteditor.cpp2
-rw-r--r--src/modules/editor/scripteditor.h2
7 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 54e46148..a3c8d8b9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2315,7 +2315,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
#include "twin.h"
],[
int a = KWin::currentDesktop();
- TDEApplication app(a,0,"kvirc");
+ TDEApplication app(a,0,TQCString("kvirc"));
],
SS_KQTX_LINKED_OK="TRUE",
SS_KQTX_LINKED_OK="FALSE"
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index ca5bc47b..0c7f0e72 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2315,7 +2315,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
#include "twin.h"
],[
int a = KWin::currentDesktop();
- TDEApplication app(a,0,"kvirc");
+ TDEApplication app(a,0,TQCString("kvirc"));
],
SS_KQTX_LINKED_OK="TRUE",
SS_KQTX_LINKED_OK="FALSE"
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 a07715b6..84b0b85e 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 : tqDebug("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 3bdc6e84..72b58ac6 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 5e6e3c65..f6875265 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);