From 01648ba3a5aafb95e7b462a6694d3e404556a1ef Mon Sep 17 00:00:00 2001 From: Alexey Uzhva Date: Fri, 1 Aug 2008 18:43:00 +0000 Subject: code cleanups: removed unused functions from KviApp class; removed kvi_stringarray.cpp/h (never used); renamed KviValueList to QList and removed already empty kvi_valuelist.h; removed kvi_draganddrop.h - nobody actually using it git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2160 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/about/aboutdialog.cpp | 12 +- src/modules/actioneditor/actioneditor.cpp | 36 +++--- src/modules/addon/managementdialog.cpp | 1 - src/modules/aliaseditor/aliaseditor.cpp | 134 +++++++++++------------ src/modules/help/helpwindow.cpp | 30 ++--- src/modules/help/index.cpp | 24 ++-- src/modules/help/index.h | 14 +-- src/modules/logview/logviewmdiwindow.cpp | 4 +- src/modules/notifier/notifierwindow.cpp | 114 +++++++++---------- src/modules/notifier/notifierwindowtabs.cpp | 96 ++++++++-------- src/modules/objects/class_listview.h | 1 - src/modules/toolbareditor/toolbareditor.cpp | 1 - src/modules/torrent/tc_ktorrentdcopinterface.cpp | 2 +- 13 files changed, 233 insertions(+), 236 deletions(-) (limited to 'src/modules') diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index a3f92235b..c5f2830e0 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -80,19 +80,19 @@ KviAboutDialog::KviAboutDialog() setOkButton(__tr2qs_ctx("Close","about")); // About tab - KviStr buffer; + QString buffer; g_pApp->findImage(buffer,"kvi_splash.png"); - QPixmap pix(buffer.ptr()); + QPixmap pix(buffer); QWidget * w = new QWidget(this); QGridLayout * g = new QGridLayout(w); QLabel * l = new QLabel(w); l->setFrameStyle(QFrame::WinPanel | QFrame::Sunken); - QPalette p = l->palette(); - p.setColor(backgroundRole(), Qt::black); - l->setPalette(p); + QPalette p = l->palette(); + p.setColor(backgroundRole(), Qt::black); + l->setPalette(p); l->setAlignment(Qt::AlignCenter); l->setPixmap(pix); @@ -208,7 +208,7 @@ KviAboutDialog::KviAboutDialog() QString szLicensePath; g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); - + if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { szLicense = __tr2qs_ctx("Oops... Can't find the license file...\n" \ diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 9aaffe16e..a18768472 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -40,11 +40,11 @@ #include "kvi_action.h" #include "kvi_kvs_useraction.h" #include "kvi_customtoolbarmanager.h" -#include "kvi_valuelist.h" #include "kvi_tal_vbox.h" #include #include "kvi_tal_itemdelegates.h" +#include #include #include #include @@ -193,7 +193,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) gl->setColumnStretch(1,1); gl->setRowStretch(6,1); - + tw->addTab(tab,__tr2qs("Properties")); @@ -209,7 +209,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) "the active window belongs to an irc context")); gl->addWidget(m_pNeedsContextCheck,0,0,1,4); // gl->addMultiCellWidget(m_pNeedsContextCheck,0,0,0,3); - + l = new QLabel(tab); l->setMinimumWidth(40); @@ -291,7 +291,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) // gl->addMultiCellWidget(l,11,11,0,3); gl->setColumnStretch(3,1); gl->setRowStretch(11,1); - + tw->addTab(tab,__tr2qs("Flags")); tw->setCurrentIndex(0); @@ -384,14 +384,14 @@ void KviSingleActionEditor::chooseBigIcon() void KviSingleActionEditor::setActionData(KviActionData * d) { m_pActionData = d; - + if(d) { unsigned int uOldFlags = d->m_uFlags; d->m_uFlags = KviAction::validateFlags(d->m_uFlags); if(d->m_uFlags != uOldFlags) debug("invalid action flags in KviSingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags); - + m_pNameEdit->setText(d->m_szName); m_pNameEdit->setEnabled(true); m_pVisibleNameEdit->setText(d->m_szVisibleName); @@ -523,7 +523,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d) void KviSingleActionEditor::commit() { if(!m_pActionData)return; - + QString tmp = m_pNameEdit->text(); if(tmp != m_pActionData->m_szName) { @@ -560,7 +560,7 @@ void KviSingleActionEditor::commit() m_pActionData->m_uFlags |= KviAction::NeedsConnection; if(m_pEnableAtLoginCheck->isChecked())m_pActionData->m_uFlags |= KviAction::EnableAtLogin; } - + } if(m_pSpecificWindowsCheck->isChecked()) { @@ -616,13 +616,13 @@ void KviActionEditorTreeView::resizeEvent(QResizeEvent * e) KviActionEditor::KviActionEditor(QWidget * par) : QWidget(par) { - + QGridLayout * l = new QGridLayout(this); m_pSplitter = new QSplitter(Qt::Horizontal,this); m_pSplitter->setOpaqueResize(false); l->addWidget(m_pSplitter,0,0); - - + + KviTalVBox * box = new KviTalVBox(m_pSplitter); m_pTreeWidget = new KviActionEditorTreeView(box); KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(m_pTreeWidget); @@ -693,9 +693,9 @@ void KviActionEditor::exportActions() QString szName = QDir::homePath(); if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; szName += "myactions.kvs"; - + QString szFile; - + if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true,true))return; QString szCode; @@ -705,7 +705,7 @@ void KviActionEditor::exportActions() if(m_pTreeWidget->topLevelItem(i)->isSelected()) { KviActionData * a = ((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData(); - + KviKvsUserAction::exportToKvs(szCode, a->m_szName, a->m_szScriptCode, @@ -740,7 +740,7 @@ void KviActionEditor::deleteActions() //if(QMessageBox::question(this,__tr2qsf("Confirm Deletion"),__tr2qsf("Do you really want to delete the selected actions ?"),__tr2qsf("Yes"),__tr2qsf("No")) != 0) // return; - + for(KviActionEditorTreeWidgetItem * i = l.first();i;i = l.next()) { if(m_pSingleActionEditor->actionData() == i->actionData()) @@ -799,7 +799,7 @@ bool KviActionEditor::actionExists(const QString &szName) for (int i=0;itopLevelItemCount();i++) { if(((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true; - } + } return false; } @@ -808,7 +808,7 @@ void KviActionEditor::currentItemChanged(KviTalTreeWidgetItem * i,KviTalTreeWidg { if(m_pSingleActionEditor->actionData()) m_pSingleActionEditor->commit(); - + m_pTreeWidget->update(); KviActionEditorTreeWidgetItem * it = (KviActionEditorTreeWidgetItem *)i; @@ -940,7 +940,7 @@ void KviActionEditorWindow::loadProperties(KviConfig *cfg) { int w = width(); KviWindow::loadProperties(cfg); - KviValueList def; + QList def; def.append((w * 25) / 100); def.append((w * 75) / 100); m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 5fd398472..22b99bb37 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -37,7 +37,6 @@ #include "kvi_fileextensions.h" #include "kvi_kvs_script.h" #include "kvi_sourcesdate.h" -#include "kvi_draganddrop.h" #include "kvi_tal_listwidget.h" #include "kvi_tal_tooltip.h" diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 9f731f9dc..da73cb41e 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -39,9 +39,9 @@ #include "kvi_filedialog.h" #include "kvi_cmdformatter.h" #include "kvi_module.h" -#include "kvi_valuelist.h" #include "kvi_tal_vbox.h" +#include #include #include #include @@ -92,7 +92,7 @@ KviAliasListViewItem::KviAliasListViewItem(KviAliasNamespaceListViewItem * pPare { setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)))); m_cPos=0; - + } @@ -170,9 +170,9 @@ KviAliasListViewItem * KviAliasNamespaceListViewItem::createFullAliasItem(const if(lNamespaces.isEmpty()) return getAliasItem(szName); - + QStringList::Iterator it = lNamespaces.begin(); - + KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it); ++it; while(it != lNamespaces.end()) @@ -180,7 +180,7 @@ KviAliasListViewItem * KviAliasNamespaceListViewItem::createFullAliasItem(const nit = nit->getNamespaceItem(*it); ++it; } - + return nit->getAliasItem(szName); } @@ -192,9 +192,9 @@ KviAliasNamespaceListViewItem * KviAliasNamespaceListViewItem::createFullNamespa if(lNamespaces.isEmpty()) return getNamespaceItem(szName); - + QStringList::Iterator it = lNamespaces.begin(); - + KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it); ++it; while(it != lNamespaces.end()) @@ -202,7 +202,7 @@ KviAliasNamespaceListViewItem * KviAliasNamespaceListViewItem::createFullNamespa nit = nit->getNamespaceItem(*it); ++it; } - + return nit->getNamespaceItem(szName); } KviAliasEditorListView::KviAliasEditorListView(QWidget * par) @@ -236,13 +236,13 @@ KviAliasEditor::KviAliasEditor(QWidget * par) m_pSplitter = new QSplitter(Qt::Horizontal,this); m_pSplitter->setOpaqueResize(false); l->addWidget(m_pSplitter,0,0); - + KviTalVBox * box = new KviTalVBox(m_pSplitter); box->setSpacing(0); box->setMargin(0); - + m_pListView = new KviAliasEditorListView(box); - + box = new KviTalVBox(m_pSplitter); KviTalHBox * hbox = new KviTalHBox(box); @@ -296,13 +296,13 @@ KviAliasListViewItem * KviAliasEditor::findAliasItemRecursive(KviAliasEditorList for (int i=0;ichildCount();i++) { KviAliasEditorListViewItem *item=(KviAliasEditorListViewItem *)parent->child(i); - + if (!item->isAlias()){ KviAliasListViewItem * itemret=findAliasItemRecursive(item,szName); if (itemret) return (KviAliasListViewItem*)itemret; } else{ - if(KviQString::equalCI(szName,item->name())) + if(KviQString::equalCI(szName,item->name())) return (KviAliasListViewItem*)item; } } @@ -374,9 +374,9 @@ KviAliasListViewItem * KviAliasEditor::createFullAliasItem(const QString &szFull if(lNamespaces.isEmpty()) return getAliasItem(szName); - + QStringList::Iterator it = lNamespaces.begin(); - + KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it); ++it; while(it != lNamespaces.end()) @@ -384,7 +384,7 @@ KviAliasListViewItem * KviAliasEditor::createFullAliasItem(const QString &szFull nit = nit->getNamespaceItem(*it); ++it; } - + return nit->getAliasItem(szName); } @@ -396,9 +396,9 @@ KviAliasNamespaceListViewItem * KviAliasEditor::createFullNamespaceItem(const QS if(lNamespaces.isEmpty()) return getNamespaceItem(szName); - + QStringList::Iterator it = lNamespaces.begin(); - + KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it); ++it; while(it != lNamespaces.end()) @@ -406,7 +406,7 @@ KviAliasNamespaceListViewItem * KviAliasEditor::createFullNamespaceItem(const QS nit = nit->getNamespaceItem(*it); ++it; } - + return nit->getNamespaceItem(szName); } @@ -425,12 +425,12 @@ void KviAliasEditor::oneTimeSetup() item->setBuffer(alias->code()); ++it; } - + connect(m_pListView,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)), this,SLOT(itemPressed(QTreeWidgetItem *,QPoint))); connect(m_pListView,SIGNAL(itemChanged(QTreeWidgetItem *,int)),this,SLOT(itemRenamed(QTreeWidgetItem *,int))); - + m_pListView->sortItems(0,Qt::AscendingOrder); } @@ -473,7 +473,7 @@ bool KviAliasEditor::itemExists(QTreeWidgetItem *pSearchFor) for (int i=0;itopLevelItemCount();i++) { - debug("Check in top level %d",i); + debug("Check in top level %d",i); if(m_pListView->topLevelItem(i)==pSearchFor) return true; else { @@ -507,9 +507,9 @@ bool KviAliasEditor::itemExistsRecursive(QTreeWidgetItem *pSearchFor,QTreeWidget void KviAliasEditor::itemPressed(QTreeWidgetItem *it,QPoint pnt) { m_pContextPopup->clear(); - + m_pLastClickedItem = (KviAliasEditorListViewItem *)it; - + int id; m_pContextPopup->insertItem( @@ -521,7 +521,7 @@ void KviAliasEditor::itemPressed(QTreeWidgetItem *it,QPoint pnt) *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)), __tr2qs("Add Namespace"), this,SLOT(newNamespace())); - + bool bHasItems = m_pListView->topLevelItemCount(); bool bHasSelected = hasSelectedItems(); @@ -584,10 +584,10 @@ void KviAliasEditor::recursiveSearchReplace(const QString &szSearch,KviAliasEdit it->child(i)->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIASHIGHLIGHTED)))); if (bReplace) ((QString &)((KviAliasListViewItem *)it->child(i))->buffer()).replace(szSearch,szReplace,Qt::CaseInsensitive); openParentItems(it); - } + } //else //it->child(i)->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)))); - } + } else { recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)(it->child(i)),bReplace,szReplace); } @@ -602,14 +602,14 @@ void KviAliasEditor::slotFind() g_pAliasEditorModule->lock(); bool bOk; - + QString szSearch = QInputDialog::getText(this, __tr2qs("Find In Aliases"), __tr2qs("Please enter the text to be searched for. The matching aliases will be highlighted."), QLineEdit::Normal, "", &bOk); - + g_pAliasEditorModule->unlock(); if(!bOk)return; @@ -622,8 +622,8 @@ void KviAliasEditor::slotFind() if(((KviAliasListViewItem *)m_pListView->topLevelItem(i))->buffer().indexOf(szSearch,0,Qt::CaseInsensitive) != -1) { m_pListView->topLevelItem(i)->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIASHIGHLIGHTED)))); - } - } + } + } else { recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)m_pListView->topLevelItem(i)); } @@ -633,7 +633,7 @@ void KviAliasEditor::slotFind() void KviAliasEditor::slotFindWord(const QString &szSearch) { m_pEditor->setFindText(szSearch); - + // recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)m_pListView->firstChild()); } @@ -716,12 +716,12 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerListunlock(); return; } - + if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR; debug ("dir changed in %s",m_szDir.toUtf8().data()); - + bool bReplaceAll=false; - + for(KviAliasListViewItem * it = l->first();it;it = l->next()) { QString tmp; @@ -730,7 +730,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerListunlock(); @@ -753,7 +753,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList l; l.setAutoDelete(false); @@ -791,7 +791,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; QString szFile; g_pAliasEditorModule->lock(); - + if (count==1) { QString tmp=buildFullItemName(tempitem); @@ -802,7 +802,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) szName += ".kvs"; if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,"*.kvs",false,true,true)) { - g_pAliasEditorModule->unlock(); + g_pAliasEditorModule->unlock(); return; } m_szDir=QFileInfo(szFile).absolutePath(); @@ -827,7 +827,7 @@ void KviAliasEditor::saveProperties(KviConfig *cfg) void KviAliasEditor::loadProperties(KviConfig *cfg) { - KviValueList def; + QList def; def.append(20); def.append(80); m_pSplitter->setSizes(cfg->readIntListEntry("Sizes",def)); @@ -969,7 +969,7 @@ void KviAliasEditor::appendSelectedItemsRecursive(KviPointerListchildCount();i++) { - if (it->child(i)->isSelected()) + if (it->child(i)->isSelected()) { l->append((KviAliasEditorListViewItem *)it->child(i)); } @@ -984,7 +984,7 @@ void KviAliasEditor::appendSelectedItems(KviPointerListtopLevelItemCount();i++) { - if (m_pListView->topLevelItem(i)->isSelected()) + if (m_pListView->topLevelItem(i)->isSelected()) { l->append((KviAliasEditorListViewItem *)m_pListView->topLevelItem(i)); } @@ -1027,7 +1027,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll switch(ret) { case 0: - // nothing + // nothing break; case 1: *pbYesToAll = true; @@ -1037,7 +1037,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll break; } } - + if(it == m_pLastEditedItem) m_pLastEditedItem = 0; if(it == m_pLastClickedItem) @@ -1074,12 +1074,12 @@ void KviAliasEditor::removeSelectedItems() l.setAutoDelete(false); appendSelectedItems(&l); bool bYesToAll = false; - + for(KviAliasEditorListViewItem *it = l.first();it;it = l.next()) { if(!removeItem(it,&bYesToAll,false))return; } - + } @@ -1108,7 +1108,7 @@ QString KviAliasEditor::askForAliasName(const QString &szAction,const QString &s g_pAliasEditorModule->unlock(); continue; } - + // we allow only [\w:]+ QRegExp re("[\\w:]+"); if(!re.exactMatch(szNewName)) @@ -1176,7 +1176,7 @@ QString KviAliasEditor::askForNamespaceName(const QString &szAction,const QStrin g_pAliasEditorModule->unlock(); continue; } - + // we allow only [\w:]+ QRegExp re("[\\w:]+"); if(!re.exactMatch(szNewName)) @@ -1261,9 +1261,9 @@ void KviAliasEditor::newAlias() if(szNewName.isEmpty())return; getUniqueItemName(m_pLastClickedItem,szNewName,KviAliasEditorListViewItem::Alias); - + KviAliasListViewItem * it; - + if(m_pLastClickedItem) it = ((KviAliasNamespaceListViewItem *)m_pLastClickedItem)->createFullAliasItem(szNewName); else @@ -1280,15 +1280,15 @@ void KviAliasEditor::newNamespace() if(m_pLastClickedItem->isAlias()) m_pLastClickedItem = m_pLastClickedItem->parentNamespaceItem(); } - + QString szNewName = askForNamespaceName(__tr2qs("Add Namespace"),__tr2qs("Please enter the name for the new namespace"),"mynamespace"); if(szNewName.isEmpty())return; getUniqueItemName(m_pLastClickedItem,szNewName,KviAliasEditorListViewItem::Namespace); - + KviAliasNamespaceListViewItem * it; - + if(m_pLastClickedItem) it = ((KviAliasNamespaceListViewItem *)m_pLastClickedItem)->createFullNamespaceItem(szNewName); else @@ -1317,7 +1317,7 @@ bool KviAliasEditor::namespaceExists(QString &szFullItemName) { KviPointerList l; l.setAutoDelete(false); - + appendNamespaceItems(&l,false); for(KviAliasListViewItem * it = l.first();it;it = l.next()) { @@ -1347,7 +1347,7 @@ void KviAliasEditor::renameItem() QString szNewName; bool bAlias = m_pLastEditedItem->isAlias(); - + if(bAlias) szNewName = askForAliasName(__tr2qs("Rename Alias"),__tr2qs("Please enter the new name for the alias"),szName); else @@ -1382,7 +1382,7 @@ void KviAliasEditor::renameItem() return; } } - + QString szCode; int pntCursor; if(bAlias) @@ -1411,7 +1411,7 @@ void KviAliasEditor::renameItem() m_pLastEditedItem = 0; // make sure it's true (but it already should be because of removeItem()) m_pLastClickedItem = 0; // make sure it's true (but it already should be because of removeItem()) - + if(bAlias) { KviAliasListViewItem * ait = createFullAliasItem(szNewName); @@ -1428,7 +1428,7 @@ void KviAliasEditor::renameItem() ((KviAliasEditorListViewItem*)lChildren.at(i))->setParentNamespaceItem(nit); nit->insertChild(nit->childCount(),lChildren.at(i)); } - + } } @@ -1442,7 +1442,7 @@ void KviAliasEditor::saveLastEditedItem() debug("Check last edit item %s",m_pLastEditedItem->text(0).toUtf8().data()); ((KviAliasListViewItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor()); if(m_pLastEditedItem->isNamespace()){debug("Is namespace");return;} - + QString newCode; m_pEditor->getText(newCode); debug("Saving %s",newCode.toUtf8().data()); @@ -1464,7 +1464,7 @@ void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *pre m_pEditor->setEnabled(false); return; } - + QString szNam = buildFullItemName(m_pLastEditedItem); if(m_pLastEditedItem->isNamespace()) { @@ -1486,7 +1486,7 @@ void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *pre m_pNameLabel->setText(szLabelText); m_pRenameButton->setEnabled(true); m_pEditor->setText(((KviAliasListViewItem *)it)->buffer()); - + m_pEditor->setFocus(); m_pEditor->setCursorPosition(((KviAliasListViewItem *)it)->cursorPosition()); m_pEditor->setEnabled(true); @@ -1505,7 +1505,7 @@ void KviAliasEditor::recursiveCommit(KviAliasEditorListViewItem * it) KviKvsScript * a = new KviKvsScript(szName,((KviAliasListViewItem *)it)->buffer()); KviKvsAliasManager::instance()->add(szName,a); return; - } else + } else { for (int i=0;ichildCount();i++) { @@ -1529,10 +1529,10 @@ void KviAliasEditor::commit() void KviAliasEditor::getUniqueItemName(KviAliasEditorListViewItem *item,QString &buffer,KviAliasEditorListViewItem::Type eType) { QString ret; - + int idx = 0; KviAliasEditorListViewItem * found; - + for(;;) { ret = buffer; @@ -1550,7 +1550,7 @@ void KviAliasEditor::getUniqueItemName(KviAliasEditorListViewItem *item,QString buffer = ret; return; } - + if(eType == KviAliasEditorListViewItem::Namespace) found = ((KviAliasNamespaceListViewItem *)item)->findNamespaceItem(ret); else diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index b10db335b..ceae44f98 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -30,9 +30,9 @@ #include "kvi_locale.h" #include "kvi_module.h" #include "kvi_config.h" -#include "kvi_valuelist.h" #include "kvi_sourcesdate.h" +#include #include #include #include @@ -51,10 +51,10 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) if(!g_bIndexingDone) { QString szDoclist,szDict; - + g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist." KVI_SOURCES_DATE); g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict." KVI_SOURCES_DATE); - + if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) { g_pDocIndex->readDict(); } else { @@ -67,7 +67,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) } g_bIndexingDone=TRUE; } - + g_pHelpWindowList->append(this); m_pSplitter = new QSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); @@ -76,41 +76,41 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) m_pToolBar=new KviTalVBox(m_pSplitter); m_pTabWidget = new QTabWidget(m_pToolBar); - + m_pIndexTab = new KviTalVBox(m_pTabWidget); m_pTabWidget->addTab(m_pIndexTab,__tr2qs("Index")); - + KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab); m_pIndexSearch = new QLineEdit(pSearchBox); connect( m_pIndexSearch, SIGNAL( textChanged(const QString&) ), this, SLOT( searchInIndex(const QString&) ) ); connect( m_pIndexSearch, SIGNAL( returnPressed() ), this, SLOT( showIndexTopic() ) ); - + QToolButton* pBtnRefreshIndex = new QToolButton(pSearchBox); pBtnRefreshIndex->setIcon(*g_pIconManager->getBigIcon(KVI_REFRESH_IMAGE_NAME)); connect(pBtnRefreshIndex,SIGNAL(clicked()),this,SLOT(refreshIndex())); pBtnRefreshIndex->setToolTip(__tr2qs("Refresh index") ); - + m_pIndexListWidget = new KviTalListWidget(m_pIndexTab); QStringList docList=g_pDocIndex->titlesList(); m_pIndexListWidget->addItems(docList); connect(m_pIndexListWidget,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(indexSelected (QListWidgetItem * ))); m_pIndexListWidget->sortItems(); - + m_pSearchTab = new KviTalVBox(m_pTabWidget); m_pTabWidget->addTab(m_pSearchTab,__tr2qs("Search")); - + m_pTermsEdit = new QLineEdit(m_pSearchTab); /* connect( m_pTermsEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( searchInIndex(const QString&) ) );*/ connect( m_pTermsEdit, SIGNAL( returnPressed() ), this, SLOT( startSearch() ) ); - + m_pResultBox = new KviTalListWidget(m_pSearchTab); connect(m_pResultBox,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(searchSelected (QListWidgetItem *))); - - KviValueList li; + + QList li; li.append(width()-80); li.append(80); m_pSplitter->setSizes(li); @@ -130,7 +130,7 @@ void KviHelpWindow::saveProperties(KviConfig *cfg) void KviHelpWindow::loadProperties(KviConfig *cfg) { - KviValueList def; + QList def; int w = width(); def.append((w * 82) / 100); def.append((w * 18) / 100); @@ -201,7 +201,7 @@ void KviHelpWindow::startSearch() setCursor( Qt::WaitCursor ); m_foundDocs.clear(); m_foundDocs = g_pDocIndex->query( m_terms, termSeq, seqWords ); - + m_pResultBox->clear(); for ( it = m_foundDocs.begin(); it != m_foundDocs.end(); ++it ) m_pResultBox->addItem( g_pDocIndex->getDocumentTitle( *it ) ); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index a7648b8f5..2ab2dbe3c 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -234,7 +234,7 @@ void Index::readDict() dict.clear(); QDataStream s( &f ); QString key; - KviValueList docs; + QList docs; while ( !s.atEnd() ) { s >> key; s >> docs; @@ -268,7 +268,7 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq, for ( it = terms.begin(); it != terms.end(); ++it ) { Entry *e = 0; if ( (*it).contains( '*' ) ) { - KviValueList wcts = setupDummyTerm( getWildcardTerms( *it ) ); + QList wcts = setupDummyTerm( getWildcardTerms( *it ) ); termList.append( new Term( "dummy", wcts.count(), wcts ) ); } else if ( dict[ *it ] ) { e = dict[ *it ]; @@ -284,14 +284,14 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq, termList.removeFirst(); - KviValueList minDocs = minTerm->documents; - KviValueList::iterator C; - KviValueList::ConstIterator It; + QList minDocs = minTerm->documents; + QList::iterator C; + QList::ConstIterator It; Term *t = termList.first(); for ( ; t; t = termList.next() ) { - KviValueList docs = t->documents; + QList docs = t->documents; C = minDocs.begin(); @@ -425,7 +425,7 @@ QStringList Index::split( const QString &str ) return lst; } -KviValueList Index::setupDummyTerm( const QStringList &terms ) +QList Index::setupDummyTerm( const QStringList &terms ) { TermList termList; QStringList::ConstIterator it = terms.begin(); @@ -441,17 +441,17 @@ KviValueList Index::setupDummyTerm( const QStringList &terms ) termList.sort(); - KviValueList maxList; + QList maxList; if ( !termList.count() ) return maxList; maxList = termList.last()->documents; termList.removeLast(); - KviValueList::iterator docIt; + QList::iterator docIt; Term *t = termList.first(); while ( t ) { - KviValueList docs = t->documents; + QList docs = t->documents; for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) { if ( maxList.indexOf( *docIt ) == -1 ) maxList.append( *docIt ); @@ -532,8 +532,8 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo QStringList::ConstIterator patIt = patterns.begin(); QStringList wordLst; - KviValueList a, b; - KviValueList::iterator aIt; + QList a, b; + QList::iterator aIt; for ( ; patIt != patterns.end(); ++patIt ) { QString tmp=*patIt; diff --git a/src/modules/help/index.h b/src/modules/help/index.h index c2ede4756..791c11275 100755 --- a/src/modules/help/index.h +++ b/src/modules/help/index.h @@ -28,8 +28,8 @@ #include "kvi_pointerhashtable.h" #include "kvi_pointerlist.h" -#include "kvi_valuelist.h" +#include #include #include #include @@ -62,12 +62,12 @@ class Index : public QObject public: struct Entry { Entry( int d ) { documents.append( Document( d, 1 ) ); } - Entry( KviValueList l ) : documents( l ) {} - KviValueList documents; + Entry( QList l ) : documents( l ) {} + QList documents; }; struct PosEntry { PosEntry( int p ) { positions.append( p ); } - KviValueList positions; + QList positions; }; Index( const QString &dp, const QString &hp ); Index( const QStringList &dl, const QString &hp ); @@ -92,7 +92,7 @@ private: void insertInDict( const QString&, int ); QStringList getWildcardTerms( const QString& ); QStringList split( const QString& ); - KviValueList setupDummyTerm( const QStringList& ); + QList setupDummyTerm( const QStringList& ); bool searchForPattern( const QStringList&, const QStringList&, const QString& ); void buildMiniDict( const QString& ); QStringList docList; @@ -107,11 +107,11 @@ private: }; struct Term { - Term( const QString &t, int f, KviValueList l ) + Term( const QString &t, int f, QList l ) : term( t ), frequency( f ), documents( l ) {} QString term; int frequency; - KviValueListdocuments; + QListdocuments; }; #define TermList KviPointerList diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 7cd66cbeb..c7a93aa3e 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -33,10 +33,10 @@ #include "kvi_qcstring.h" #include "kvi_app.h" #include "kvi_fileutils.h" -#include "kvi_valuelist.h" #include "kvi_tal_listview.h" #include "kvi_tal_popupmenu.h" +#include #include #include #include @@ -154,7 +154,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pIrcView->setFocusPolicy(Qt::ClickFocus); - KviValueList li; + QList li; li.append(110); li.append(width()-110); m_pSplitter->setSizes(li); diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 8d9d21c87..696a2b249 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -83,18 +83,18 @@ KviNotifierWindow::KviNotifierWindow() m_tStartedAt=0; m_pAutoHideTimer = 0; m_pProgressTimer = 0; - + m_pWndBorder = new KviNotifierWindowBorder(); reloadImages(); - KviStr buffer; + QString buffer; g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true); - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); cfg.setGroup("NotifierSkin"); - + QString szFamily = cfg.readEntry("TextFontFamily","Arial"); m_pDefaultFont = new QFont(szFamily,cfg.readIntEntry("TextFontSize",9)); szFamily = cfg.readEntry("TitleFontFamily","Arial"); @@ -109,7 +109,7 @@ KviNotifierWindow::KviNotifierWindow() szKey.sprintf("OldTextColor%d",i + 1); m_clrOldText[i] = cfg.readColorEntry(szKey.ptr(),QColor(90,90,90)); } - + m_iBlinkTimeout = cfg.readIntEntry("BlinkTimeout",650); if(m_iBlinkTimeout < 100)m_iBlinkTimeout = 100; m_iInputHeight = cfg.readIntEntry("InputHeight",20); @@ -118,7 +118,7 @@ KviNotifierWindow::KviNotifierWindow() setFocusPolicy(Qt::NoFocus); setMouseTracking(true); //setCursor(m_cursor); - + hide(); m_pLineEdit = new QLineEdit(this); m_pLineEdit->setGeometry(0,0,0,0); @@ -135,13 +135,13 @@ KviNotifierWindow::KviNotifierWindow() m_bPrevDown = false; m_bNextDown = false; m_bWriteDown = false; - + m_bKeyShiftPressed = false; - + m_bLeftButtonIsPressed = false; m_bDiagonalResizing = false; m_bResizing = false; - + m_pContextPopup = 0; m_pDisablePopup = 0; @@ -154,22 +154,22 @@ KviNotifierWindow::KviNotifierWindow() int iHeight = m_pixBackground.height(); QDesktopWidget * w = QApplication::desktop(); QRect r = w->availableGeometry(w->primaryScreen()); //w->screenGeometry(w->primaryScreen()); - + /*debug("r.x(),r.y(): %d,%d",r.x(),r.y()); debug("r.width(),r.height(): %d,%d",r.width(),r.height());*/ m_wndRect.setRect( r.x() + r.width() - (iWidth + SPACING), r.y() + r.height() - (iHeight + SPACING), iWidth, iHeight ); - + //m_pWndBorder = new KviNotifierWindowBorder(); m_pWndTabs = new KviNotifierWindowTabs(m_pWndBorder->tabsRect()); m_pWndBody = new KviNotifierWindowBody(m_pWndBorder->bodyRect()); - + m_pProgressBar = new KviNotifierWindowProgressBar(m_pWndBorder->progressRect()); - + // FIXME: Ugly global-font initialization.. QFontMetrics titleFontMetrics(*m_pTitleFont); m_pWndBorder->centerTitle(titleFontMetrics.height()); - + connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); } @@ -238,7 +238,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd,const QString &szImageId,con if(isVisible())update(); // else the line edit was hidden } - + int KviNotifierWindow::textWidth() { @@ -263,7 +263,7 @@ void KviNotifierWindow::stopAutoHideTimer() { if(m_pProgressTimer) delete m_pProgressTimer; m_pProgressTimer = 0; - + if(!m_pAutoHideTimer)return; delete m_pAutoHideTimer; m_pAutoHideTimer = 0; @@ -303,7 +303,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate) case Hidden: stopShowHideTimer(); stopBlinkTimer(); - + m_bDragging = false; m_bCloseDown = false; m_bPrevDown = false; @@ -459,7 +459,7 @@ void KviNotifierWindow::hideNow() m_eState = Hidden; m_dOpacity = 0.0; m_tAutoHideAt = 0; - + if(m_pLineEdit->isVisible())m_pLineEdit->hide(); hide();//if(isVisible())hide(); } @@ -562,7 +562,7 @@ void KviNotifierWindow::startAutoHideTimer() m_pAutoHideTimer = new QTimer(); connect(m_pAutoHideTimer,SIGNAL(timeout()),this,SLOT(autoHide())); m_pAutoHideTimer->start(nSecs * 1000); - + m_pProgressTimer= new QTimer(); connect(m_pProgressTimer,SIGNAL(timeout()),this,SLOT(progressUpdate())); m_pProgressTimer->start(60); @@ -611,7 +611,7 @@ static void blend_images(QImage &buffer,QImage &background,QImage &foreground,do QRgb * end = dst + buffer.width(); QRgb * bkg = (QRgb *)background.scanLine(y); QRgb * fgn = (QRgb *)foreground.scanLine(y); - + double dRemaining = 1.0 - dValue; while(dst < end) @@ -645,7 +645,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e) if(m_dOpacity < 1.0) { QPainter px(this); - + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) px.drawPixmap(0,0,m_pixForeground); #else @@ -667,12 +667,12 @@ void KviNotifierWindow::redrawText() // the current tab KviNotifierWindowTab * tab = m_pWndTabs->currentTab(); if(!tab)return; - + // it's message list KviPointerList * l = tab->messageList(); if(!l)return; if(l->isEmpty())return; - + // the current message KviNotifierMessage * cur = tab->currentMessage(); if(!cur)cur = l->last(); @@ -732,7 +732,7 @@ void KviNotifierWindow::redrawText() p.setFont(*m_pTitleFont); QString title; KviQString::sprintf(title,"[%d/%d]",iIdx + 1,l->count()); - + if(tab->window()) { title += " "; @@ -747,9 +747,9 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e) //debug ("move on x,y: %d,%d", e->pos().x(), e->pos().y()); if (!m_bLeftButtonIsPressed) { - + if(checkResizing(e->pos())) goto sartelo; - + /* ### MOUSE-MOVE-EVENT -> m_pWndBorder ### */ if (m_pWndBorder->captionRect().contains(e->pos())) { if (m_pWndBorder->closeRect().contains(e->pos())) { @@ -759,15 +759,15 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e) } goto sartelo; } - + if(m_pWndTabs->currentTab()) { - /* ### MOUSE-MOVE-EVENT -> m_pWndTabs ### */ + /* ### MOUSE-MOVE-EVENT -> m_pWndTabs ### */ if (m_pWndTabs->rect().contains(e->pos())) { m_pWndTabs->mouseMoveEvent(e); goto sartelo; } - + /* ### MOUSE-MOVE-EVENT -> m_pWndBody ### */ if (m_pWndBody->rect().contains(e->pos())) { if (m_pWndBody->rctWriteIcon().contains(e->pos())) { @@ -779,26 +779,26 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e) } } /* ### END ### */ - + sartelo: update(); - + } if(m_bDragging) { setCursor(Qt::SizeAllCursor); - + int w = m_wndRect.width(); int h = m_wndRect.height(); - + m_wndRect.setX( m_pntPos.x() + cursor().pos().x() - m_pntDrag.x() ); m_wndRect.setY( m_pntPos.y() + cursor().pos().y() - m_pntDrag.y() ); - + m_wndRect.setWidth(w); m_wndRect.setHeight(h); - + setGeometry(m_wndRect); - + return; } else if (m_bResizing) { resize(e->pos()); @@ -863,15 +863,15 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e) { m_pWndBody->setWriteIcon(WDG_ICON_CLICKED); showLineEdit(!(m_pLineEdit->isVisible())); - } - + } + if(m_pWndBody->rctPrevIcon().contains(e->pos()) && m_pWndBody->prevIconState()!=WDG_ICON_OFF) { m_bPrevDown = true; m_pWndBody->setPrevIcon(WDG_ICON_CLICKED); prevButtonClicked(); } - + if(m_pWndBody->rctNextIcon().contains(e->pos()) && m_pWndBody->nextIconState()!=WDG_ICON_OFF) { m_bNextDown = true; @@ -879,14 +879,14 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e) nextButtonClicked(); } } - goto sartelo; + goto sartelo; } if(bWasBlinkOn) goto sartelo; else return; - + sartelo: update(); - + } void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e) @@ -911,23 +911,23 @@ void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e) } if(m_pWndBorder->captionRect().contains(e->pos())) { - + if(m_pWndBorder->closeRect().contains(e->pos())) { //debug ("hide now from release event"); hideNow(); } else { update(); } - + } if(m_pWndTabs->rect().contains(e->pos())) { m_pWndTabs->mouseReleaseEvent(e); } - + setCursor(-1); - + } void KviNotifierWindow::mouseDoubleClickEvent(QMouseEvent * e) @@ -937,12 +937,12 @@ void KviNotifierWindow::mouseDoubleClickEvent(QMouseEvent * e) QWidget::mouseDoubleClickEvent(e); return; } - + KviNotifierWindowTab * tab = m_pWndTabs->currentTab(); if(!tab)return; if(!tab->window())return; - + hideNow(); delayedRaise(tab->window()); } @@ -953,7 +953,7 @@ void KviNotifierWindow::keyPressEvent(QKeyEvent * e) m_bKeyShiftPressed = true; return; } - + if (e->key()==Qt::Key_Left && m_bKeyShiftPressed) { m_pWndTabs->prev(); return; @@ -962,9 +962,9 @@ void KviNotifierWindow::keyPressEvent(QKeyEvent * e) m_pWndTabs->next(); return; } - + if (e->key()==Qt::Key_Escape) { - hideNow(); + hideNow(); return; } } @@ -1007,7 +1007,7 @@ bool KviNotifierWindow::checkResizing(QPoint e) if (m_bLeftButtonIsPressed) { m_bResizing = true; m_whereResizing = WDG_UPSX; - } + } } else if (e.x() > (size().width()-WDG_BORDER_THICKNESS)) { //// UP RIGHT CORNER //// setCursor(Qt::SizeBDiagCursor); @@ -1052,7 +1052,7 @@ bool KviNotifierWindow::checkResizing(QPoint e) if (m_bLeftButtonIsPressed) { m_bResizing = true; m_whereResizing = WDG_SX; - } + } } else if (e.x() > (size().width()-WDG_BORDER_THICKNESS)) { //// RIGHT SIZE //// setCursor(Qt::SizeHorCursor); @@ -1080,7 +1080,7 @@ void KviNotifierWindow::resize(QPoint p, bool up) else m_wndRect.setLeft(cursor().pos().x()); } - + if (m_whereResizing == WDG_UPSX || m_whereResizing == WDG_UP || m_whereResizing == WDG_UPDX) { if (y()+height()-cursor().pos().y() < WDG_MIN_HEIGHT) m_wndRect.setTop(y() + height() - WDG_MIN_HEIGHT); @@ -1114,13 +1114,13 @@ void KviNotifierWindow::redrawWindow() m_pixBackground.resize(m_wndRect.size()); m_pixForeground.resize(m_wndRect.size()); m_pixBackgroundHighlighted.resize(m_wndRect.size()); - + m_pWndBorder->resize( m_wndRect.size() ); m_pWndTabs->setWidth( m_pWndBorder->tabsRect().width() ); m_pWndBody->resize( m_pWndBorder->bodyRect() ); m_pProgressBar->setHeight(m_pWndBorder->bodyRect().height() + m_pWndBorder->tabsRect().height()); } - + QPainter paint; if(m_bBlinkOn) { @@ -1146,7 +1146,7 @@ void KviNotifierWindow::redrawWindow() paint.end(); bitBlt(&m_pixForeground, 0,0, &m_pixBackground); } - + } inline void KviNotifierWindow::setCursor(int cur) diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 7a0f78b69..815fc442e 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -54,15 +54,15 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, QString label) m_pMessageList->setAutoDelete(true); m_bFocused = false; m_pCurrentMessage = 0; - - KviStr buffer; + + QString buffer; g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true); - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); cfg.setGroup("NotifierSkin"); m_clrHighlightedLabel = cfg.readColorEntry("HighlightedTabLablerColor",QColor(200,0,0)); m_clrNormalLabel = cfg.readColorEntry("NormalTabLablerColor",QColor(0,0,0)); m_clrChangedLabel = cfg.readColorEntry("ChangedTabLablerColor",QColor(0,0,100)); - + if(pWnd) { connect(pWnd,SIGNAL(windowNameChanged()),this,SLOT(labelChanged())); @@ -161,10 +161,10 @@ int KviNotifierWindowTab::width(bool b) { dx = g_pTabs->tabFocusedPixSx(); } else { sx = g_pTabs->tabUnfocusedPixSx(); - dx = g_pTabs->tabUnfocusedPixSx(); + dx = g_pTabs->tabUnfocusedPixSx(); font = g_pTabs->fontUnfocused(); } - + QFontMetrics fm(*font); width = fm.width(label())+2; if (!b) width += sx->width() + dx->width(); @@ -208,13 +208,13 @@ KviNotifierWindowTabs::~KviNotifierWindowTabs() void KviNotifierWindowTabs::initConfig() { - KviStr buffer; + QString buffer; g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true); - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); cfg.setGroup("NotifierSkin"); - + QString szFamily = cfg.readEntry("TextFontFocusedTab","Arial"); m_pFocusedFont = new QFont(szFamily,cfg.readIntEntry("TextFocusedFontSize",10)); m_pFocusedFont->setBold(true); @@ -252,7 +252,7 @@ void KviNotifierWindowTabs::loadImages() m_pixIconTabNext_clicked = *p; m_pixIconTabNext = m_pixIconTabNext_out; - + if((p = g_pIconManager->getPixmap("notifier_icon_tab_prev_out.png"))) m_pixIconTabPrev_out = *p; if((p = g_pIconManager->getPixmap("notifier_icon_tab_prev_over.png"))) @@ -292,7 +292,7 @@ void KviNotifierWindowTabs::addMessage(KviWindow * pWnd, KviNotifierMessage * me } tab->appendMessage(message); - + if((g_pNotifierWindow->state()==Hidden) || (!m_pTabFocused)) { setFocusOn(tab); @@ -307,7 +307,7 @@ void KviNotifierWindowTabs::resize(QRect r) m_rct.setY(r.y()); m_rct.setHeight(r.height()); setWidth(r.width()); - + recalculatePositions(); } @@ -334,35 +334,35 @@ void KviNotifierWindowTabs::recalculatePositions() m_rctNextIcon.setWidth(m_pixIconTabNext.width()); m_rctNextIcon.setHeight(m_pixIconTabNext.height()); } - + if (m_bIsOverLeftBound) { m_rctPrevIcon.setX(m_rct.x()); m_rctPrevIcon.setY(m_rct.y()); m_rctPrevIcon.setWidth(m_pixIconTabPrev.width()); m_rctPrevIcon.setHeight(m_pixIconTabPrev.height()); } - + int tmpX, tmpWidth; - + tmpWidth = m_rctCloseTabIcon.x() - m_rct.x(); - + if (m_bIsOverRightBound) { tmpWidth -= m_rctNextIcon.width(); } - + if (m_bIsOverLeftBound) { tmpWidth -= m_rctPrevIcon.width(); tmpX = m_rct.x() + m_rctPrevIcon.width(); } else { tmpX = m_rct.x(); } - + m_rctTabs.setX(tmpX); m_rctTabs.setY(m_rct.y()); - + m_rctTabs.setWidth(tmpWidth); m_rctTabs.setHeight(m_rct.height()); - + needToRedraw(); } @@ -374,25 +374,25 @@ void KviNotifierWindowTabs::prev() KviPointerListIterator tabIterator (m_tabPtrList); tab = m_tabMap[m_pTabFocused->wnd()]; - + tabIterator.moveFirst(); - + while ((tabIterator.current()) != tab) { ++tabIterator; } - + if (!tabIterator.moveFirst()) { --tabIterator; tab = tabIterator.current(); setFocusOn(tab); } - + } void KviNotifierWindowTabs::next() { if(!m_pTabFocused)return; - + KviNotifierWindowTab * tab; KviPointerListIterator tabIterator (m_tabPtrList); @@ -401,7 +401,7 @@ void KviNotifierWindowTabs::next() while ((tabIterator.current()) != tab) { ++tabIterator; } - + if (!tabIterator.moveLast()) { ++tabIterator; tab = tabIterator.current(); @@ -416,7 +416,7 @@ void KviNotifierWindowTabs::mousePressEvent(QMouseEvent * e) if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) { return; } - + if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) { return; } @@ -456,7 +456,7 @@ void KviNotifierWindowTabs::mouseReleaseEvent(QMouseEvent * e) scrollTabsLeft(); return; } - + if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) { scrollTabsRight(); return; @@ -470,7 +470,7 @@ void KviNotifierWindowTabs::mouseReleaseEvent(QMouseEvent * e) g_pNotifierWindow->update(); } } - + } void KviNotifierWindowTabs::scrollTabsLeft() @@ -517,7 +517,7 @@ void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab) if(m_pTabFocused)m_pTabFocused->setFocused(); m_lastVisitedTabPtrList.removeRef(tab); - + m_lastVisitedTabPtrList.insert(0, tab); needToRedraw(); @@ -539,15 +539,15 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->setFont(tmpFont); QString str; - + bool isBigger = false; int offset = 0; - + int closeIcon_X = m_rct.width() - m_rctCloseTabIcon.width(); int nextIcon_X = closeIcon_X - m_pixIconTabNext_out.width(); int prevIcon_X = m_rct.x(); - + int tmpTabsWidth = 0; m_pPainter->drawPixmap(0,0,m_pixSX); @@ -555,30 +555,30 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->drawTiledPixmap(m_pixSX.width(),0,m_rct.width()-m_pixSX.width()-m_pixDX.width(),m_rct.height(),m_pixBKG); KviPointerListIterator tabIterator (m_tabPtrList); - + //m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]); // QMap::Iterator tab; KviNotifierWindowTab * tab; //for (tab = m_tabMap.begin(); tab != m_tabMap.end() && !isBigger; tab++ ) tabIterator.moveFirst(); - + int i = 0; while(m_iTabToStartFrom!=i) { i++; ++tabIterator; } - + while ( ((tab = tabIterator.current()) != 0) && !isBigger) { ++tabIterator; - + if (tab->focused()) { m_pPainter->setFont(*m_pFocusedFont); tab->setRect(m_rct.x() + offset, m_rctTabs.y(), tab->width(), m_rctTabs.height()); - + m_pPainter->drawPixmap(offset,0,m_pixSXFocused); m_pPainter->drawTiledPixmap(offset+m_pixSXFocused.width(),0,tab->width(true),m_rctTabs.height(),m_pixBKGFocused); m_pPainter->drawPixmap(offset+m_pixSXFocused.width()+tab->width(true),0,m_pixDXFocused); @@ -602,7 +602,7 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->setPen(tmpP); offset += tab->width(); } - + if (offset > m_rctTabs.width()) isBigger = true; else isBigger = false; } @@ -625,7 +625,7 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->drawPixmap(closeIcon_X, 0, m_pixIconCloseTab); m_pPainter->end(); - + p->drawPixmap(m_rct.x(), m_rct.y(), *m_pPixmap, 0, 0, m_pPixmap->width(), m_pPixmap->height()); m_bNeedToRedraw = false; @@ -637,13 +637,13 @@ void KviNotifierWindowTabs::markAllMessagesAsHistoric() QMap::Iterator tab; // Iterating every tab for (tab = m_tabMap.begin(); tab != m_tabMap.end(); ++tab) { - + if (!tab.value()) break; - + KviPointerList * tmpMessageList = tab.value()->messageList(); - + if (!tmpMessageList) break; - + for(KviNotifierMessage * m = tmpMessageList->last(); m; m = tmpMessageList->prev()) { if(m->historic()) break;; m->setHistoric(); @@ -673,7 +673,7 @@ void KviNotifierWindowTabs::closeCurrentTab() KviWindow * pWnd = pTab->wnd(); if (!m_tabMap.contains(pWnd)) return; // The current tab is not on the map??? Call 911!! // End paranoic stuff, go back to sanity... - + closeTab(pWnd, pTab); } @@ -684,20 +684,20 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT m_lastVisitedTabPtrList.removeRef(pTab); m_tabMap.remove(pWnd); delete pTab; - + if(m_tabMap.empty()) { m_pTabFocused = 0; g_pNotifierWindow->showLineEdit(false); g_pNotifierWindow->doHide(false); } else { - + if (m_lastVisitedTabPtrList.count()) { m_pTabFocused = m_lastVisitedTabPtrList.first(); } else { m_pTabFocused = m_tabPtrList.last(); } - + m_pTabFocused->setFocused(true); } } diff --git a/src/modules/objects/class_listview.h b/src/modules/objects/class_listview.h index bfccbdd78..21c693d84 100644 --- a/src/modules/objects/class_listview.h +++ b/src/modules/objects/class_listview.h @@ -27,7 +27,6 @@ //================================================================================= #include "kvi_tal_listview.h" -#include "kvi_draganddrop.h" #include "class_widget.h" #include "class_listviewitem.h" diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index c6979a095..ad338abb5 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -35,7 +35,6 @@ #include "kvi_fileutils.h" #include "kvi_filedialog.h" #include "kvi_kvs_useraction.h" -#include "kvi_draganddrop.h" #include "kvi_tal_tooltip.h" #include diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index 335bb71a2..fc3be38e6 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -131,7 +131,7 @@ m_ti.clear(); - KviValueList ret; + QList ret; if (!qvalueListIntRetIntDCOPCall("KTorrent", "getTorrentNumbers(int)", ret, 0)) ERROR_RET_VOID -- cgit v1.3.1-10-gc9f91