Remove unused/useless code

diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index 8a0d60519f2bc20f64b9d12f24b3f6ff4e57ef63..d7ecb4dd3be2d30b61817557b81df25dd5827b24 100644 (file)
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -247,8 +247,6 @@ namespace KviFileUtils
                if(!f.open(QFile::WriteOnly | (bAppend ? QFile::Append : QFile::Truncate)))
                        return false;
                QByteArray szTmp = szData.toUtf8();
-               if(!szTmp.data())
-                       return true;
                if(f.write(szTmp.data(), szTmp.length()) != ((unsigned int)(szTmp.length())))
                        return false;
                return true;
@@ -266,8 +264,6 @@ namespace KviFileUtils
                if(!f.open(QFile::WriteOnly | (bAppend ? QFile::Append : QFile::Truncate)))
                        return false;
                QByteArray szTmp = QTextCodec::codecForLocale()->fromUnicode(szData);
-               if(!szTmp.data())
-                       return true;
                if(f.write(szTmp.data(), szTmp.length()) != ((unsigned int)(szTmp.length())))
                        return false;
                return true;

diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index cc0a49dc6076369c36a8153077eab86ada87da03..8cddfc62a614e89cb23073b5a38f3de5e4c06646 100644 (file)
--- a/src/kvirc/kernel/KviIrcConnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -1509,11 +1509,6 @@ void KviIrcConnection::loginToIrcServer()
        QByteArray szReal = encodeText(m_pUserInfo->realName()); // may be empty
        QByteArray szPass = encodeText(m_pUserInfo->password()); // may be empty
 
-       if(!szReal.data())
-               szReal = "";
-       if(!szPass.data())
-               szPass = "";
-
        if(!_OUTPUT_MUTE)
                m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Logging in as %Q!%Q :%Q"),
                    &(m_pUserInfo->nickName()), &(m_pUserInfo->userName()), &(m_pUserInfo->realName()));

diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
index 8c9c525cbade6691d186d2d4950338d980dd9d23..0603648d7a4bdabdeac213d63196a9570ca31c36 100644 (file)
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
@@ -236,8 +236,6 @@ namespace KviKvsCoreSimpleCommands
                KVSCSC_REQUIRE_CONNECTION
 
                QByteArray szData = KVSCSC_pConnection->encodeText(szNick);
-               if(!szData.data())
-                       szData = "";
 
                if(!KVSCSC_pConnection->sendFmtData("NICK %s", szData.data()))
                        return KVSCSC_pContext->warningNoIrcConnection();
@@ -288,10 +286,6 @@ namespace KviKvsCoreSimpleCommands
 
                QByteArray szT = KVSCSC_pConnection->encodeText(szTarget);
                QByteArray szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText);
-               if(!szT.data())
-                       szT = ""; // encoding problems ?
-               if(!szD.data())
-                       szD = ""; // encoding problems ?
 
                if(!(KVSCSC_pConnection->sendFmtData("NOTICE %s :%s", szT.data(), szD.data())))
                        return KVSCSC_pContext->warningNoIrcConnection();
@@ -1266,8 +1260,6 @@ namespace KviKvsCoreSimpleCommands
                KVSCSC_REQUIRE_CONNECTION
 
                QByteArray szData = KVSCSC_pConnection->encodeText(szRawCommand);
-               if(!szData.data())
-                       szData = "";
 
                if(!KVSCSC_pConnection->sendData(szData.data()))
                        return KVSCSC_pContext->warningNoIrcConnection();

diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
index a67932cba636fb41aeeb91ab107772a0cb84a70b..af589c1fdc0885bf16e35a13d979dc92ef2f5695 100644 (file)
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
@@ -88,8 +88,6 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c)
                                goto no_way_to_send_as_raw;
 
                        szData = c->window()->connection()->encodeText(szAll);
-                       if(!szData.data())
-                               szData = "";
 
                        if(!c->window()->connection()->sendData(szData.data()))
                                goto no_way_to_send_as_raw;

diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index b02355fa8e570b2e6f276967c5d4cb903a29b313..8c981263009263fc5d1549aee9bfcef1e5967df1 100644 (file)
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -535,7 +535,6 @@ void KviIrcServerParser::parseNumericNames(KviIrcMessage * msg)
                                    mask.hasUser() ? mask.user() : QString(),
                                    mask.hasHost() ? mask.host() : QString(),
                                    iFlags);
-                       *aux = ' ';
                        *aux = save;
                        // run to the next nick (or the end)
                        while((*aux) && (*aux == ' '))

diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index 7fd68c24078f119ef9d9cc157a6c544cc9c1c400..373cee87717f8953391ec609e114575ae365f260 100644 (file)
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -483,7 +483,6 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
                        pValue = new KviKvsVariant(QString());
                pHash->set(record.fieldName(i), pValue);
                KviKvsVariant * value2 = pHash->get(record.fieldName(i));
-               value2->type();
        }
        c->returnValue()->setHash(pHash);
        return true;