aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar IceN9ne2018-11-27 19:40:08 -0500
committerGravatar IceN9ne2018-11-27 19:40:08 -0500
commit4dff175cd8880adccabd2b2e95911cd20acccf74 (patch)
treea6cf661b5437af43abce0176bd33448865c2b345
parentRemove the keyword register from the code. (diff)
downloadKVIrc-4dff175cd8880adccabd2b2e95911cd20acccf74.tar.gz
KVIrc-4dff175cd8880adccabd2b2e95911cd20acccf74.tar.bz2
KVIrc-4dff175cd8880adccabd2b2e95911cd20acccf74.zip
Fix compiler warnings in the code.
-rw-r--r--src/kvirc/kernel/KviIconManager.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionServerInfo.cpp3
-rw-r--r--src/kvirc/kvs/object/KviKvsObject.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp2
-rw-r--r--src/kvirc/ui/KviIrcToolBar.cpp18
-rw-r--r--src/kvirc/ui/KviWindow.cpp2
-rw-r--r--src/modules/codetester/CodeTesterWindow.cpp1
-rw-r--r--src/modules/objects/KvsObject_socket.cpp2
-rw-r--r--src/modules/objects/KvsObject_sql.cpp2
-rw-r--r--src/modules/options/OptionsWidget_interfaceFeatures.cpp2
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp2
-rw-r--r--src/modules/options/OptionsWidget_windowList.cpp2
-rw-r--r--src/modules/raweditor/RawEditorWindow.cpp8
13 files changed, 17 insertions, 31 deletions
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index e0fbafcbf..da2489418 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -1966,7 +1966,7 @@ QPixmap * KviIconManager::loadSmallIcon(int iIdx)
}
#ifdef __GNUC__
-#warning IMPLEMENT CLEANUP
+//#warning IMPLEMENT CLEANUP
#endif
/*
void KviIconManager::cacheCleanup()
diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
index 3180e6bd3..1d03ee478 100644
--- a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
@@ -277,8 +277,7 @@ void KviIrcConnectionServerInfo::setServerVersion(const QString & version)
}
KviBasicIrcServerInfo::KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParent, QString version)
- : m_pParent(pParent)
- , m_szServerVersion(std::move(version))
+ : m_szServerVersion(std::move(version)), m_pParent(pParent)
{
}
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index 1dc4053da..aca8163aa 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -634,7 +634,7 @@
static char * g_hNextObjectHandle = (char *)nullptr;
KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName)
- : QObject(pParent), m_pClass{pClass}, m_szName{szName}
+ : QObject(pParent), m_szName{szName}, m_pClass{pClass}
{
setObjectName(szName);
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index d71d4a7d0..aa1363f53 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -2022,7 +2022,6 @@ void KviIrcServerParser::parseChannelMode(const QString & szNick, const QString
{
bool bSet = true;
- bool bIsMultiMode = false;
bool bIsMultiSingleMode = false;
bool bShowAsCompact = false;
@@ -2086,7 +2085,6 @@ void KviIrcServerParser::parseChannelMode(const QString & szNick, const QString
if(iTotModes > 1)
{
- bIsMultiMode = true;
bShowAsCompact = KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges);
if(iSingleModes == 1)
diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index 567aabd31..4ebc90a3e 100644
--- a/src/kvirc/ui/KviIrcToolBar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -339,7 +339,6 @@ void KviIrcContextDisplay::drawContents(QPainter * p)
if(c)
{
QString serv, nick;
- QString tmp;
if(!c->connection())
{
serv = __tr2qs("Not connected");
@@ -358,21 +357,12 @@ void KviIrcContextDisplay::drawContents(QPainter * p)
else if(ic->userInfo()->userMode().isEmpty())
nick += ic->currentNickName();
- if(ic->userInfo()->isAway())
- {
- nick += space + sprtr + space;
- nick += __tr2qs("is away");
- }
-
- else
+ if(ic->userInfo()->isAway())
{
- if(ic->userInfo()->isAway())
- {
- nick += space;
- nick += __tr2qs("is away");
- nick += space + sprtr;
- }
+ nick += space + sprtr + space;
+ nick += __tr2qs("is away");
}
+
serv = __tr2qs("Using server");
serv += cln + space;
serv += ic->currentServerName();
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index 8c8ad786a..1f46c24b6 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -223,6 +223,8 @@ void KviWindow::demandAttention()
FlashWindowEx(&fwi);
#elif defined(COMPILE_KDE_SUPPORT)
KWindowSystem::demandAttention(windowId, true);
+#else
+ Q_UNUSED(windowId)
#endif
}
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index 91a95a193..951553b2c 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -89,7 +89,6 @@ void CodeTesterWindow::execute()
{
QString buffer;
m_pEditor->getText(buffer);
- KviConsoleWindow * pConsole = g_pApp->activeConsole();
QStringList slParams = m_pParams->text().split(';');
KviKvsVariantList params{&slParams};
KviKvsScript::run(buffer, this, &params);
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index d53fda4ff..ba47de24d 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -408,7 +408,7 @@ KVSO_CLASS_FUNCTION(socket, read)
// convert NULLS to char 255
char * buffer = (char *)KviMemory::allocate(iLen);
m_pSocket->read(buffer, iLen);
- for(size_t i{}; i < iLen; i++)
+ for(int i{}; i < iLen; i++)
{
if(!buffer[i])
buffer[i] = (char)(255);
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index 3c71eeb2d..a4c036546 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -482,7 +482,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
else
pValue = new KviKvsVariant(QString());
pHash->set(record.fieldName(i), pValue);
- KviKvsVariant * value2 = pHash->get(record.fieldName(i));
+ (void)pHash->get(record.fieldName(i));
}
c->returnValue()->setHash(pHash);
return true;
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index 100d2627e..27e04300b 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -40,8 +40,6 @@ OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * paren
setObjectName("interfacefeatures_options_widget");
createLayout();
- KviTalGroupBox * g;
-
addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Minimize application on startup", "options"), KviOption_boolStartupMinimized);
addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Confirm quit with active connections", "options"), KviOption_boolConfirmCloseWhenThereAreConnections);
addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Remember window properties", "options"), KviOption_boolWindowsRememberProperties);
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 9b1fd86a7..3e93b93c3 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -2085,7 +2085,7 @@ void OptionsWidget_servers::updateFavoritesFilter(bool bSet)
{
m_bShowingFavoritesOnly = bSet;
IrcServerOptionsTreeWidgetItem * network;
- for(unsigned i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
+ for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
{
network = static_cast<IrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(i));
uint uServers = 0;
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index c38d1163e..9842e7ac5 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -36,7 +36,7 @@ OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent)
createLayout();
KviTalHBox * hbox = new KviTalHBox(this);
- QLabel * l = new QLabel(__tr2qs_ctx("Window list type:", "options"), hbox);
+ (void)new QLabel(__tr2qs_ctx("Window list type:", "options"), hbox);
m_pWindowListType = new QComboBox(hbox);
m_pWindowListType->addItem(__tr2qs_ctx("Tree", "options"));
m_pWindowListType->addItem(__tr2qs_ctx("Classic", "options"));
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 53364371a..c9aedb643 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -153,11 +153,11 @@ void RawEditorWidget::customContextMenuRequested(const QPoint & pos)
m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::HandlerDisabled)),
__tr2qs_ctx("&Disable Handler", "editor"), this, SLOT(toggleCurrentHandlerEnabled()));
- m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
- __tr2qs_ctx("Re&move Handler", "editor"), this, SLOT(removeCurrentHandler()));
+ m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
+ __tr2qs_ctx("Re&move Handler", "editor"), this, SLOT(removeCurrentHandler()));
- m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Save)),
- __tr2qs_ctx("&Export Handler to...", "editor"), this, SLOT(exportCurrentHandler()));
+ m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Save)),
+ __tr2qs_ctx("&Export Handler to...", "editor"), this, SLOT(exportCurrentHandler()));
}
else
{