diff options
Diffstat (limited to 'src')
43 files changed, 118 insertions, 178 deletions
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp index d9edcdc2b..6d2c93c40 100644 --- a/src/kvilib/irc/kvi_useridentity.cpp +++ b/src/kvilib/irc/kvi_useridentity.cpp @@ -199,8 +199,7 @@ void KviUserIdentityManager::load(const QString &szFileName) m_szDefaultIdentity = cfg.readEntry("DefaultIdentity",""); KviConfigIterator it(*(cfg.dict())); - KviConfigGroup * grp; - while( (grp = it.current()) ) + while( (it.current()) ) { if(!KviQString::equalCI(it.currentKey(),"KVIrc")) { diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 6b89a9e90..2b8f75e8d 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -1888,7 +1888,6 @@ void KviApp::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsole * pCon void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole) { pMenu->clear(); - int iId; QStringList * pList = recentChannelsForNetwork(pConsole->currentNetworkName()); if(pList) { @@ -1896,7 +1895,7 @@ void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole * pCons { if(*it == "") continue; // ? - iId = pMenu->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),*it); + int iId = pMenu->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),*it); if(!pConsole->isConnected()) pMenu->setItemEnabled(iId,false); else diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 63e804df1..4bc7582d7 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -267,7 +267,7 @@ void KviIrcLink::processData(char * buffer, int iLen) // the disconnect and thus destroying the irc context). // For now we try to rely on the remaining parts to handle correctly // such conditions. Let's see... - if(strlen(cMessageBuffer) > 0) + if(*cMessageBuffer != 0) m_pConnection->incomingMessage(cMessageBuffer); if(m_pSocket->state() != KviIrcSocket::Connected) diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp index 401c1ea7e..f2829c4be 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp @@ -786,13 +786,13 @@ namespace KviKvsCoreFunctions KVSCF(keys) { - KviKvsHash * pHash; + KviKvsHash * pHash = 0; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("hash",KVS_PT_HASH,KVS_PF_OPTIONAL,pHash) KVSCF_PARAMETERS_END KviKvsArray * a = new KviKvsArray(); - + // we have to support an empty hash, returning an empty array (ticket #940) if(pHash) { diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index e70299383..2cfbd474d 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -276,7 +276,7 @@ namespace KviKvsCoreFunctions // prologue: parameter handling QString szClassName; QString szName; - kvs_hobject_t hParent; + kvs_hobject_t hParent = 0; KviKvsVariantList vList; KVSCF_PARAMETERS_BEGIN diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 897e66e66..9a11a35e8 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -322,7 +322,6 @@ namespace KviKvsCoreSimpleCommands kvs_int_t pitch = -1; kvs_int_t duration = -1; - bool bSync = (KVSCSC_pSwitches->find('s',"sync") != 0); KviKvsVariant * pPitch = KVSCSC_pSwitches->find('p',"pitch"); if(pPitch) @@ -351,8 +350,7 @@ namespace KviKvsCoreSimpleCommands #else #ifdef COMPILE_X11_SUPPORT #ifndef COMPILE_NO_X_BELL - - + bool bSync = (KVSCSC_pSwitches->find('s',"sync") != 0); XKeyboardState st; XKeyboardControl ctl; @@ -576,7 +574,7 @@ namespace KviKvsCoreSimpleCommands { return multipleModeCommand(__pContext,__pParams,__pSwitches,'+','a'); } - + /////////////////////////////////////////////////////////////////////////////////////////////////////// /* @@ -727,7 +725,7 @@ namespace KviKvsCoreSimpleCommands } return true; } - + /////////////////////////////////////////////////////////////////////////////////////////////////////// /* @@ -759,7 +757,7 @@ namespace KviKvsCoreSimpleCommands { return multipleModeCommand(__pContext,__pParams,__pSwitches,'-','a'); } - + /////////////////////////////////////////////////////////////////////////////////////////////////////// /* @@ -791,7 +789,7 @@ namespace KviKvsCoreSimpleCommands { return multipleModeCommand(__pContext,__pParams,__pSwitches,'-','q'); } - + /////////////////////////////////////////////////////////////////////////////////////////////////////// /* @@ -983,7 +981,7 @@ namespace KviKvsCoreSimpleCommands { return multipleModeCommand(__pContext,__pParams,__pSwitches,'-','o'); } - + /////////////////////////////////////////////////////////////////////////////////////////////////////// /* diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index c7b5ce998..4bb2e2b35 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -297,7 +297,7 @@ A class is a collection of methods that define an object's behaviour. Hehe... it is not easy to explain it, so I'll try with an example:[br] [b]Please note, that this is pseudo code. KVI++ does by no means employs - a "field" directive as shown below![/b] + a "field" directive as shown below![/b] [example] class HostAddress { @@ -792,7 +792,7 @@ KviKvsObject::~KviKvsObject() // Kill function container if(m_pFunctionHandlers) delete m_pFunctionHandlers; - + // Bye bye :) } @@ -1123,7 +1123,7 @@ bool KviKvsObject::function_killTimer(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) { - bool bArray; + bool bArray = false; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bArray",KVS_PT_BOOL,KVS_PF_OPTIONAL,bArray) KVSO_PARAMETERS_END(c) @@ -1558,11 +1558,11 @@ void KviKvsObject::killAllChildrenWithClass(KviKvsObjectClass *cl) { KviPointerList< QPointer<KviKvsObject> > lDying; lDying.setAutoDelete(true); - + KviKvsObject * pObject; - + QPointer<KviKvsObject> guard(this); - + for(pObject = m_pChildList->first();pObject;pObject = m_pChildList->next()) { if(pObject->getClass() == cl) @@ -1574,7 +1574,7 @@ void KviKvsObject::killAllChildrenWithClass(KviKvsObjectClass *cl) break; // argh.. circular delete } } - + for(QPointer<KviKvsObject> * pObject = lDying.first();pObject;pObject = lDying.next()) { if(pObject->isNull()) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index f1cdadcd1..7e15c46b4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -1229,11 +1229,10 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c while((!str.isEmpty()) && (idx != -1)) { - int len; idx = re.indexIn(str,idx); if(idx != -1) { - len = re.matchedLength(); + int len = re.matchedLength(); if(len == 0) { c->warning(this,__tr2qs_ctx("The regular expression matched a zero-length substring: this is not valid in the s/// operator, skipping","kvs")); diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 2b67e0fac..2305bfd23 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -533,11 +533,10 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviStr &buff // // We're also assuming that *msg_ptr is not null here // - char c; if((*msg_ptr >= '0') && (*msg_ptr < '8')) { // a digit follows the backslash */ - c = *msg_ptr - '0'; + char c = *msg_ptr - '0'; msg_ptr++; if((*msg_ptr >= '0') && (*msg_ptr < '8')) { @@ -586,11 +585,10 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,QByteArray & // // We're also assuming that *msg_ptr is not null here // - char c; if((*msg_ptr >= '0') && (*msg_ptr < '8')) { // a digit follows the backslash */ - c = *msg_ptr - '0'; + char c = *msg_ptr - '0'; msg_ptr++; if((*msg_ptr >= '0') && (*msg_ptr < '8')) { @@ -639,10 +637,10 @@ const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviStr & // based CTCP message. // - int bInString = 0; if(!msg_ptr) return 0; while(*msg_ptr == ' ')msg_ptr++; // skip leading spaces + int bInString = 0; if(*msg_ptr == '"') { // a quoted parameter @@ -1539,10 +1537,8 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) if(!a->isRemote()) { - KviSharedFile * o; - if(!(o = g_pSharedFilesManager->addSharedFile(szFileName,a->localPath(),szUserMask,KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs)))) + if(!g_pSharedFilesManager->addSharedFile(szFileName,a->localPath(),szUserMask,KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs))) { - // Don't delete o...it has been already deleted by g_pSharedFilesManager msg->msg->console()->output(KVI_OUT_SYSTEMWARNING,__tr2qs("Unable to add file offer for file %Q (File not readable?)"),&(a->localPath())); } else { if(_OUTPUT_VERBOSE) @@ -1551,7 +1547,6 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs),&(a->name()),&(a->localPath()),&szUserMask); } } - //if(o)szReply.append(QString(" %1").arg(o->fileSize())); } szReply.append(szGenderTag); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index e7d155aff..8bb50f81d 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -1016,14 +1016,10 @@ void KviFrame::restoreToolBarPositions() QFile f(szTemp); - bool bNeedDefaults = false; - if(f.open(QIODevice::ReadOnly)) { if(!restoreState(f.readAll(),1)) qDebug("Error while restoring toolbars position"); - } else { - bNeedDefaults = true; } if(m_pWindowList->inherits("KviTreeWindowList")) diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index 58d51a3d1..8009779ae 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -235,13 +235,12 @@ void KviImageDialog::heartbeat() while(m_iJobIndexHelper < max) { QString id = g_pIconManager->getSmallIconName(m_iJobIndexHelper); - KviImageDialogItem * it; QString tip; KviQString::sprintf(tip,__tr2qs("Builtin $icon(%Q) [index %d]"),&id,m_iJobIndexHelper); QString image_id = "$icon("; image_id += id; image_id += ")"; - it = new KviImageDialogItem(m_pListBox,*(g_pIconManager->getSmallIcon(m_iJobIndexHelper)),id,image_id,tip); + new KviImageDialogItem(m_pListBox,*(g_pIconManager->getSmallIcon(m_iJobIndexHelper)),id,image_id,tip); m_iJobIndexHelper++; } } @@ -271,8 +270,7 @@ void KviImageDialog::heartbeat() QString tip = szFile; tip += "<br><hr>"; tip += __tr2qs("directory"); - KviImageDialogItem * it; - it = new KviImageDialogItem(m_pListBox,*(g_pIconManager->getBigIcon(KVI_BIGICON_FOLDER)),szFile,szPath,tip,true); + new KviImageDialogItem(m_pListBox,*(g_pIconManager->getBigIcon(KVI_BIGICON_FOLDER)),szFile,szPath,tip,true); } } else { if(((int)fi.size()) < m_iMaxPreviewFileSize) @@ -300,8 +298,7 @@ void KviImageDialog::heartbeat() tip += __tr2qs("bytes"); tip += "<br>"; - KviImageDialogItem * it; - it = new KviImageDialogItem(m_pListBox,pix,szFile,szPath,tip); + new KviImageDialogItem(m_pListBox,pix,szFile,szPath,tip); } } idx++; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 8d8b47a07..f2b9ca79f 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -573,7 +573,6 @@ void KviIrcView::setTimestamp(bool bTimestamp) void KviIrcView::scrollBarPositionChanged(int newValue) { if(!m_pCurLine)return; - int diff = 0; if(newValue > m_iLastScrollBarValue) { while(newValue > m_iLastScrollBarValue) @@ -581,7 +580,6 @@ void KviIrcView::scrollBarPositionChanged(int newValue) if(m_pCurLine->pNext) { m_pCurLine=m_pCurLine->pNext; - diff++; } m_iLastScrollBarValue++; } @@ -952,12 +950,10 @@ void KviIrcView::fastScroll(int lines) int widgetHeight = height(); int maxLineWidth = widgetWidth; - int defLeftCoord=KVI_IRCVIEW_HORIZONTAL_BORDER; if(KVI_OPTION_BOOL(KviOption_boolIrcViewShowImages)) { maxLineWidth -= KVI_IRCVIEW_PIXMAP_SEPARATOR_AND_DOUBLEBORDER_WIDTH; - defLeftCoord+=KVI_IRCVIEW_PIXMAP_AND_SEPARATOR; } diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 0cb5c6fc6..0be9d0d5d 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -120,9 +120,9 @@ KviTopicWidget::KviTopicWidget(QWidget * par, KviChannel * pChannel, const char m_pLabel = new KviThemedLabel(this, pChannel, "topic_label"); m_pLabel->setTextFormat(Qt::RichText); connect(m_pLabel,SIGNAL(doubleClicked()),this,SLOT(switchMode())); - + reset(); - + m_pCompletionBox=new KviTalListWidget(this,"topic_completion_box",Qt::Popup); m_pCompletionBox->setFont( font() ); m_pCompletionBox->setPalette( palette() ); @@ -312,7 +312,7 @@ void KviTopicWidget::setTopic(const QString & topic) { m_szTopic = topic; m_pLabel->setText(KviHtmlGenerator::convertToHtml(Qt::escape(m_szTopic))); - + bool bFound = false; for(QStringList::Iterator it=g_pRecentTopicList->begin();it != g_pRecentTopicList->end(); ++it) { @@ -624,11 +624,10 @@ void KviTopicWidget::historyClicked() { m_pCompletionBox->installEventFilter( this ); m_pCompletionBox->clear(); - KviTopicListBoxItem* item; - for ( QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) - { - item = new KviTopicListBoxItem(m_pCompletionBox,*it); - } + + for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it) + new KviTopicListBoxItem(m_pCompletionBox,*it); + m_pCompletionBox->resize(m_pInput->width(),6*m_pCompletionBox->fontMetrics().height()+20); QPoint point=m_pInput->mapToGlobal(QPoint(0,0)); point+=QPoint(0,m_pInput->height()); diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp index c6fa105c7..39e21964f 100644 --- a/src/kvirc/ui/kvi_windowlist_tree.cpp +++ b/src/kvirc/ui/kvi_windowlist_tree.cpp @@ -464,12 +464,10 @@ KviWindowListItem * KviTreeWindowList::prevItem() KviWindowListItem * KviTreeWindowList::lastItem() { // first find last toplevel item - int ctops, tops; - - tops = m_pTreeWidget->topLevelItemCount(); + int tops = m_pTreeWidget->topLevelItemCount(); if(tops > 0) { - ctops = m_pTreeWidget->topLevelItem(tops - 1)->childCount(); + int ctops = m_pTreeWidget->topLevelItem(tops - 1)->childCount(); if(ctops) { return m_pCurrentItem = (KviTreeWindowListItem *) m_pTreeWidget->topLevelItem(tops - 1)->child(ctops -1); } else { diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index bab866c2b..9b6b4db5f 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -198,10 +198,10 @@ void KviScriptManagementDialog::fillListView() KviPointerHashTable<QString,KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict(); if(!d)return; KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*d); - KviScriptAddonListViewItem * item; + while(KviKvsScriptAddon * a = it.current()) { - item = new KviScriptAddonListViewItem(m_pListWidget,a); + new KviScriptAddonListViewItem(m_pListWidget,a); ++it; } } diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 7d43b9a0c..18870c9af 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -1014,9 +1014,9 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId) KVSM_PARAMETERS_END(c) KviChannel * ch = chan_kvs_find_channel(c,szId); - kvs_int_t limit=0; if (ch) { + kvs_int_t limit=0; if(ch->hasChannelMode('l')) limit = ch->channelModeParam('l').toInt(); c->returnValue()->setInteger(limit); diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index eeef183fa..24f5f9410 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -76,7 +76,8 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name) m_pGroupBox = new KviTalGroupBox(Qt::Horizontal,__tr2qs("Channel" ),this); QString szMsg = __tr2qs("Name"); szMsg.append(":"); - QLabel * l = new QLabel(szMsg,m_pGroupBox); + + new QLabel(szMsg,m_pGroupBox); m_pChannelEdit = new QLineEdit(m_pGroupBox); connect(m_pChannelEdit,SIGNAL(returnPressed()), this, SLOT(editReturnPressed())); @@ -84,7 +85,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name) szMsg = __tr2qs("Password"); szMsg.append(":"); - l = new QLabel(szMsg,m_pGroupBox); + QLabel(szMsg,m_pGroupBox); m_pPass = new QLineEdit(m_pGroupBox); m_pPass->setEchoMode(QLineEdit::Password); @@ -200,7 +201,7 @@ void KviChannelsJoinWindow::fillListView() par = new QTreeWidgetItem(par); par->setText(0,__tr2qs("Current Network")); par->setExpanded(true); - + for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) { chld = new QTreeWidgetItem(par); diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index 7f0b94220..9fec7efd6 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -2713,7 +2713,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c) The second <type> parameter can be "local" or "remote", and refers to the certificate you want to query the information from; if omitted, it defaults to "remote".[br] If <dcc_id> is omitted then the DCC Session associated to the current window is assumed.[br] - If <dcc_id> is not a valid DCC session identifier (or it is omitted and the current window + If <dcc_id> is not a valid DCC session identifier (or it is omitted and the current window has no associated DCC session) then this function prints a warning and returns an empty sting.[br] If the DCC session is not using ssl then this function returns an empty string.[br] Some queries can accept an optional parameter <param1>[br] @@ -2745,7 +2745,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c) [/ul] @examples: [example] - # get a sha256 fingerprint of remote peer's certificate + # get a sha256 fingerprint of remote peer's certificate $dcc.getSSLCertInfo(fingerprintContents,remote,$dcc.session,sha256) [/example] @seealso: @@ -2810,7 +2810,7 @@ static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c) c->returnValue()->setString(""); return true; } - + KviSSL * pSSL = pSlaveThread->getSSL(); if(!pSSL) { diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 05cb47137..9a035fb1e 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -522,15 +522,16 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p m_pSelectorInterfaceList->append(f); KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("Colors","editor"),box); gbox->setInsideSpacing(0); - KviColorSelector * s = addColorSelector(gbox,__tr2qs_ctx("Background:","editor"),&g_clrBackground,true); - s = addColorSelector(gbox,__tr2qs_ctx("Normal text:","editor"),&g_clrNormalText,true); - s = addColorSelector(gbox,__tr2qs_ctx("Brackets:","editor"),&g_clrBracket,true); - s = addColorSelector(gbox,__tr2qs_ctx("Comments:","editor"),&g_clrComment,true); - s = addColorSelector(gbox,__tr2qs_ctx("Functions:","editor"),&g_clrFunction,true); - s = addColorSelector(gbox,__tr2qs_ctx("Keywords:","editor"),&g_clrKeyword,true); - s = addColorSelector(gbox,__tr2qs_ctx("Variables:","editor"),&g_clrVariable,true); - s = addColorSelector(gbox,__tr2qs_ctx("Punctuation:","editor"),&g_clrPunctuation,true); - s = addColorSelector(gbox,__tr2qs_ctx("Find:","editor"),&g_clrFind,true); + + addColorSelector(gbox,__tr2qs_ctx("Background:","editor"),&g_clrBackground,true); + addColorSelector(gbox,__tr2qs_ctx("Normal text:","editor"),&g_clrNormalText,true); + addColorSelector(gbox,__tr2qs_ctx("Brackets:","editor"),&g_clrBracket,true); + addColorSelector(gbox,__tr2qs_ctx("Comments:","editor"),&g_clrComment,true); + addColorSelector(gbox,__tr2qs_ctx("Functions:","editor"),&g_clrFunction,true); + addColorSelector(gbox,__tr2qs_ctx("Keywords:","editor"),&g_clrKeyword,true); + addColorSelector(gbox,__tr2qs_ctx("Variables:","editor"),&g_clrVariable,true); + addColorSelector(gbox,__tr2qs_ctx("Punctuation:","editor"),&g_clrPunctuation,true); + addColorSelector(gbox,__tr2qs_ctx("Find:","editor"),&g_clrFind,true); KviTalHBox * hbox = new KviTalHBox(box); diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index abde7e0df..7f6b37f8e 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -131,7 +131,6 @@ void KviEventEditor::oneTimeSetup() m_bOneTimeSetupDone = true; KviEventTreeWidgetItem * it; - KviEventHandlerTreeWidgetItem * ch; for(unsigned int i = 0;i < KVI_KVS_NUM_APP_EVENTS;i++) { @@ -144,7 +143,7 @@ void KviEventEditor::oneTimeSetup() { if(s->type() == KviKvsEventHandler::Script) { - ch = new KviEventHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(), + new KviEventHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(), ((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled()); } } diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 60a66a5de..0790e70df 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -198,11 +198,8 @@ void resetmp3infoStruct(mp3info *i) int get_mp3_info(mp3info *mp3) { - int l,bitrate,lastrate,counter=0; // mp3header header; - int sample_pos,data_start=0; - QFile fi(mp3->filename); mp3->datasize=fi.size();//filestat.st_size; @@ -210,11 +207,12 @@ int get_mp3_info(mp3info *mp3) if(get_first_header(mp3,0L)) { - data_start=ftell(mp3->file); - lastrate=15-mp3->header.bitrate; + int bitrate,counter=0; + int data_start=ftell(mp3->file); + int lastrate=15-mp3->header.bitrate; while((counter < NUM_SAMPLES) && lastrate) { - sample_pos=(counter*(mp3->datasize/NUM_SAMPLES+1))+data_start; + int sample_pos=(counter*(mp3->datasize/NUM_SAMPLES+1))+data_start; if(get_first_header(mp3,sample_pos)) { bitrate=15-mp3->header.bitrate; @@ -230,7 +228,7 @@ int get_mp3_info(mp3info *mp3) counter++; } - mp3->frames=(mp3->datasize-data_start)/(l=frame_length(&mp3->header)); + mp3->frames=(mp3->datasize-data_start)/(frame_length(&mp3->header)); mp3->seconds = (int)((float)(frame_length(&mp3->header)*mp3->frames)/ (float)(header_bitrate(&mp3->header)*125)+0.5); mp3->vbr_average = (float)header_bitrate(&mp3->header); @@ -383,15 +381,14 @@ int get_id3(mp3info *mp3) // this will read ID3v1 tags int retcode=0; char fbuf[4]; - size_t dummy; // make gcc happy - + if(mp3->datasize >= 128) { if(fseek(mp3->file, -128, SEEK_END )) { retcode |= 4; } else { - dummy = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; + size_t dummy = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; mp3->id3.genre[0]=255; if(!strcmp((const char *)"TAG",(const char *)fbuf)) diff --git a/src/modules/my/idle.h b/src/modules/my/idle.h index 394689ef2..798f59a10 100644 --- a/src/modules/my/idle.h +++ b/src/modules/my/idle.h @@ -60,8 +60,8 @@ public: IdlePlatform(); ~IdlePlatform(); - bool init(); - int secondsIdle(); + bool init() const; + int secondsIdle() const; private: class Private; diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp index 28178c0b7..41dc87017 100644 --- a/src/modules/my/idle_x11.cpp +++ b/src/modules/my/idle_x11.cpp @@ -25,8 +25,8 @@ #ifndef COMPILE_XSS_SUPPORT IdlePlatform::IdlePlatform() {} IdlePlatform::~IdlePlatform() {} - bool IdlePlatform::init() { return false; } - int IdlePlatform::secondsIdle() { return 0; } + bool IdlePlatform::init() const { return false; } + int IdlePlatform::secondsIdle() const { return 0; } #else #include <QApplication> #include <QDesktopWidget> @@ -70,7 +70,7 @@ delete d; } - bool IdlePlatform::init() + bool IdlePlatform::init() const { if(d->ss_info) return true; @@ -85,7 +85,7 @@ return false; } - int IdlePlatform::secondsIdle() + int IdlePlatform::secondsIdle() const { if(!d->ss_info) return 0; if(!XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info)) return 0; diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 829b50ae0..0d2034be5 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -669,18 +669,15 @@ KVSO_CLASS_FUNCTION(socket,listen) } #endif - bool bGotIp = false; - if(!m_szLocalIp.isEmpty()) { // Check the address type - if(KviNetUtils::isValidStringIp(m_szLocalIp))bGotIp = true; - else { + if(!KviNetUtils::isValidStringIp(m_szLocalIp)) + { #ifdef COMPILE_IPV6_SUPPORT if(KviNetUtils::isValidStringIPv6(m_szLocalIp)) { - bGotIp = true; m_bIPv6 = true; } else { #else diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 9d0d293c3..81c0ead77 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -414,12 +414,11 @@ void KviOptionsDialog::search(const QStringList &lKeywords) { m_pTreeWidget->setUpdatesEnabled(false); - bool bFoundSomethingInside = false; int count=m_pTreeWidget->topLevelItemCount(); for (int i=0;i<count;i++) { KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); - bFoundSomethingInside = recursiveSearch(pChild,lKeywords); + recursiveSearch(pChild,lKeywords); } m_pTreeWidget->setUpdatesEnabled(true); m_pTreeWidget->update(); diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index 7b1307e6a..c53b34b6f 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -36,8 +36,7 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent) createLayout(); - QLabel * l; - l = addLabel(0,0,0,0,__tr2qs_ctx("<center><b>Settings for CTCP.</b></center>"\ + addLabel(0,0,0,0,__tr2qs_ctx("<center><b>Settings for CTCP.</b></center>"\ "<p>The <b>Client-To-Client Protocol</b> (CTCP) " \ "is used to transmit special control messages over an IRC connection. " \ "These messages can request information from clients or negotiate file transfers." \ diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 0ada5ad12..c92756d00 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -311,24 +311,23 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent) createLayout(); KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options")); - KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat); - b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat)); + addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat); - KviBoolSelector * b1 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat); + KviBoolSelector * b1 = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat)); - connect(b1,SIGNAL(toggled(bool)),b,SLOT(setNotEnabled(bool))); + KviBoolSelector * b2 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat); - KviBoolSelector * b2; + connect(b2,SIGNAL(toggled(bool)),b1,SLOT(setNotEnabled(bool))); #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) b2 = addBoolSelector(0,2,0,2,__tr2qs_ctx("Flash system taskbar on new dcc chat message","options"),KviOption_boolFlashDccChatWindowOnNewMessages); - mergeTip(b, + mergeTip(b2, __tr2qs_ctx("<center>This option causes the system taskbar entry for KVIrc to flash when a new dcc chat message " \ "is received and the KVIrc window is not the active.</center>","options")); #endif b2 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Popup notifier on new dcc chat message","options"),KviOption_boolPopupNotifierOnNewDccChatMessages); - mergeTip(b, + mergeTip(b2, __tr2qs_ctx("<center>This option causes a small notifier window to pop up " \ "in the low right corner of the screen when a new message is received " \ "and the KVIrc window is not active.</center>","options")); diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp index 40d0cb320..b5cd4998b 100644 --- a/src/modules/options/optw_generalopt.cpp +++ b/src/modules/options/optw_generalopt.cpp @@ -35,8 +35,7 @@ KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent) setObjectName("generalopt_options_widget"); createLayout(); - QLabel * l; - l = addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options<br>"\ + addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options<br>"\ "<p>like<b> sound, mediafiles, URL handler </b> etc... " \ "</p>","options")); addAdvancedButton(4,1,4,1); diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index a095364e4..429a80936 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -83,43 +83,36 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent) connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); layout()->addWidget(m_pTreeWidget,0,0,1,3); -// layout()->addMultiCellWidget(m_pTreeWidget,0,0,0,2); QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this); layout()->addWidget(l,1,0); m_pDescription = new QLineEdit(this); layout()->addWidget(m_pDescription,1,1,1,2); -// layout()->addMultiCellWidget(m_pDescription,1,1,1,2); l = new QLabel(__tr2qs_ctx("MIME type:","options"),this); layout()->addWidget(l,2,0); m_pIanaType = new QLineEdit(this); layout()->addWidget(m_pIanaType,2,1,1,2); -// layout()->addMultiCellWidget(m_pIanaType,2,2,1,2); l = new QLabel(__tr2qs_ctx("File pattern:","options"),this); layout()->addWidget(l,3,0); m_pFileMask = new QLineEdit(this); layout()->addWidget(m_pFileMask,3,1,1,2); -// layout()->addMultiCellWidget(m_pFileMask,3,3,1,2); l = new QLabel(__tr2qs_ctx("Magic bytes:","options"),this); layout()->addWidget(l,4,0); m_pMagicBytes = new QLineEdit(this); layout()->addWidget(m_pMagicBytes,4,1,1,2); -// layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); l = new QLabel(__tr2qs_ctx("Save path:","options"),this); layout()->addWidget(l,5,0); m_pSavePath = new QLineEdit(this); layout()->addWidget(m_pSavePath,5,1,1,2); -// layout()->addMultiCellWidget(m_pSavePath,5,5,1,2); l = new QLabel(__tr2qs_ctx("Local open command:","options"),this); layout()->addWidget(l,6,0); m_pCommandline = new QLineEdit(this); layout()->addWidget(m_pCommandline,6,1,1,2); -// layout()->addMultiCellWidget(m_pCommandline,6,6,1,2); mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \ "<tt>$0</tt> is used in place of the filename</center>","options")); @@ -127,7 +120,6 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent) layout()->addWidget(l,7,0); m_pRemoteExecCommandline = new QLineEdit(this); layout()->addWidget(m_pRemoteExecCommandline,7,1,1,2); -// layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2); mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \ "<tt>$0</tt> is used in place of the filename</center>","options")); @@ -135,12 +127,10 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent) layout()->addWidget(l,8,0); m_pIcon = new QLineEdit(this); layout()->addWidget(m_pIcon,8,1,1,2); -// layout()->addMultiCellWidget(m_pIcon,8,8,1,2); QFrame * f = new QFrame(this); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); layout()->addWidget(f,9,0,1,3); -// layout()->addMultiCellWidget(f,9,9,0,2); QPushButton * b = new QPushButton(__tr2qs_ctx("&New","options"),this); connect(b,SIGNAL(clicked()),this,SLOT(newMediaType())); @@ -168,11 +158,10 @@ void KviMediaTypesOptionsWidget::fillTreeWidget() m_pTreeWidget->clear(); g_pMediaManager->lock(); KviPointerList<KviMediaType> * l = g_pMediaManager->mediaTypeList(); - KviMediaTypeTreeWidgetItem * it; + for(KviMediaType * t = l->first();t;t = l->next()) - { - it = new KviMediaTypeTreeWidgetItem(m_pTreeWidget,t); - } + new KviMediaTypeTreeWidgetItem(m_pTreeWidget,t); + g_pMediaManager->unlock(); enableOrDisable(); } diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 477d5ef76..4f5a71a80 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -359,7 +359,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent) KviTalVBox * box = new KviTalVBox(this); addWidgetToLayout(box,3,0,3,0); - QLabel * l = new QLabel(__tr2qs_ctx("Background:","options"),box); + new QLabel(__tr2qs_ctx("Background:","options"),box); m_pBackListWidget = new KviTalListWidget(box); m_pBackListWidget->setMaximumWidth(150); @@ -372,7 +372,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent) m_pBackItems[i] = new KviMessageColorListWidgetItem(m_pBackListWidget,i); } - l = new QLabel(__tr2qs_ctx("Foreground:","options"),box); + new QLabel(__tr2qs_ctx("Foreground:","options"),box); m_pForeListWidget = new KviTalListWidget(box); m_pForeListWidget->setMaximumWidth(150); @@ -384,16 +384,16 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent) m_pForeItems[i] = new KviMessageColorListWidgetItem(m_pForeListWidget,i); } - l = new QLabel(__tr2qs_ctx("Alert level:","options"),box); + new QLabel(__tr2qs_ctx("Alert level:","options"),box); m_pLevelListWidget = new KviTalListWidget(box); m_pLevelListWidget->setMaximumWidth(150); - KviTalListWidgetText * lbt; + for(i=0;i<6;i++) { QString tmpn; tmpn.setNum(i); - lbt = new KviTalListWidgetText(m_pLevelListWidget,tmpn); + new KviTalListWidgetText(m_pLevelListWidget,tmpn); } m_pIconButton = new QToolButton(box); @@ -415,12 +415,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent) connect(b,SIGNAL(clicked()),this,SLOT(save())); - KviMessageListWidgetItem * it; - for(i=0;i<KVI_NUM_MSGTYPE_OPTIONS;i++) - { - it = new KviMessageListWidgetItem(m_pListView,i); - } + new KviMessageListWidgetItem(m_pListView,i); layout()->setRowStretch(0,1); layout()->setColumnStretch(0,1); diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index 6015e5aff..acf6afecc 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -36,8 +36,7 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent) setObjectName("tools_options_widget"); createLayout(); - QLabel * l; - l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools<br>"\ + addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools<br>"\ "<p>like<b> away, lag and logging system. </b> " \ "</p>","options")); diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index 63efeea97..c38371bed 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -229,14 +229,14 @@ KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * par { createLayout(); - KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons); - b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user channel icons","options"),KviOption_boolShowUserChannelIcons); - b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Show user channel activity indicator","options"),KviOption_boolShowUserChannelState); - b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Show label with userlist stats","options"),KviOption_boolShowUserListStatisticLabel); - b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable user tooltips","options"),KviOption_boolShowUserListViewToolTips); - b = addBoolSelector(0,5,0,5,__tr2qs_ctx("Show avatars in userlist","options"),KviOption_boolShowAvatarsInUserlist); - b = addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable animated avatars","options"),KviOption_boolEnableAnimatedAvatars); - b = addBoolSelector(0,7,0,7,__tr2qs_ctx("Place nicks starting with non-alpha chars (such as _COOL_BOY_) after the normal nicks","options"),KviOption_boolPlaceNickWithNonAlphaCharsAtEnd); + addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons); + addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user channel icons","options"),KviOption_boolShowUserChannelIcons); + addBoolSelector(0,2,0,2,__tr2qs_ctx("Show user channel activity indicator","options"),KviOption_boolShowUserChannelState); + addBoolSelector(0,3,0,3,__tr2qs_ctx("Show label with userlist stats","options"),KviOption_boolShowUserListStatisticLabel); + addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable user tooltips","options"),KviOption_boolShowUserListViewToolTips); + addBoolSelector(0,5,0,5,__tr2qs_ctx("Show avatars in userlist","options"),KviOption_boolShowAvatarsInUserlist); + addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable animated avatars","options"),KviOption_boolEnableAnimatedAvatars); + addBoolSelector(0,7,0,7,__tr2qs_ctx("Place nicks starting with non-alpha chars (such as _COOL_BOY_) after the normal nicks","options"),KviOption_boolPlaceNickWithNonAlphaCharsAtEnd); addRowSpacer(0,8,0,8); } diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 855e23571..f2487c89a 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -1056,7 +1056,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par) m_pContextPopup = new KviTalPopupMenu(this); m_pEmptyContextPopup = new KviTalPopupMenu(this); - + spl->setStretchFactor (0,20); spl->setStretchFactor (1,80); @@ -1077,14 +1077,12 @@ void KviPopupEditor::oneTimeSetup() KviPointerHashTableIterator<QString,KviKvsPopupMenu> it(*a); - KviMenuTreeWidgetItem * item; - while(it.current()) { KviKvsPopupMenu * popup = it.current(); KviKvsPopupMenu * copy = new KviKvsPopupMenu(popup->popupName()); copy->copyFrom(popup); - item = new KviMenuTreeWidgetItem(m_pTreeWidget,copy); + new KviMenuTreeWidgetItem(m_pTreeWidget,copy); ++it; } @@ -1123,7 +1121,7 @@ void KviPopupEditor::popupRefresh(const QString &szName) KviKvsPopupMenu * pCopy = new KviKvsPopupMenu(szName); pCopy->copyFrom(pPopup); ch->replacePopup(pCopy); - + //refresh current item if(ch==m_pLastEditedItem) m_pEditor->edit(m_pLastEditedItem); diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp index 82f175031..ec23112fe 100644 --- a/src/modules/proxydb/libkviproxydb.cpp +++ b/src/modules/proxydb/libkviproxydb.cpp @@ -288,12 +288,11 @@ static bool proxydb_kvs_cmd_addProxy(KviKvsModuleCommandCall * c) if(c->switches()->find('i',"ipv6")) pProxy->setIPv6(true); QString tmp; - unsigned int uPort; if(c->switches()->getAsStringIfExisting('p',"port",tmp)) { bool bOk; - uPort = tmp.toInt(&bOk); + unsigned int uPort = tmp.toInt(&bOk); if(!bOk) uPort = 6667; pProxy->setPort(uPort); } diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index a77b6399b..f5044bc1f 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -120,7 +120,6 @@ void KviRawEditor::oneTimeSetup() m_bOneTimeSetupDone = true; KviRawTreeWidgetItem * it; - KviRawHandlerTreeWidgetItem * ch; for(unsigned int i = 0;i < 999;i++) { @@ -132,7 +131,7 @@ void KviRawEditor::oneTimeSetup() { if(s->type() == KviKvsEventHandler::Script) { - ch = new KviRawHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(), + new KviRawHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(), ((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled()); } } diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 7c088c7ec..5cd4882c0 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -286,7 +286,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par) m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.","register")); m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); - + KviTalHBox * hbox = new KviTalHBox(this); hbox->setSpacing(4); g->addWidget(hbox,3,1,1,2); @@ -451,7 +451,7 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group) m_pListView->setCurrentItem(pGroup); break; } - } + } } } diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index 47caa91c8..9cbd97cbe 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -1014,7 +1014,6 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) KviKvsArray* pArray = new KviKvsArray(); - int aid=0; KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(u) { @@ -1024,6 +1023,8 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c) KviIrcMask * m = u->maskList()->at(n.toInt()); if(m) c->returnValue()->setString(m->nick()+"!"+m->user()+"@"+m->host()); } else { + int aid=0; + for(KviIrcMask * m = u->maskList()->first();m;m = u->maskList()->next()) { pArray->set(aid,new KviKvsVariant(QString(m->nick()+"!"+m->user()+"@"+m->host()))); diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 9d4ad15a6..349769c4c 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -471,13 +471,12 @@ { static char base64unmap[255]; static bool didinit=false; - int i; if(!didinit) { // initialize base64unmap - for (i=0;i<255;++i)base64unmap[i]=0; - for (i=0;i<64;++i)base64unmap[fake_base64[i]]=i; + for (int i=0;i<255;++i)base64unmap[i]=0; + for (int i=0;i<64;++i)base64unmap[fake_base64[i]]=i; didinit=true; } diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp index f976b4381..0093386b6 100644 --- a/src/modules/serverdb/libkviserverdb.cpp +++ b/src/modules/serverdb/libkviserverdb.cpp @@ -881,11 +881,10 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) QString tmp; - unsigned int uPort; if(c->switches()->getAsStringIfExisting('p',"port",tmp)) { bool bOk; - uPort = tmp.toInt(&bOk); + unsigned int uPort = tmp.toInt(&bOk); if(!bOk) uPort = 6667; pServer->setPort(uPort); } diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 79e460005..9397ddcbd 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -302,13 +302,11 @@ void KviSharedFilesWindow::fillFileView() m_pTreeWidget->clear(); KviPointerHashTableIterator<QString,KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict())); - KviSharedFilesTreeWidgetItem * itm; - while(KviSharedFileList * l = it.current()) { for(KviSharedFile * o = l->first();o;o = l->next()) { - itm = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,o); + KviSharedFilesTreeWidgetItem * itm = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,o); } ++it; } @@ -317,8 +315,7 @@ void KviSharedFilesWindow::fillFileView() void KviSharedFilesWindow::sharedFileAdded(KviSharedFile * f) { - KviSharedFilesTreeWidgetItem * it; - it = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,f); + KviSharedFilesTreeWidgetItem * it = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,f); enableButtons(); } diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 1625ba041..2efdb4fa9 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -1882,17 +1882,15 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) #define MEMINCREMENT 32 - int reallen = 0; - int allocsize = MEMINCREMENT; - //s.setLength(allocsize); const QChar * fmt = KviQString::nullTerminatedArray(szFormat); if(fmt) { + int reallen = 0; + int allocsize = MEMINCREMENT; QChar * buffer = (QChar *)kvi_malloc(sizeof(QChar) * allocsize); - //QChar * p = (QChar *)s.unicode(); //9999999999999999999999999999999\0 char numberBuffer[1024]; diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index e61960864..3ed25109e 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -359,8 +359,7 @@ void KviThemeManagementDialog::fillThemeBox(const QString &szDir) if(inf->loadFromDirectory(szTest)) { inf->setSubdirectory(*it); - KviThemeListWidgetItem * item = 0; - item = new KviThemeListWidgetItem(m_pListWidget,inf); + KviThemeListWidgetItem * item = new KviThemeListWidgetItem(m_pListWidget,inf); } else { delete inf; } diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index c28799804..b9bcafc8c 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -1475,7 +1475,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) QString szEngine; QString szEncryptKey; QString szDecryptKey; - KviWindow * pWnd; + KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("window_id",KVS_PT_STRING,0,szWnd) KVSM_PARAMETER("enginename",KVS_PT_STRING,KVS_PF_OPTIONAL,szEngine) @@ -1484,7 +1484,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) if(szDecryptKey.isEmpty())szDecryptKey = szEncryptKey; #ifdef COMPILE_CRYPT_SUPPORT - pWnd = g_pApp->findWindow(szWnd.toUtf8().data()); + KviWindow * pWnd = g_pApp->findWindow(szWnd.toUtf8().data()); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) |