aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2010-05-14 16:24:58 +0000
committerGravatar Fabio Bas2010-05-14 16:24:58 +0000
commitb2493283c498f9ea022f21920ca026bd05766f17 (patch)
tree5ffb7f524ca8391bad4c83120c998bdb48e4e88b /src
parentmisc format string fixed (regression introduced in r4317) (diff)
downloadKVIrc-b2493283c498f9ea022f21920ca026bd05766f17.tar.gz
KVIrc-b2493283c498f9ea022f21920ca026bd05766f17.tar.bz2
KVIrc-b2493283c498f9ea022f21920ca026bd05766f17.zip
last round of misc fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4323 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kernel/kvi_ircurl.cpp2
-rw-r--r--src/modules/options/optw_messages.cpp3
-rw-r--r--src/modules/setup/setupwizard.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 67fa8c475..2018af1be 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -311,7 +311,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
szCommand.append(szJoinCommand);
szCommand.append("\" ");
}
- szCommand.append(QString("%1 %2 ").arg(parts.szHost).arg(parts.iPort);
+ szCommand.append(QString("%1 %2 ").arg(parts.szHost).arg(parts.iPort));
if(pConsole->connection()) {
KviServer* server = pConsole->connection()->target()->server();
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index fbba2bb58..477d5ef76 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -606,7 +606,8 @@ void KviMessageColorsOptionsWidget::load()
//qDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr());
//qDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr()));
//qDebug("ERRNO (%d)",errno);
- int dummy = symlink(szGlobal.toLocal8Bit().data(),szLocal.toLocal8Bit().data());
+ int dummy; // make gcc happy
+ dummy = symlink(szGlobal.toLocal8Bit().data(),szLocal.toLocal8Bit().data());
// FIXME: Do it also on windows...
#endif
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index f61b3b557..c81ca4799 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -1026,7 +1026,8 @@ void KviSetupWizard::accept()
// Make local->global link
QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir);
unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data());
- int dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),QTextCodec::codecForLocale()->fromUnicode(localPath).data());
+ int dummy; // make gcc happy
+ dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),QTextCodec::codecForLocale()->fromUnicode(localPath).data());
#endif
#ifdef COMPILE_KDE_SUPPORT