diff options
Diffstat (limited to 'src/modules')
42 files changed, 135 insertions, 142 deletions
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index 2faa36fd5..a731ab104 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -55,7 +55,7 @@ static bool action_kvs_cmd_list(KviKvsModuleCommandCall * c) { KviWindow * pOut = c->window(); - QDictIterator<KviAction> it(*(KviActionManager::instance()->actions())); + KviDictIterator<KviAction> it(*(KviActionManager::instance()->actions())); while(KviAction * a = it.current()) { if(a->isKviUserActionNeverOverrideThis()) diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 81ba38956..5bd001497 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -322,7 +322,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) g->setColStretch(1,1); - QDictIterator<KviActionCategory> it(*(KviActionManager::instance()->categories())); + KviDictIterator<KviActionCategory> it(*(KviActionManager::instance()->categories())); while(KviActionCategory * ac = it.current()) { m_pCategoryCombo->insertItem(ac->visibleName() + " (" + ac->name() + ")"); @@ -681,7 +681,7 @@ KviActionEditor::KviActionEditor(QWidget * par) KviActionEditorListViewItem * last = 0; KviActionEditorListViewItem * first = 0; - QDictIterator<KviAction> it(*(KviActionManager::instance()->actions())); + KviDictIterator<KviAction> it(*(KviActionManager::instance()->actions())); while(KviAction * a = it.current()) { if(a->isKviUserActionNeverOverrideThis()) diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 2095bf216..465402ca0 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -135,10 +135,10 @@ static bool addon_kvs_fnc_version(KviKvsModuleFunctionCall * c) static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c) { - QDict<KviKvsScriptAddon> * da = KviKvsScriptAddonManager::instance()->addonDict(); + KviDict<KviKvsScriptAddon> * da = KviKvsScriptAddonManager::instance()->addonDict(); int cnt = 0; - QDictIterator<KviKvsScriptAddon> it(*da); + KviDictIterator<KviKvsScriptAddon> it(*da); while(KviKvsScriptAddon * a = it.current()) { c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("%cAddon id %Q, version %Q%c"),KVI_TEXT_BOLD,&(a->name()),&(a->version()),KVI_TEXT_BOLD); diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index f5bb0e6ad..69f0241ac 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -250,9 +250,9 @@ KviScriptManagementDialog::~KviScriptManagementDialog() void KviScriptManagementDialog::fillListView() { m_pListView->clear(); - QDict<KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict(); + KviDict<KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict(); if(!d)return; - QDictIterator<KviKvsScriptAddon> it(*d); + KviDictIterator<KviKvsScriptAddon> it(*d); KviScriptAddonListViewItem * item; while(KviKvsScriptAddon * a = it.current()) { diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 454596f44..337324cc7 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -365,10 +365,10 @@ KviAliasNamespaceListViewItem * KviAliasEditor::createFullNamespaceItem(const QS void KviAliasEditor::oneTimeSetup() { - QDict<KviKvsScript> * a = KviKvsAliasManager::instance()->aliasDict(); + KviDict<KviKvsScript> * a = KviKvsAliasManager::instance()->aliasDict(); if(!a)return; - QDictIterator<KviKvsScript> it(*a); + KviDictIterator<KviKvsScript> it(*a); KviAliasListViewItem * item; while(it.current()) diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 0bb9ca207..a55449a4a 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -29,7 +29,6 @@ #include "kvi_channel.h" #include "kvi_locale.h" #include "kvi_topicw.h" -#include "kvi_datacontainer.h" #include "kvi_ircmask.h" #include "kvi_maskeditor.h" #include "kvi_ircurl.h" diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 87a251ebd..2a80ff0d0 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -173,10 +173,10 @@ void KviChannelsJoinWindow::fillListView() par = new QListViewItem(m_pListView,__tr2qs("Registered Channels")); par->setOpen(true); - QAsciiDict<KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviAsciiDict<KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); if(d) { - QAsciiDictIterator<KviRegisteredChannelList> it(*d); + KviAsciiDictIterator<KviRegisteredChannelList> it(*d); while(it.current()) { chld = new QListViewItem(par,it.currentKey()); diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp index 11da9a5a8..5942a0447 100644 --- a/src/modules/config/libkviconfig.cpp +++ b/src/modules/config/libkviconfig.cpp @@ -29,9 +29,9 @@ #include "kvi_app.h" #include "kvi_locale.h" -#include <qdict.h> +#include "kvi_dict.h" -static QDict<KviConfig> * g_pConfigDict = 0; +static KviDict<KviConfig> * g_pConfigDict = 0; static int g_iNextConfigId = 0; /* @@ -107,7 +107,7 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c) if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile; else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true); - QDictIterator<KviConfig> it(*g_pConfigDict); + KviDictIterator<KviConfig> it(*g_pConfigDict); while(it.current()) { if(KviQString::equalCI(it.current()->fileName(),szAbsFile)) @@ -163,7 +163,7 @@ static bool config_kvs_fnc_id(KviKvsModuleFunctionCall * c) if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile; else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true); - QDictIterator<KviConfig> it(*g_pConfigDict); + KviDictIterator<KviConfig> it(*g_pConfigDict); while(it.current()) { if(KviQString::equalCI(it.current()->fileName(),szAbsFile)) @@ -489,7 +489,7 @@ static bool config_kvs_fnc_filelist(KviKvsModuleFunctionCall * c) KviKvsArray* pArray = new KviKvsArray(); int id=0; - QDictIterator<KviConfig> it(*g_pConfigDict); + KviDictIterator<KviConfig> it(*g_pConfigDict); while(it.current()) { pArray->set(id++, new KviKvsVariant(it.currentKey())); @@ -830,7 +830,7 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c) static bool config_module_init(KviModule * m) { - g_pConfigDict = new QDict<KviConfig>; + g_pConfigDict = new KviDict<KviConfig>; g_pConfigDict->setAutoDelete(true); KVSM_REGISTER_FUNCTION(m,"open",config_kvs_fnc_open); diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index fa286d587..221084dae 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -58,7 +58,7 @@ KviDccBroker::KviDccBroker() m_pDccWindowList = new KviPtrList<KviWindow>; m_pDccWindowList->setAutoDelete(false); - m_pZeroPortTags = new QDict<KviDccZeroPortTag>(17); + m_pZeroPortTags = new KviDict<KviDccZeroPortTag>(17); m_pZeroPortTags->setAutoDelete(true); } diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h index 283e3862e..5bac15613 100644 --- a/src/modules/dcc/broker.h +++ b/src/modules/dcc/broker.h @@ -29,7 +29,7 @@ #include "kvi_list.h" #include "kvi_sparser.h" -#include <qdict.h> +#include "kvi_dict.h" #include <qdatetime.h> #include <qobject.h> @@ -58,7 +58,7 @@ public: protected: KviPtrList<KviDccBox> * m_pBoxList; KviPtrList<KviWindow> * m_pDccWindowList; - QDict<KviDccZeroPortTag> * m_pZeroPortTags; + KviDict<KviDccZeroPortTag> * m_pZeroPortTags; public: KviDccZeroPortTag * addZeroPortTag(); KviDccZeroPortTag * findZeroPortTag(const QString &szTag); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 94e0350f6..608859677 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -337,9 +337,12 @@ void KviDccChat::ownMessage(const QString &text) } break; default: // also case KviCryptEngine::EncryptError + { + QString szErr = cryptSessionInfo()->pEngine->lastError(); output(KVI_OUT_SYSTEMERROR, - __tr2qs_ctx("The crypto engine was not able to encrypt the current message (%Q): %s, no data was sent to the remote end","dcc"), - &text,cryptSessionInfo()->pEngine->lastError()); + __tr2qs_ctx("The crypto engine was not able to encrypt the current message (%Q): %Q, no data was sent to the remote end","dcc"), + &text,&szErr); + } break; } return; @@ -437,9 +440,12 @@ bool KviDccChat::event(QEvent *e) break; default: // also case KviCryptEngine::DecryptError + { + QString szErr = cinf->pEngine->lastError(); output(KVI_OUT_SYSTEMERROR, - __tr2qs_ctx("The following message appears to be encrypted, but the crypto engine failed to decode it: %s","dcc"), - cinf->pEngine->lastError()); + __tr2qs_ctx("The following message appears to be encrypted, but the crypto engine failed to decode it: %Q","dcc"), + &szErr); + } break; } } diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h index 0b7c12c23..c123d98f1 100644 --- a/src/modules/dcc/voice.h +++ b/src/modules/dcc/voice.h @@ -315,7 +315,7 @@ public: ~KviVoiceConference(); public: KviPtrList<KviVoiceLink> * m_pLinks; - QDict<KviVoiceLink> * + KviDict<KviVoiceLink> * SOCKET m_hUdpSocket; QString m_szLastError; diff --git a/src/modules/dockwidget/libkvidockwidget.cpp b/src/modules/dockwidget/libkvidockwidget.cpp index 79e7ea223..9a4775918 100644 --- a/src/modules/dockwidget/libkvidockwidget.cpp +++ b/src/modules/dockwidget/libkvidockwidget.cpp @@ -86,7 +86,7 @@ #endif #endif -extern KVIRC_API QAsciiDict<KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviAsciiDict<KviWindow> * g_pGlobalWindowDict; static KviPtrList<KviDockWidget> * g_pDockWidgetList = 0; static QPixmap * g_pDock1 = 0; @@ -377,7 +377,7 @@ void KviDockWidget::doAway(int id) { if(id<0) { - QAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -422,7 +422,7 @@ void KviDockWidget::fillContextPopup() int iSeparator=m_pAwayPopup->insertSeparator(); - QAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); bool bAllAway=1; bool bAllUnaway=1; int iNetCount=0; diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index 89b5cbd23..8e5e2ccf3 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -105,7 +105,7 @@ static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c) if(d) { - QDict<QVariant> dict(17,true); + KviDict<QVariant> dict(17,true); dict.setAutoDelete(true); QString dummy; dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',dummy))); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 7b41463a1..7db099ab6 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -60,7 +60,7 @@ #include <qstringlist.h> -#include <qdict.h> +#include "kvi_dict.h" #include <qapplication.h> @@ -337,7 +337,7 @@ void Index::writeDict() { - QDictIterator<Entry> it( dict ); + KviDictIterator<Entry> it( dict ); QFile f( dictFile ); @@ -600,7 +600,7 @@ QStringList Index::getWildcardTerms( const QString &term ) - QDictIterator<Entry> it( dict ); + KviDictIterator<Entry> it( dict ); for( ; it.current(); ++it ) { diff --git a/src/modules/help/index.h b/src/modules/help/index.h index 00602f1a6..10b65e532 100755 --- a/src/modules/help/index.h +++ b/src/modules/help/index.h @@ -30,7 +30,7 @@ #define INDEX_H #include <qstringlist.h> -#include <qdict.h> +#include "kvi_dict.h" #include <qdatastream.h> #include <qobject.h> @@ -97,8 +97,8 @@ private: void buildMiniDict( const QString& ); QStringList docList; QStringList titleList; - QDict<Entry> dict; - QDict<PosEntry> miniDict; + KviDict<Entry> dict; + KviDict<PosEntry> miniDict; uint wordNum; QString docPath; QString dictFile, docListFile; diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index eab8608b0..37bb9a251 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -58,13 +58,13 @@ KviHttpFileTransfer::KviHttpFileTransfer() m_pHttpRequest = new KviHttpRequest(); - connect(m_pHttpRequest,SIGNAL(status(const char *)),this,SLOT(statusMessage(const char *))); + connect(m_pHttpRequest,SIGNAL(status(const QString &)),this,SLOT(statusMessage(const QString &))); connect(m_pHttpRequest,SIGNAL(terminated(bool)),this,SLOT(transferTerminated(bool))); - connect(m_pHttpRequest,SIGNAL(header(QAsciiDict<KviStr> *)),this,SLOT(headersReceived(QAsciiDict<KviStr> *))); - connect(m_pHttpRequest,SIGNAL(resolvingHost(const char *)),this,SLOT(resolvingHost(const char *))); + connect(m_pHttpRequest,SIGNAL(header(KviAsciiDict<KviStr> *)),this,SLOT(headersReceived(KviAsciiDict<KviStr> *))); + connect(m_pHttpRequest,SIGNAL(resolvingHost(const QString &)),this,SLOT(resolvingHost(const char *))); connect(m_pHttpRequest,SIGNAL(requestSent(const QStringList &)),this,SLOT(requestSent(const QStringList &))); - connect(m_pHttpRequest,SIGNAL(contactingHost(const char *)),this,SLOT(contactingHost(const char *))); - connect(m_pHttpRequest,SIGNAL(receivedResponse(const char *)),this,SLOT(receivedResponse(const char *))); + connect(m_pHttpRequest,SIGNAL(contactingHost(const QString &)),this,SLOT(contactingHost(const QString &))); + connect(m_pHttpRequest,SIGNAL(receivedResponse(const QString &)),this,SLOT(receivedResponse(const QString &))); connect(m_pHttpRequest,SIGNAL(connectionEstabilished()),this,SLOT(connectionEstabilished())); m_eGeneralStatus = Initializing; @@ -387,19 +387,19 @@ void KviHttpFileTransfer::connectionEstabilished() displayUpdate(); } -void KviHttpFileTransfer::resolvingHost(const char *hostname) +void KviHttpFileTransfer::resolvingHost(const QString &hostname) { m_szStatusString = __tr2qs_ctx("Resolving host %1","http").arg(hostname); displayUpdate(); } -void KviHttpFileTransfer::contactingHost(const char *ipandport) +void KviHttpFileTransfer::contactingHost(const QString &ipandport) { m_szStatusString = __tr2qs_ctx("Contacting host %1","http").arg(ipandport); displayUpdate(); } -void KviHttpFileTransfer::receivedResponse(const char * response) +void KviHttpFileTransfer::receivedResponse(const QString &response) { m_lHeaders.clear(); m_lHeaders.append(response); @@ -409,11 +409,11 @@ void KviHttpFileTransfer::receivedResponse(const char * response) displayUpdate(); } -void KviHttpFileTransfer::statusMessage(const char *txt) +void KviHttpFileTransfer::statusMessage(const QString &txt) { KviWindow * out = transferWindow(); if(out && (!m_bNoOutput)) - out->output(KVI_OUT_GENERICSTATUS,"[HTTP %d]: %s",id(),txt); + out->output(KVI_OUT_GENERICSTATUS,"[HTTP %d]: %Q",id(),&txt); } void KviHttpFileTransfer::transferTerminated(bool bSuccess) @@ -461,13 +461,13 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess) } } -void KviHttpFileTransfer::headersReceived(QAsciiDict<KviStr> *h) +void KviHttpFileTransfer::headersReceived(KviAsciiDict<KviStr> *h) { if(!h)return; KviWindow * out = transferWindow(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[HTTP %d]: Response headers:","http"),id()); - QAsciiDictIterator<KviStr> it(*h); + KviAsciiDictIterator<KviStr> it(*h); while(KviStr * s = it.current()) { QString szHeader = it.currentKey(); diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h index 6c437b145..837e25e12 100644 --- a/src/modules/http/httpfiletransfer.h +++ b/src/modules/http/httpfiletransfer.h @@ -85,14 +85,14 @@ public: virtual QString tipText(); virtual QString localFileName(); protected slots: - void statusMessage(const char * txt); + void statusMessage(const QString &txt); void transferTerminated(bool bSuccess); - void headersReceived(QAsciiDict<KviStr> *h); + void headersReceived(KviAsciiDict<KviStr> *h); void requestSent(const QStringList &sl); - void resolvingHost(const char * hostname); - void contactingHost(const char * ipandport); - void receivedResponse(const char * response); + void resolvingHost(const QString &hostname); + void contactingHost(const QString &ipandport); + void receivedResponse(const QString &response); void connectionEstabilished(); void abort(); diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp index f1f8035f5..3e7d3f7be 100644 --- a/src/modules/logview/libkvilogview.cpp +++ b/src/modules/logview/libkvilogview.cpp @@ -66,7 +66,7 @@ static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c) KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",LOGVIEW_MODULE_EXTENSION_NAME); if(d) { - QDict<QVariant> dict(17,true); + KviDict<QVariant> dict(17,true); dict.setAutoDelete(true); QString dummy; dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',dummy))); diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index cfca847f5..0af12203b 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -216,7 +216,7 @@ void KviRemoteMircServerImportWizard::start() m_pRequest = new KviHttpRequest(); connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(getListTerminated(bool))); - connect(m_pRequest,SIGNAL(status(const char *)),this,SLOT(getListMessage(const char *))); + connect(m_pRequest,SIGNAL(status(const QString &)),this,SLOT(getListMessage(const QString &))); QString szTmp; g_pApp->getTmpFileName(szTmp,"servers.ini"); @@ -230,7 +230,7 @@ void KviRemoteMircServerImportWizard::start() } } -void KviRemoteMircServerImportWizard::getListMessage(const char * message) +void KviRemoteMircServerImportWizard::getListMessage(const QString &message) { if(message)m_pOutput->setText(message); } diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h index 90f8ed304..d388ebb69 100644 --- a/src/modules/mircimport/libkvimircimport.h +++ b/src/modules/mircimport/libkvimircimport.h @@ -74,7 +74,7 @@ protected: virtual void done(int r); void start(); protected slots: - void getListMessage(const char * message); + void getListMessage(const QString &message); void getListTerminated(bool bSuccess); void pageSelected(const QString &title); }; diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index ca90264a9..358de42a4 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -403,7 +403,7 @@ static bool objects_kvs_fnc_variables(KviKvsModuleFunctionCall * c) c->warning(__tr2qs("Object does not exists"));
return true;
}
- QDictIterator<KviKvsVariant> it(* ob->dataContainer()->dict());
+ KviDictIterator<KviKvsVariant> it(* ob->dataContainer()->dict());
KviKvsHash* pHash = new KviKvsHash();
c->returnValue()->setHash(pHash);
while(KviKvsVariant * t = it.current())
@@ -444,7 +444,7 @@ static bool objects_kvs_fnc_classAllHandlers(KviKvsModuleFunctionCall * c) return true;
}
- QDictIterator<KviKvsObjectFunctionHandler> it(* pClass->getHandlers());
+ KviDictIterator<KviKvsObjectFunctionHandler> it(* pClass->getHandlers());
KviKvsHash* pHash = new KviKvsHash();
c->returnValue()->setHash(pHash);
while(KviKvsObjectFunctionHandler * t = it.current())
@@ -480,8 +480,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c) KviKvsArray * pArry = new KviKvsArray();
c->returnValue()->setArray(pArry);
int uIdx=0;
- QDictIterator<KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict());
- QDict<bool> *classdict=new QDict<bool>;
+ KviDictIterator<KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict());
+ KviDict<bool> *classdict=new KviDict<bool>;
classdict->setAutoDelete(false);
bool bFake=true;
while(KviKvsObjectClass * pClass=it.current())
@@ -503,7 +503,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c) KviKvsArray* pArray = new KviKvsArray();
c->returnValue()->setArray(pArray);
int idx=0;
- QDictIterator<bool> strIt(*classdict);
+ KviDictIterator<bool> strIt(*classdict);
while(strIt.current())
{
pArray->set(idx,new KviKvsVariant(strIt.currentKey()));
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 0c17d26cd..032b70a8e 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -52,7 +52,7 @@ //extern KviModule * g_pOptionsModule; -extern QDict<KviOptionsDialog> * g_pOptionsDialogDict; +extern KviDict<KviOptionsDialog> * g_pOptionsDialogDict; extern KVIRC_API KviApp * g_pApp; extern KviOptionsInstanceManager * g_pOptionsInstanceManager; diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index ec8d12ebf..7af9111ff 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -38,10 +38,10 @@ #include "dialog.h" #include <qsplitter.h> -#include <qdict.h> +#include "kvi_dict.h" -QDict<KviOptionsDialog> * g_pOptionsDialogDict = 0; +KviDict<KviOptionsDialog> * g_pOptionsDialogDict = 0; KviOptionsInstanceManager * g_pOptionsInstanceManager = 0; @@ -280,7 +280,7 @@ static bool options_module_init(KviModule * m) KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit); KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog); - g_pOptionsDialogDict = new QDict<KviOptionsDialog>; + g_pOptionsDialogDict = new KviDict<KviOptionsDialog>; g_pOptionsDialogDict->setAutoDelete(false); return true; @@ -288,7 +288,7 @@ static bool options_module_init(KviModule * m) static bool options_module_cleanup(KviModule *m) { - QDictIterator<KviOptionsDialog> it(*g_pOptionsDialogDict); + KviDictIterator<KviOptionsDialog> it(*g_pOptionsDialogDict); KviPtrList<KviOptionsDialog> l; l.setAutoDelete(false); KviOptionsDialog * d; diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index b95ef2ae0..932c125ac 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -59,7 +59,7 @@ #include <qtooltip.h> #include <qvalidator.h> #include <qmessagebox.h> -#include <qasciidict.h> +#include "kvi_asciidict.h" #include <qcombobox.h> #include <qbuttongroup.h> #include <qmessagebox.h> @@ -1288,7 +1288,7 @@ void KviServerOptionsWidget::fillServerList() KviServerOptionsListViewItem * srv; KviServerOptionsListViewItem * cur = 0; - QDictIterator<KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict())); + KviDictIterator<KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict())); while(KviIrcServerDataBaseRecord * r = it.current()) { diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index a815494da..ae6de5494 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -141,7 +141,7 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent) { createLayout(2,2); - QDictIterator<KviTextIcon> it(*(g_pTextIconManager->textIconDict())); + KviDictIterator<KviTextIcon> it(*(g_pTextIconManager->textIconDict())); m_pTable = new QTable(g_pTextIconManager->textIconDict()->count(),2,this); diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index cb3b9c826..308b4a8d8 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_variant.h" #include "kvi_userinput.h" -#include <qdict.h> +#include "kvi_dict.h" #ifdef DEBUG #undef DEBUG @@ -295,7 +295,7 @@ bool KviPerlInterpreter::execute( return true; } -static QDict<KviPerlInterpreter> * g_pInterpreters = 0; +static KviDict<KviPerlInterpreter> * g_pInterpreters = 0; static KviPerlInterpreter * perlcore_get_interpreter(const QString &szContextName) { @@ -322,7 +322,7 @@ static void perlcore_destroy_interpreter(const QString &szContextName) static void perlcore_destroy_all_interpreters() { - QDictIterator<KviPerlInterpreter> it(*g_pInterpreters); + KviDictIterator<KviPerlInterpreter> it(*g_pInterpreters); while(it.current()) { @@ -376,7 +376,7 @@ static bool perlcore_module_ctrl(KviModule * m,const char * cmd,void * param) static bool perlcore_module_init(KviModule * m) { #ifdef COMPILE_PERL_SUPPORT - g_pInterpreters = new QDict<KviPerlInterpreter>(17,false); + g_pInterpreters = new KviDict<KviPerlInterpreter>(17,false); g_pInterpreters->setAutoDelete(false); return true; #else // !COMPILE_PERL_SUPPORT diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 36a9a28cd..496f34e47 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -46,7 +46,7 @@ #include <qlayout.h> #include <qlabel.h> #include <qtooltip.h> -#include <qasciidict.h> +#include "kvi_asciidict.h" #include <qpushbutton.h> #include <qvbox.h> @@ -1059,10 +1059,10 @@ void KviPopupEditor::oneTimeSetup() if(m_bOneTimeSetupDone)return; m_bOneTimeSetupDone = true; - const QDict<KviKvsPopupMenu> * a = KviKvsPopupManager::instance()->popupDict(); + const KviDict<KviKvsPopupMenu> * a = KviKvsPopupManager::instance()->popupDict(); if(!a)return; - QDictIterator<KviKvsPopupMenu> it(*a); + KviDictIterator<KviKvsPopupMenu> it(*a); KviMenuListViewItem * item; @@ -1247,7 +1247,7 @@ void KviPopupEditor::commit() KviMenuListViewItem * it = (KviMenuListViewItem *)m_pListView->firstChild(); // Copy the original popup dict - QDict<KviKvsPopupMenu> copy(*(KviKvsPopupManager::instance()->popupDict())); + KviDict<KviKvsPopupMenu> copy(*(KviKvsPopupManager::instance()->popupDict())); copy.setAutoDelete(false); while(it) @@ -1262,7 +1262,7 @@ void KviPopupEditor::commit() // the remaining elements in the copy need to be removed from // the "new" dictionary (they are no longer used) - QDictIterator<KviKvsPopupMenu> iter(copy); + KviDictIterator<KviKvsPopupMenu> iter(copy); while(iter.current()) { diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index e51101f58..9dfa88eb7 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -199,7 +199,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) int tot = 0; - QAsciiDictIterator<KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); + KviAsciiDictIterator<KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); while(KviRegisteredChannelList * l = it.current()) { for(KviRegisteredChannel * ch = l->first();ch;ch = l->next()) @@ -207,7 +207,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) tot++; c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Channel: %c%s@%s"), KVI_TEXT_BOLD,ch->name().ptr(),ch->netMask().ptr()); - QAsciiDictIterator<KviStr> pit(*(ch->propertyDict())); + KviAsciiDictIterator<KviStr> pit(*(ch->propertyDict())); while(KviStr * s = pit.current()) { c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" Property: %s=%s"),pit.currentKey(),s->ptr()); @@ -259,8 +259,8 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c) if(szChan.isEmpty())szChan="*"; if(szNetmask.isEmpty())szNetmask="*"; - QAsciiDict<KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); - QAsciiDictIterator<KviRegisteredChannelList> it(*d); + KviAsciiDict<KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviAsciiDictIterator<KviRegisteredChannelList> it(*d); while(KviRegisteredChannelList * l = it.current()) { diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index f196b6c26..7232885c6 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -43,7 +43,7 @@ #include <qlayout.h> #include <qlabel.h> #include <qheader.h> -#include <qasciidict.h> +#include "kvi_asciidict.h" #include <qimage.h> #include <qstring.h> #include <qcombobox.h> @@ -70,7 +70,7 @@ static KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase = 0; // local -KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,QDict<QString> * dict) +KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviDict<QString> * dict) : QDialog(p,"property_editor",true) { m_pPropertyDict = dict; @@ -136,7 +136,7 @@ void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e) void KviReguserPropertiesDialog::fillData() { m_pTable->setNumRows(m_pPropertyDict->count()); - QDictIterator<QString> it(*m_pPropertyDict); + KviDictIterator<QString> it(*m_pPropertyDict); int row = 0; while(it.current()) { @@ -312,7 +312,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste KviStringConversion::fromString(col,(*m_pCustomColor)); } - m_pPropertyDict = new QDict<QString>(17,false); + m_pPropertyDict = new KviDict<QString>(17,false); m_pPropertyDict->setAutoDelete(true); //setMinimumSize(400,450); @@ -510,7 +510,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste if(r->propertyDict()) { - QDictIterator<QString> it(*(r->propertyDict())); + KviDictIterator<QString> it(*(r->propertyDict())); while(QString *s = it.current()) { m_pPropertyDict->insert(it.currentKey(),new QString(*s)); @@ -629,7 +629,7 @@ void KviRegisteredUserEntryDialog::okClicked() m_pPropertyDict->remove("notify"); m_pPropertyDict->remove("avatar"); - QDictIterator<QString> it(*m_pPropertyDict); + KviDictIterator<QString> it(*m_pPropertyDict); while(QString *s = it.current()) { u->setProperty(it.currentKey(),*s); @@ -1056,8 +1056,8 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group) group->setName(text); g_pLocalRegisteredUserDataBase->groupDict()->insert(text,group); - QDict<KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict(); - QDictIterator<KviRegisteredUser> it(*d); + KviDict<KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict(); + KviDictIterator<KviRegisteredUser> it(*d); while(KviRegisteredUser * u = it.current()) { @@ -1080,8 +1080,8 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( QListViewItem * pIte { QPopupMenu *groups = new QPopupMenu; - QDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); - QDictIterator<KviRegisteredUserGroup> git(*pGroups); + KviDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); + KviDictIterator<KviRegisteredUserGroup> git(*pGroups); m_TmpDict.clear(); while(KviRegisteredUserGroup * g = git.current()) { @@ -1117,10 +1117,10 @@ void KviRegisteredUsersDialog::moveToGroupMenuClicked(int id) void KviRegisteredUsersDialog::fillList() { m_pListView->clear(); - QDict<KviRegisteredUsersGroupItem> groupItems(5,false); + KviDict<KviRegisteredUsersGroupItem> groupItems(5,false); - QDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); - QDictIterator<KviRegisteredUserGroup> git(*pGroups); + KviDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); + KviDictIterator<KviRegisteredUserGroup> git(*pGroups); while(KviRegisteredUserGroup * g = git.current()) { KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,g); @@ -1129,8 +1129,8 @@ void KviRegisteredUsersDialog::fillList() ++git; } - QDict<KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict(); - QDictIterator<KviRegisteredUser> it(*d); + KviDict<KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict(); + KviDictIterator<KviRegisteredUser> it(*d); KviRegisteredUsersDialogItem * item; while(KviRegisteredUser * u = it.current()) @@ -1361,11 +1361,11 @@ void KviRegisteredUsersDialog::exportClicked() if(u) { if(!f.save(szName))goto write_error; - QDict<QString> * pd = u->propertyDict(); + KviDict<QString> * pd = u->propertyDict(); if(pd) { if(!f.save(pd->count()))goto write_error; - QDictIterator<QString> it(*pd); + KviDictIterator<QString> it(*pd); while(it.current()) { QString key = it.currentKey(); diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h index 52e1493d1..1403d70a7 100644 --- a/src/modules/reguser/edituser.h +++ b/src/modules/reguser/edituser.h @@ -33,7 +33,7 @@ #include <qpushbutton.h> #include <qlistview.h> #include <qlistbox.h> -#include <qdict.h> +#include "kvi_dict.h" #include <qtabdialog.h> #include <qtable.h> #include <qpopupmenu.h> @@ -44,11 +44,11 @@ class KviReguserPropertiesDialog : public QDialog { Q_OBJECT public: - KviReguserPropertiesDialog(QWidget *p,QDict<QString> * dict); + KviReguserPropertiesDialog(QWidget *p,KviDict<QString> * dict); ~KviReguserPropertiesDialog(); protected: QTable * m_pTable; - QDict<QString> * m_pPropertyDict; + KviDict<QString> * m_pPropertyDict; QPushButton * m_pDelButton; QPushButton * m_pAddButton; protected: @@ -157,7 +157,7 @@ protected: KviPixmap * m_pAvatar; KviPixmapSelector * m_pAvatarSelector; - QDict<QString> * m_pPropertyDict; + KviDict<QString> * m_pPropertyDict; QCheckBox * m_pCustomColorCheck; QColor * m_pCustomColor; diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index 6c6871510..b6bb31ca4 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -519,8 +519,8 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c) int cnt = 0; - QDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - QDictIterator<KviRegisteredUser> it(*d); + KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviDictIterator<KviRegisteredUser> it(*d); while(KviRegisteredUser * u = it.current()) { @@ -575,8 +575,8 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c) int count = 0; - QDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - QDictIterator<KviRegisteredUser> it(*d); + KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviDictIterator<KviRegisteredUser> it(*d); while(KviRegisteredUser * u = it.current()) { KviPtrList<KviIrcMask> * ml = u->maskList(); @@ -594,10 +594,10 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c) } } - QDict<QString> * pd = u->propertyDict(); + KviDict<QString> * pd = u->propertyDict(); if(pd) { - QDictIterator<QString> pdit(*pd); + KviDictIterator<QString> pdit(*pd); while(pdit.current()) { QString key = pdit.currentKey(); @@ -725,8 +725,8 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c) // // KviStr list; // -// const QAsciiDict<KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict(); -// QAsciiDictIterator<KviRegisteredUserList> it(*d); +// const KviAsciiDict<KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict(); +// KviAsciiDictIterator<KviRegisteredUserList> it(*d); // while(KviRegisteredUserList * l = it.current()) // { // search_reguser_list(l,c->window(),parms->safeFirstParam(),list); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 4e6f4264b..bdd312aeb 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -618,18 +618,6 @@ void KviSetupWizard::chooseIncomingPath() } } -/* -void KviSetupWizard::directorySelected(const QString &szDir) -{ - KviStr szDirectory = szDir; - kvi_adjustFilePath(szDirectory); - szDirectory.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); - szDirectory.append(KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME); - szDirectory.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); - kvi_adjustFilePath(szDirectory); - m_pDirectoryEdit->setText(szDirectory.ptr()); -} -*/ void KviSetupWizard::makeLink() { diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp index 2b72826cf..88e9e08eb 100644 --- a/src/modules/sharedfile/libkvisharedfile.cpp +++ b/src/modules/sharedfile/libkvisharedfile.cpp @@ -36,7 +36,7 @@ #include <time.h> -#include <qasciidict.h> +#include "kvi_asciidict.h" extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; @@ -210,7 +210,7 @@ static bool sharedfile_kvs_cmd_clear(KviKvsModuleCommandCall * c) static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c) { - QDictIterator<KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict())); + KviDictIterator<KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict())); int idx = 0; diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp index dc774a4f7..e48d48000 100644 --- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp @@ -106,7 +106,7 @@ static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c) KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_SHARED_FILES_WINDOW_EXTENSION_NAME); if(d) { - QDict<QVariant> dict(17,true); + KviDict<QVariant> dict(17,true); dict.setAutoDelete(true); dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',"minimized"))); dict.replace("bNoRaise",new QVariant(c->hasSwitch('n',"noraise"))); diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 7d673aa3b..e80530938 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -287,7 +287,7 @@ void KviSharedFilesWindow::editClicked() void KviSharedFilesWindow::fillFileView() { m_pListView->clear(); - QDictIterator<KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict())); + KviDictIterator<KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict())); KviSharedFilesListViewItem * itm; diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index caa39ebc6..9f95e442b 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -83,7 +83,7 @@ KviSoundPlayer::KviSoundPlayer() m_pThreadList = new KviPtrList<KviSoundThread>; m_pThreadList->setAutoDelete(true); - m_pSoundSystemDict = new QDict<SoundSystemRoutine>(17,false); + m_pSoundSystemDict = new KviDict<SoundSystemRoutine>(17,false); m_pSoundSystemDict->setAutoDelete(true); #ifdef COMPILE_ON_WINDOWS @@ -134,7 +134,7 @@ KviSoundPlayer::~KviSoundPlayer() void KviSoundPlayer::getAvailableSoundSystems(QStringList *l) { - QDictIterator<SoundSystemRoutine> it(*m_pSoundSystemDict); + KviDictIterator<SoundSystemRoutine> it(*m_pSoundSystemDict); while(it.current()) { l->append(it.currentKey()); diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h index b3416a627..c1e52b778 100644 --- a/src/modules/snd/libkvisnd.h +++ b/src/modules/snd/libkvisnd.h @@ -31,7 +31,7 @@ #include "kvi_string.h" #include "kvi_list.h" -#include <qdict.h> +#include "kvi_dict.h" #include "kvi_options.h" //class KviWavSoundFileReader @@ -183,7 +183,7 @@ public: void setMuted(bool muted) {KVI_OPTION_BOOL(KviOption_boolMuteAllSounds)=muted;}; protected: KviPtrList<KviSoundThread> * m_pThreadList; - QDict<SoundSystemRoutine> * m_pSoundSystemDict; + KviDict<SoundSystemRoutine> * m_pSoundSystemDict; protected: void registerSoundThread(KviSoundThread * t); void unregisterSoundThread(KviSoundThread * t); diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp index b4483bea8..cca494b36 100644 --- a/src/modules/texticons/libkvitexticons.cpp +++ b/src/modules/texticons/libkvitexticons.cpp @@ -66,7 +66,7 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c) } else { KviKvsHash* hash = new KviKvsHash(); - QDictIterator<KviTextIcon> it(*(g_pTextIconManager->textIconDict())); + KviDictIterator<KviTextIcon> it(*(g_pTextIconManager->textIconDict())); while(KviTextIcon * i = it.current()) { diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp index 86b786f0e..776eb23a9 100644 --- a/src/modules/theme/themefunctions.cpp +++ b/src/modules/theme/themefunctions.cpp @@ -48,7 +48,7 @@ namespace KviThemeFunctions bool installThemePackage(const QString &szThemePackageFileName,QString &szError,QWidget * pDialogParent) { - QDict<QString> * pInfoFields; + KviDict<QString> * pInfoFields; QString * pValue; bool bInstall; QPixmap pix; diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp index 983ccbe84..66c66e571 100644 --- a/src/modules/toolbar/libkvitoolbar.cpp +++ b/src/modules/toolbar/libkvitoolbar.cpp @@ -359,7 +359,7 @@ static bool toolbar_kvs_fnc_list(KviKvsModuleFunctionCall * c) { KviKvsArray * a = new KviKvsArray(); - QDictIterator<KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors())); + KviDictIterator<KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors())); kvs_uint_t id = 0; @@ -550,7 +550,7 @@ static bool toolbar_kvs_fnc_items(KviKvsModuleFunctionCall * c) KviKvsArray * a = new KviKvsArray(); - QDictIterator<KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors())); + KviDictIterator<KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors())); kvs_uint_t id = 0; diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index df8efe6ab..49baaa6b4 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -41,7 +41,7 @@ #include "kvi_channel.h" #include "userwindow.h" -#include <qasciidict.h> +#include "kvi_asciidict.h" #include <qtimer.h> @@ -54,7 +54,7 @@ // kvi_app.cpp -extern KVIRC_API QAsciiDict<KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviAsciiDict<KviWindow> * g_pGlobalWindowDict; KviPtrList<KviUserWindow> * g_pUserWindowList = 0; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type @@ -830,7 +830,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts but no "no_context" windows bool bAllWindows = KviQString::equalCI(szType,"all"); - QAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -854,7 +854,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts and also "no_context" windows bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); - QAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -875,7 +875,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // only "no_context" windows bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); - QAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -920,7 +920,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); - QAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { |