Fixed FTBFS with clang.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 1 year ago
parent de9c4613fd
commit b990faf175
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 2
      acinclude.m4
  2. 2
      admin/acinclude.m4.in
  3. 2
      src/kvilib/tal/kvi_tal_application.cpp
  4. 10
      src/kvirc/kernel/kvi_app_fs.cpp
  5. 4
      src/kvirc/kernel/kvi_app_setup.cpp
  6. 2
      src/modules/editor/scripteditor.cpp
  7. 2
      src/modules/editor/scripteditor.h

@ -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"

@ -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"

@ -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"))
{

@ -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);

@ -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.

@ -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));

@ -47,7 +47,7 @@ class KviCompletionBox: public KviTalListBox
Q_OBJECT
public:
KviCompletionBox(TQWidget * parent);
KviCompletionBox(TQWidget * parent = 0);
~KviCompletionBox(){};
void updateContents(TQString word);

Loading…
Cancel
Save