diff options
Diffstat (limited to 'src/modules')
65 files changed, 229 insertions, 229 deletions
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 24da5a91b..b7ba364b6 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -30,7 +30,7 @@ #include "kvi_app.h" #include "KviFileUtils.h" #include "kvi_sourcesdate.h" -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #include "KviOsInfo.h" #include <QTextEdit> diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index 632daffcf..860775b2e 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -30,7 +30,7 @@ #include "KviParameterList.h" #include "KviCommandFormatter.h" #include "KviQString.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_iconmanager.h" #include "KviMircCntrl.h" diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 58941263c..c9edaa3a1 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -31,7 +31,7 @@ #include "KviQString.h" #include "KviParameterList.h" #include "KviCommandFormatter.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_iconmanager.h" #include "KviMircCntrl.h" diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index 6b9fef501..ff6f38952 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -380,7 +380,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c) szTmp.replace(" ","_"); // escape the spaces with the right octal code - KviServerParser::encodeCtcpParameter(szTmp.toUtf8().data(),avatar); + KviIrcServerParser::encodeCtcpParameter(szTmp.toUtf8().data(),avatar); } KviSharedFile * o = 0; diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index 6e174fde1..3338be28f 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -32,7 +32,7 @@ #include "kvi_console.h" #include "kvi_app.h" #include "KviIrcServer.h" -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "kvi_irccontext.h" #include "kvi_ircconnection.h" #include "kvi_ircconnectionserverinfo.h" diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 5d4c8c4f8..d0934cc0f 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -968,7 +968,7 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename t->m_uResumePosition = filePos; KviCString szBuffy; - KviServerParser::encodeCtcpParameter(filename,szBuffy); + KviIrcServerParser::encodeCtcpParameter(filename,szBuffy); dcc->ctcpMsg->msg->console()->connection()->sendFmtData( "PRIVMSG %s :%cDCC ACCEPT %s %s %u %s%c", diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index 4beb89436..c7524883d 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -39,7 +39,7 @@ #include "kvi_ircview.h" #include "kvi_iconmanager.h" #include "KviLocale.h" - #include "kvi_error.h" + #include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" #include "kvi_console.h" diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index f34a45579..5e8f6bcf1 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -37,7 +37,7 @@ #include "kvi_ircview.h" #include "kvi_iconmanager.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" #include "kvi_console.h" diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index b3ca78111..a2437ba2d 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -41,7 +41,7 @@ #include "KviNetUtils.h" #include "kvi_frame.h" #include "kvi_console.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_options.h" #include "kvi_defaults.h" #include "KviMircCntrl.h" diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 843eb1d83..0c3c28a00 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -26,7 +26,7 @@ #include "kvi_settings.h" #include "KviNetUtils.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_options.h" #include "KviLocale.h" #include "KviMemory.h" diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index d550c114c..60dd742f1 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -46,7 +46,7 @@ #include "KviNetUtils.h" #include "kvi_frame.h" #include "kvi_console.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_options.h" #include "kvi_defaults.h" #include "KviSharedFilesManager.h" diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 9aa155b74..9ea1dd74e 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -36,7 +36,7 @@ #include "kvi_ircview.h" #include "kvi_iconmanager.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" #include "kvi_console.h" @@ -1100,7 +1100,7 @@ void KviDccFileTransfer::startConnection() if(m_pDescriptor->bResume && m_pDescriptor->bRecvFile) { QString fName; - KviServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName); + KviIrcServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName); if(m_pDescriptor->isZeroPortRequest()) { m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC RESUME %s %s %s %s%c", @@ -1808,7 +1808,7 @@ void KviDccFileTransfer::connectionInProgress() if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores)) tmp.replace(" ","_"); - KviServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName); + KviIrcServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName); // Zero port requests want DCC SEND as back-request KviCString szReq; @@ -2143,7 +2143,7 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,quint6 m_pDescriptor->szFileSize.setNum(filePos); KviCString szBuffy; - KviServerParser::encodeCtcpParameter(filename,szBuffy); + KviIrcServerParser::encodeCtcpParameter(filename,szBuffy); m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC ACCEPT %s %s %u%c", m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(), diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp index 61cb2f1eb..e10113d8a 100644 --- a/src/modules/dcc/thread.cpp +++ b/src/modules/dcc/thread.cpp @@ -26,7 +26,7 @@ #include "kvi_debug.h" #include "kvi_window.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviMemory.h" #include "KviMemory.h" #include "KviNetUtils.h" diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp index d7cb7e65b..d5f02b2ee 100644 --- a/src/modules/dcc/video.cpp +++ b/src/modules/dcc/video.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_eventtriggers.h" #include "KviLocale.h" #include "kvi_out.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include "kvi_options.h" #include "kvi_console.h" diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index df84c9127..315ae0f05 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -33,7 +33,7 @@ #include "kvi_ircview.h" #include "KviLocale.h" #include "kvi_out.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include "kvi_options.h" #include "kvi_console.h" @@ -52,7 +52,7 @@ #include <unistd.h> #include <errno.h> #include <fcntl.h> - //#include "kvi_error.h" + //#include "KviError.h" #include <sys/stat.h> // for open() #include <sys/ioctl.h> // for ioctl() #endif diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 7e85774b5..2f7c69589 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "kvi_module.h" #include "kvi_modulemanager.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_app.h" #include "kvi_iconmanager.h" #include "kvi_console.h" diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp index 1abcba578..8b58da69d 100644 --- a/src/modules/http/libkvihttp.cpp +++ b/src/modules/http/libkvihttp.cpp @@ -30,7 +30,7 @@ #include "KviLocale.h" #include "kvi_filedialog.h" #include "kvi_window.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviCommandFormatter.h" static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback) diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 3b30d6a62..00444cf42 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -100,7 +100,7 @@ int KviMircServersIniImport::doImport(const QString& filename) if(entry.isEmpty())entry = __tr2qs("Standalone Servers"); if(!serv.isEmpty()) { - KviServer s; + KviIrcServer s; s.m_szHostname = serv; s.m_szDescription = description; s.m_uPort = uPort; @@ -350,7 +350,7 @@ static bool mircimport_module_can_unload(KviModule *) } /* -KVIMODULEEXPORTFUNC KviServerImport * mircimport_module_createIrcServerImport(const char *filterName) +KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName) { if(kvi_strEqualCI(filterName,__tr("Import from servers.ini"))) { diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index e65b6b1b9..539217a34 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -25,7 +25,7 @@ #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviFile.h" diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index dfa633eef..3c2aadf14 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -25,7 +25,7 @@ #include "class_buttongroup.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 656eebefc..6220c51c1 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -24,7 +24,7 @@ //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "class_checkbox.h" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 6624e9544..9718024a7 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -24,7 +24,7 @@ //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "kvi_debug.h" #include "class_list.h" diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp index c877c8e71..41a2f6e26 100644 --- a/src/modules/objects/class_datetimeedit.cpp +++ b/src/modules/objects/class_datetimeedit.cpp @@ -24,7 +24,7 @@ #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviFile.h" diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp index b8a665c71..bf9834a03 100644 --- a/src/modules/objects/class_dialog.cpp +++ b/src/modules/objects/class_dialog.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "class_dialog.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_frame.h" diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 2af376f64..0ffaeb329 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -27,7 +27,7 @@ #include "class_file.h" #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviFile.h" #include "KviFileUtils.h" #include "class_memorybuffer.h" diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index 08a946a5a..625633ff8 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "class_ftp.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 6633bbad6..c7e684de1 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -25,7 +25,7 @@ #include <KviTalGroupBox.h> #include "class_groupbox.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index a0b682963..f8db5efb3 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -25,7 +25,7 @@ #include "class_http.h" #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include <QHttp> diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 891cb6e63..821afc6b2 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "class_label.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index e1f570bfc..36f675dce 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_lcd.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 59b20760e..bddb38300 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "class_lineedit.h" diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp index a3e7819aa..19e698a28 100644 --- a/src/modules/objects/class_listwidget.cpp +++ b/src/modules/objects/class_listwidget.cpp @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "kvi_debug.h" #include "class_list.h" diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index c1a58580d..76d278c6d 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -25,7 +25,7 @@ #include "KviTalMainWindow.h" #include "class_mainwindow.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 22836afa7..d03322ece 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -25,7 +25,7 @@ #include "class_memorybuffer.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "kvi_settings.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index 85468613f..2d4b4c1d2 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -24,7 +24,7 @@ #include "class_menubar.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index cbb235efb..aefbc53a7 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "KviMemory.h" diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 0bc604595..e2a392b08 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -30,7 +30,7 @@ #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviMemory.h" #include <QPrintDialog> diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 6c1b78fa7..f9c87722c 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -26,7 +26,7 @@ #include "class_popupmenu.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index b150fa8af..7b8af14ba 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_process.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "kvi_settings.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index e88e9f8d1..31588f0ae 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_progressbar.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index e3287184f..442e32558 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_radiobutton.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index caca558a6..07dc6f82e 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_slider.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 6ef5cf3ea..c280b30b2 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -35,10 +35,10 @@ #include "KviFile.h" #include "KviFileUtils.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include "KviDnsResolver.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_socket.h" #include "KviMemory.h" #include "KviMemory.h" diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 3c27baa08..16d27b85e 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_spinbox.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp index c8862cb4a..b74825c49 100644 --- a/src/modules/objects/class_tablewidget.cpp +++ b/src/modules/objects/class_tablewidget.cpp @@ -29,7 +29,7 @@ #include "kvi_debug.h" #include "kvi_app.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviFile.h" #include "kvi_kvs_arraycast.h" diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 40041e02c..000f22b03 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_tabwidget.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index f781b68bd..b0fc19ab0 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -25,7 +25,7 @@ #include "class_tbrowser.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index b572bbb08..e3927da9d 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_toolbar.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviTalToolBar.h" #include "KviTalMainWindow.h" diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 4e44c8efa..3d1eb5fda 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_toolbutton.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/class_trayicon.cpp index 9f6b563ca..9463230ba 100644 --- a/src/modules/objects/class_trayicon.cpp +++ b/src/modules/objects/class_trayicon.cpp @@ -26,7 +26,7 @@ #include "class_popupmenu.h" #include "kvi_iconmanager.h" #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include <QSystemTrayIcon> diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index 1a0a21973..34e7bb837 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -25,7 +25,7 @@ #include "class_treewidget.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index 62e1a2b54..63922f1f5 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -26,7 +26,7 @@ #include "class_treewidgetitem.h" #include "class_pixmap.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index d6bda1561..32006fefe 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -28,7 +28,7 @@ #include "KviMemory.h" #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "kvi_iconmanager.h" #include "kvi_window.h" diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 9c1dfc57d..2988ff28a 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -25,7 +25,7 @@ #include "class_window.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index b2b5b2127..ab32cc9dd 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -26,7 +26,7 @@ #include <KviTalWizard.h> #include "class_wizard.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 926731fc3..d6f6b7262 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -25,7 +25,7 @@ #include "class_workspace.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 3c48afb82..d943621b6 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_wrapper.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 32014b689..87ebcba25 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -78,7 +78,7 @@ #include "kvi_app.h" #include "kvi_module.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviCommandFormatter.h" #include "kvi_out.h" #include "kvi_app.h" diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index 415d90a5a..f311d07d6 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -381,9 +381,9 @@ KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(QWidget * paren return new KviQueryOptionsWidget(parent); } -KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(QWidget * parent) +KviOptionsWidget * classKviIrcServerOptionsWidget_createInstanceProc(QWidget * parent) { - return new KviServerOptionsWidget(parent); + return new KviIrcServerOptionsWidget(parent); } KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(QWidget * parent) @@ -615,8 +615,8 @@ static const char * g_szName_KviProxyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_Kvi static const char * g_szClassName_KviProxyOptionsWidget = "KviProxyOptionsWidget"; static const char * g_szName_KviQueryOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget; static const char * g_szClassName_KviQueryOptionsWidget = "KviQueryOptionsWidget"; -static const char * g_szName_KviServerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviServerOptionsWidget; -static const char * g_szClassName_KviServerOptionsWidget = "KviServerOptionsWidget"; +static const char * g_szName_KviIrcServerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget; +static const char * g_szClassName_KviIrcServerOptionsWidget = "KviIrcServerOptionsWidget"; static const char * g_szName_KviSoundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget; static const char * g_szClassName_KviSoundOptionsWidget = "KviSoundOptionsWidget"; static const char * g_szName_KviSoundGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget; @@ -3085,36 +3085,36 @@ KviOptionsInstanceManager::KviOptionsInstanceManager() e0->pChildList = 0; e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviServerOptionsWidget_createInstanceProc; + e0->createProc = &classKviIrcServerOptionsWidget_createInstanceProc; e0->pWidget = 0; - e0->szClassName = g_szClassName_KviServerOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviServerOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviServerOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviServerOptionsWidget; + e0->szClassName = g_szClassName_KviIrcServerOptionsWidget; + e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget + e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget; #else e0->iPriority = 0; #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget; e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");; #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcServerOptionsWidget + e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcServerOptionsWidget; #else e0->szGroup = "general"; #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviServerOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcServerOptionsWidget + e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcServerOptionsWidget; #else e0->bIsContainer = false; #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviServerOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcServerOptionsWidget + e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcServerOptionsWidget; #else e0->bIsNotContained = false; #endif - e0->szNameNoLocale = g_szName_KviServerOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviServerOptionsWidget,"options"); + e0->szNameNoLocale = g_szName_KviIrcServerOptionsWidget; + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcServerOptionsWidget,"options"); m_pInstanceTree->append(e0); e0->pChildList = 0; diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index e742cfa9d..7439c5bf4 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -70,7 +70,7 @@ #include <QWindowsStyle> #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW -KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n) +KviIrcNetworkDetailsWidget::KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n) : QDialog(par) { setModal(true); @@ -381,13 +381,13 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n) } -KviNetworkDetailsWidget::~KviNetworkDetailsWidget() +KviIrcNetworkDetailsWidget::~KviIrcNetworkDetailsWidget() { if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor); if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor); } -void KviNetworkDetailsWidget::editNickServRule() +void KviIrcNetworkDetailsWidget::editNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem(); if(!it)return; @@ -402,7 +402,7 @@ void KviNetworkDetailsWidget::editNickServRule() } } -void KviNetworkDetailsWidget::addNickServRule() +void KviIrcNetworkDetailsWidget::addNickServRule() { KviNickServRule r; KviNickServRuleEditor ed(this,false); @@ -416,7 +416,7 @@ void KviNetworkDetailsWidget::addNickServRule() } } -void KviNetworkDetailsWidget::delNickServRule() +void KviIrcNetworkDetailsWidget::delNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem(); if(!it)return; @@ -424,7 +424,7 @@ void KviNetworkDetailsWidget::delNickServRule() enableDisableNickServControls(); } -void KviNetworkDetailsWidget::enableDisableNickServControls() +void KviIrcNetworkDetailsWidget::enableDisableNickServControls() { bool bEnabled = m_pNickServCheck->isChecked(); m_pNickServTreeWidget->setEnabled(bEnabled); @@ -434,7 +434,7 @@ void KviNetworkDetailsWidget::enableDisableNickServControls() m_pEditRuleButton->setEnabled(bEnabled); } -void KviNetworkDetailsWidget::fillData(KviNetwork * n) +void KviIrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) { n->setUserName(m_pUserEditor->text()); n->setPassword(m_pPassEditor->text()); @@ -497,7 +497,7 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n) } -KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s) +KviIrcServerDetailsWidget::KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s) : QDialog(par) { setModal(true); @@ -993,13 +993,13 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s) setHeaderLabelText(); } -KviServerDetailsWidget::~KviServerDetailsWidget() +KviIrcServerDetailsWidget::~KviIrcServerDetailsWidget() { if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor); if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor); } -void KviServerDetailsWidget::useIPV6CheckToggled(bool) +void KviIrcServerDetailsWidget::useIPV6CheckToggled(bool) { #ifdef COMPILE_IPV6_SUPPORT m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IPv6 : KviIpEditor::IPv4); @@ -1009,12 +1009,12 @@ void KviServerDetailsWidget::useIPV6CheckToggled(bool) setHeaderLabelText(); } -void KviServerDetailsWidget::portEditorTextChanged(const QString &) +void KviIrcServerDetailsWidget::portEditorTextChanged(const QString &) { setHeaderLabelText(); } -void KviServerDetailsWidget::setHeaderLabelText() +void KviIrcServerDetailsWidget::setHeaderLabelText() { QString szTmp = "<font size=\"+1\"><b>irc"; if(m_pUseIPV6Check->isChecked())szTmp += "6"; @@ -1034,7 +1034,7 @@ void KviServerDetailsWidget::setHeaderLabelText() m_pHeaderLabel->setText(szTmp); } -void KviServerDetailsWidget::fillData(KviServer * s) +void KviIrcServerDetailsWidget::fillData(KviIrcServer * s) { s->setUserName(m_pUserEditor->text()); s->setPassword(m_pPassEditor->text()); @@ -1164,7 +1164,7 @@ void KviServerDetailsWidget::fillData(KviServer * s) s->setProxy(m_pProxyEditor->currentIndex()-2); } -void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b) +void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b) { m_pIMode->setEnabled(!b); m_pWMode->setEnabled(!b); @@ -1172,35 +1172,35 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b) } // kvi_app.cpp -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; -KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n) +KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n) : QTreeWidgetItem(parent) { setIcon(0,QIcon(pm)); m_pServerData = 0; - m_pNetworkData = new KviNetwork(*n); + m_pNetworkData = new KviIrcNetwork(*n); setText(0,n->name()); setText(1,n->description()); } -KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s) +KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s) : QTreeWidgetItem(parent) { setIcon(0,QIcon(pm)); - m_pServerData = new KviServer(*s); + m_pServerData = new KviIrcServer(*s); setText(0,s->hostName()); setText(1,s->description()); m_pNetworkData = 0; } -KviServerOptionsTreeWidgetItem::~KviServerOptionsTreeWidgetItem() +KviIrcServerOptionsTreeWidgetItem::~KviIrcServerOptionsTreeWidgetItem() { if(m_pServerData)delete m_pServerData; if(m_pNetworkData)delete m_pNetworkData; } -void KviServerOptionsTreeWidgetItem::updateVisibleStrings() +void KviIrcServerOptionsTreeWidgetItem::updateVisibleStrings() { if(m_pNetworkData) { @@ -1216,7 +1216,7 @@ void KviServerOptionsTreeWidgetItem::updateVisibleStrings() } -KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) +KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent) : KviOptionsWidget(parent) { setObjectName("server_options_widget"); @@ -1401,7 +1401,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) setMinimumWidth(600); } -KviServerOptionsWidget::~KviServerOptionsWidget() +KviIrcServerOptionsWidget::~KviIrcServerOptionsWidget() { if(m_pImportFilter) { @@ -1418,7 +1418,7 @@ KviServerOptionsWidget::~KviServerOptionsWidget() delete m_pNetworkDetailsDialog; } -void KviServerOptionsWidget::recentServersPopupAboutToShow() +void KviIrcServerOptionsWidget::recentServersPopupAboutToShow() { g_pApp->fillRecentServersPopup(m_pRecentPopup); @@ -1426,7 +1426,7 @@ void KviServerOptionsWidget::recentServersPopupAboutToShow() m_pRecentPopup->insertItem(__tr2qs("Clear Recent Servers List")); } -void KviServerOptionsWidget::recentServersPopupClicked(int id) +void KviIrcServerOptionsWidget::recentServersPopupClicked(int id) { KviConsole * c = g_pActiveWindow->console(); if(!c) @@ -1445,7 +1445,7 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id) selectBestServerByUrl(szItemText); } -void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) +void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) { if(szUrl.isEmpty()) return; @@ -1457,12 +1457,12 @@ void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) int uCount = m_pTreeWidget->topLevelItemCount(); int uIdx = 0; - KviServerOptionsTreeWidgetItem * pBestCandidate = NULL; + KviIrcServerOptionsTreeWidgetItem * pBestCandidate = NULL; kvi_u32_t uBestCandidateScore = 0; while(uIdx < uCount) { - KviServerOptionsTreeWidgetItem * pNet = static_cast<KviServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx)); + KviIrcServerOptionsTreeWidgetItem * pNet = static_cast<KviIrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx)); uIdx++; @@ -1473,13 +1473,13 @@ void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) int uChildIdx = 0; while(uChildIdx < uServerCount) { - KviServerOptionsTreeWidgetItem * pServer = static_cast<KviServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx)); + KviIrcServerOptionsTreeWidgetItem * pServer = static_cast<KviIrcServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx)); uChildIdx++; if(!pServer) continue; // huh ? - KviServer * pServerData = pServer->serverData(); + KviIrcServer * pServerData = pServer->serverData(); if(!pServerData) continue; // umphf... @@ -1514,7 +1514,7 @@ void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) } -void KviServerOptionsWidget::connectCurrentClicked() +void KviIrcServerOptionsWidget::connectCurrentClicked() { saveLastItem(); commit(); @@ -1523,26 +1523,26 @@ void KviServerOptionsWidget::connectCurrentClicked() KviKvsScript::run("server -u",g_pApp->activeConsole()); } -void KviServerOptionsWidget::fillServerList() +void KviIrcServerOptionsWidget::fillServerList() { - KviServerOptionsTreeWidgetItem * net; - KviServerOptionsTreeWidgetItem * srv; - KviServerOptionsTreeWidgetItem * cur = 0; + KviIrcServerOptionsTreeWidgetItem * net; + KviIrcServerOptionsTreeWidgetItem * srv; + KviIrcServerOptionsTreeWidgetItem * cur = 0; - KviPointerHashTableIterator<QString,KviNetwork> it(*(g_pServerDataBase->recordDict())); + KviPointerHashTableIterator<QString,KviIrcNetwork> it(*(g_pServerDataBase->recordDict())); if(m_pConnectCurrent) m_pConnectCurrent->setEnabled(false); - while(KviNetwork * r = it.current()) + while(KviIrcNetwork * r = it.current()) { - net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r); - KviPointerList<KviServer> * sl = r->serverList(); + net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r); + KviPointerList<KviIrcServer> * sl = r->serverList(); bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data(); net->setExpanded(bCurrent); - for(KviServer * s = sl->first();s;s = sl->next()) + for(KviIrcServer * s = sl->first();s;s = sl->next()) { - srv = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s); + srv = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s); if((s == r->currentServer()) && bCurrent) { @@ -1562,15 +1562,15 @@ void KviServerOptionsWidget::fillServerList() } } -void KviServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int ) +void KviIrcServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int ) { detailsClicked(); } -void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) +void KviIrcServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) { saveLastItem(); - m_pLastEditedItem = (KviServerOptionsTreeWidgetItem *)it; + m_pLastEditedItem = (KviIrcServerOptionsTreeWidgetItem *)it; if(m_pLastEditedItem) { @@ -1604,7 +1604,7 @@ void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetI } } -void KviServerOptionsWidget::serverNetworkEditTextEdited(const QString &) +void KviIrcServerOptionsWidget::serverNetworkEditTextEdited(const QString &) { if(!m_pLastEditedItem) return; @@ -1617,7 +1617,7 @@ void KviServerOptionsWidget::serverNetworkEditTextEdited(const QString &) } -void KviServerOptionsWidget::saveLastItem() +void KviIrcServerOptionsWidget::saveLastItem() { if(!m_pLastEditedItem) return; @@ -1639,32 +1639,32 @@ void KviServerOptionsWidget::saveLastItem() } } -void KviServerOptionsWidget::commit() +void KviIrcServerOptionsWidget::commit() { saveLastItem(); g_pServerDataBase->clear(); - KviServerOptionsTreeWidgetItem * network; + KviIrcServerOptionsTreeWidgetItem * network; for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - network=(KviServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); + network=(KviIrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); QString tmp = network->m_pNetworkData->name(); - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp); + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp); if(pNetwork) { pNetwork->copyFrom(*(network->m_pNetworkData)); } else { - pNetwork = new KviNetwork(tmp); + pNetwork = new KviIrcNetwork(tmp); pNetwork->copyFrom(*(network->m_pNetworkData)); g_pServerDataBase->addNetwork(pNetwork); } if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(pNetwork->name()); - KviServerOptionsTreeWidgetItem * ch; + KviIrcServerOptionsTreeWidgetItem * ch; for (int j=0;j<network->childCount();j++) { - KviServer *srv; - ch=(KviServerOptionsTreeWidgetItem *)network->child(j); + KviIrcServer *srv; + ch=(KviIrcServerOptionsTreeWidgetItem *)network->child(j); if(ch->m_pServerData) { if(!ch->m_pServerData->m_szHostname.isEmpty()) @@ -1672,7 +1672,7 @@ void KviServerOptionsWidget::commit() srv = pNetwork->findServer(ch->m_pServerData); if(!srv) { - srv = new KviServer(*(ch->m_pServerData)); + srv = new KviIrcServer(*(ch->m_pServerData)); pNetwork->insertServer(srv); } else *srv = *(ch->m_pServerData); if(srv->id().isEmpty())srv->generateUniqueId(); @@ -1693,11 +1693,11 @@ void KviServerOptionsWidget::commit() g_pApp->saveIrcServerDataBase(); } -void KviServerOptionsWidget::customContextMenuRequested(const QPoint &pnt) +void KviIrcServerOptionsWidget::customContextMenuRequested(const QPoint &pnt) { int id; QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt); - bool bServer = (it && ((KviServerOptionsTreeWidgetItem *)it)->m_pServerData); + bool bServer = (it && ((KviIrcServerOptionsTreeWidgetItem *)it)->m_pServerData); m_pContextPopup->clear(); m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork())); id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent())); @@ -1719,7 +1719,7 @@ void KviServerOptionsWidget::customContextMenuRequested(const QPoint &pnt) m_pContextPopup->popup(QCursor::pos()); } -void KviServerOptionsWidget::importPopupAboutToShow() +void KviIrcServerOptionsWidget::importPopupAboutToShow() { g_pModuleManager->loadModulesByCaps("serverimport"); m_pImportPopup->clear(); @@ -1740,7 +1740,7 @@ void KviServerOptionsWidget::importPopupAboutToShow() } } -void KviServerOptionsWidget::importPopupActivated(int id) +void KviIrcServerOptionsWidget::importPopupActivated(int id) { // ensure that we have all the modules : they could have been unloaded while the popup was displayed g_pModuleManager->loadModulesByCaps("serverimport"); @@ -1773,31 +1773,31 @@ void KviServerOptionsWidget::importPopupActivated(int id) return; } - connect(m_pImportFilter,SIGNAL(server(const KviServer &,const QString&)),this,SLOT(importServer(const KviServer &,const QString&))); + connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const QString&)),this,SLOT(importServer(const KviIrcServer &,const QString&))); connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead())); m_pImportFilter->start(); } -void KviServerOptionsWidget::importerDead() +void KviIrcServerOptionsWidget::importerDead() { m_pImportFilter = 0; } -void KviServerOptionsWidget::importServer(const KviServer &s,const QString &network) +void KviIrcServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network) { - KviServerOptionsTreeWidgetItem * net = findNetItem(network); + KviIrcServerOptionsTreeWidgetItem * net = findNetItem(network); if(!net) { - KviNetwork d(network); - net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); + KviIrcNetwork d(network); + net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); net->setExpanded(true); } - KviServerOptionsTreeWidgetItem * srv ; + KviIrcServerOptionsTreeWidgetItem * srv ; for(int i=0;i<net->childCount();i++) { - srv=(KviServerOptionsTreeWidgetItem *) net->child(i); + srv=(KviIrcServerOptionsTreeWidgetItem *) net->child(i); if((srv)->m_pServerData->useSSL() == s.useSSL()) { if(srv->m_pServerData->isIPv6() == s.isIPv6()) @@ -1818,39 +1818,39 @@ void KviServerOptionsWidget::importServer(const KviServer &s,const QString &netw } // not found : add it! - KviServerOptionsTreeWidgetItem * newServer = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s); + KviIrcServerOptionsTreeWidgetItem * newServer = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s); m_pTreeWidget->setCurrentItem(newServer); m_pTreeWidget->scrollToItem(newServer); } -void KviServerOptionsWidget::newNetwork() +void KviIrcServerOptionsWidget::newNetwork() { - KviNetwork d(__tr2qs_ctx("New Network","options")); - KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); + KviIrcNetwork d(__tr2qs_ctx("New Network","options")); + KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); it->setExpanded(true); it->setSelected(true); m_pTreeWidget->setCurrentItem(it); m_pTreeWidget->scrollToItem(it); } -void KviServerOptionsWidget::newServer() +void KviIrcServerOptionsWidget::newServer() { if(m_pLastEditedItem) { - KviServerOptionsTreeWidgetItem * net; + KviIrcServerOptionsTreeWidgetItem * net; if(m_pLastEditedItem->m_pServerData) { - net = (KviServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); + net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); if(!net)return; } else net = m_pLastEditedItem; - KviServer tmp; + KviIrcServer tmp; tmp.m_szHostname = __tr2qs_ctx("irc.unknown.net","options"); tmp.setCacheIp(false); tmp.generateUniqueId(); - KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp); + KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp); net->setExpanded(true); @@ -1860,34 +1860,34 @@ void KviServerOptionsWidget::newServer() } } -void KviServerOptionsWidget::copyServer() +void KviIrcServerOptionsWidget::copyServer() { if(m_pLastEditedItem) { if(m_pLastEditedItem->m_pServerData) { - if(!m_pClipboard)m_pClipboard = new KviServer(); + if(!m_pClipboard)m_pClipboard = new KviIrcServer(); *m_pClipboard = *(m_pLastEditedItem->m_pServerData); m_pPasteServerButton->setEnabled(true); } } } -void KviServerOptionsWidget::pasteServer() +void KviIrcServerOptionsWidget::pasteServer() { if(m_pClipboard) { if(m_pLastEditedItem) { - KviServerOptionsTreeWidgetItem * net; + KviIrcServerOptionsTreeWidgetItem * net; if(m_pLastEditedItem->m_pServerData) { - net = (KviServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); + net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); if(!net)return; } else net = m_pLastEditedItem; - KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(net, + KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net, *(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),m_pClipboard); net->setExpanded(true); @@ -1899,7 +1899,7 @@ void KviServerOptionsWidget::pasteServer() } } -void KviServerOptionsWidget::removeCurrent() +void KviIrcServerOptionsWidget::removeCurrent() { if(m_pLastEditedItem) { @@ -1926,33 +1926,33 @@ void KviServerOptionsWidget::removeCurrent() } } -KviServerOptionsTreeWidgetItem * KviServerOptionsWidget::findNetItem(const QString &netname) +KviIrcServerOptionsTreeWidgetItem * KviIrcServerOptionsWidget::findNetItem(const QString &netname) { - KviServerOptionsTreeWidgetItem * it; + KviIrcServerOptionsTreeWidgetItem * it; for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - it=(KviServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + it=(KviIrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); if(KviQString::equalCI(it->text(0),netname))return it; } return 0; } -void KviServerOptionsWidget::clearList() +void KviIrcServerOptionsWidget::clearList() { m_pTreeWidget->clear(); m_pLastEditedItem = 0; currentItemChanged(0,0); } -void KviServerOptionsWidget::detailsClicked() +void KviIrcServerOptionsWidget::detailsClicked() { if(!m_pLastEditedItem)return; if(m_pLastEditedItem->m_pServerData) { saveLastItem(); - m_pServerDetailsDialog = new KviServerDetailsWidget(this,m_pLastEditedItem->m_pServerData); + m_pServerDetailsDialog = new KviIrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData); int retCode = m_pServerDetailsDialog->exec(); if(retCode == QDialog::Accepted) @@ -1975,7 +1975,7 @@ void KviServerOptionsWidget::detailsClicked() { saveLastItem(); - m_pNetworkDetailsDialog = new KviNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData); + m_pNetworkDetailsDialog = new KviIrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData); int retCode = m_pNetworkDetailsDialog->exec(); if(retCode == QDialog::Accepted) diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h index 68e018167..1ee0a1fac 100644 --- a/src/modules/options/optw_servers.h +++ b/src/modules/options/optw_servers.h @@ -39,33 +39,33 @@ class QLineEdit; class QComboBox; class QPushButton; class KviIpEditor; -class KviServer; +class KviIrcServer; class KviTalPopupMenu; class KviScriptEditor; class KviNickServRule; class KviNickServRuleEditor; -class KviServer; -class KviNetwork; -class KviNetworkData; +class KviIrcServer; +class KviIrcNetwork; +class KviIrcNetworkData; class KviMexServerImport; -class KviServerOptionsTreeWidgetItem : public QTreeWidgetItem +class KviIrcServerOptionsTreeWidgetItem : public QTreeWidgetItem { public: - KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n); - KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s); - ~KviServerOptionsTreeWidgetItem(); + KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n); + KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s); + ~KviIrcServerOptionsTreeWidgetItem(); public: - KviServer * m_pServerData; - KviNetwork * m_pNetworkData; + KviIrcServer * m_pServerData; + KviIrcNetwork * m_pNetworkData; public: - KviServer * serverData() const + KviIrcServer * serverData() const { return m_pServerData; } - KviNetwork * networkData() const + KviIrcNetwork * networkData() const { return m_pNetworkData; } @@ -74,12 +74,12 @@ public: }; -class KviNetworkDetailsWidget : public QDialog +class KviIrcNetworkDetailsWidget : public QDialog { Q_OBJECT public: - KviNetworkDetailsWidget(QWidget * par,KviNetwork * d); - ~KviNetworkDetailsWidget(); + KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d); + ~KviIrcNetworkDetailsWidget(); protected: KviScriptEditor * m_pOnConnectEditor; KviScriptEditor * m_pOnLoginEditor; @@ -104,7 +104,7 @@ protected: QStringList m_lstChannels; KviChannelListSelector * m_pChannelListSelector; public: - void fillData(KviNetwork * d); + void fillData(KviIrcNetwork * d); protected slots: void enableDisableNickServControls(); void addNickServRule(); @@ -112,12 +112,12 @@ protected slots: void editNickServRule(); }; -class KviServerDetailsWidget : public QDialog +class KviIrcServerDetailsWidget : public QDialog { Q_OBJECT public: - KviServerDetailsWidget(QWidget * par,KviServer * s); - ~KviServerDetailsWidget(); + KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s); + ~KviIrcServerDetailsWidget(); protected: QString m_szHostname; QLabel * m_pHeaderLabel; @@ -157,22 +157,22 @@ protected slots: void useIPV6CheckToggled(bool); public: void setHeaderLabelText(); - void fillData(KviServer *s); + void fillData(KviIrcServer *s); }; -#define KVI_OPTIONS_WIDGET_ICON_KviServerOptionsWidget KVI_SMALLICON_SERVER -#define KVI_OPTIONS_WIDGET_NAME_KviServerOptionsWidget __tr2qs_no_lookup("Servers") -#define KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget __tr2qs_no_lookup("connection") -//#define KVI_OPTIONS_WIDGET_NOPARENT_KviServerOptionsWidget KviConnectionOptionsWidget -#define KVI_OPTIONS_WIDGET_PRIORITY_KviServerOptionsWidget 99000 +#define KVI_OPTIONS_WIDGET_ICON_KviIrcServerOptionsWidget KVI_SMALLICON_SERVER +#define KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget __tr2qs_no_lookup("Servers") +#define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget __tr2qs_no_lookup("connection") +//#define KVI_OPTIONS_WIDGET_NOPARENT_KviIrcServerOptionsWidget KviConnectionOptionsWidget +#define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget 99000 -class KviServerOptionsWidget : public KviOptionsWidget +class KviIrcServerOptionsWidget : public KviOptionsWidget { Q_OBJECT public: - KviServerOptionsWidget(QWidget * parent); - ~KviServerOptionsWidget(); + KviIrcServerOptionsWidget(QWidget * parent); + ~KviIrcServerOptionsWidget(); protected: QTreeWidget * m_pTreeWidget; QLabel * m_pSrvNetLabel; @@ -183,13 +183,13 @@ protected: KviTalPopupMenu * m_pRecentPopup; KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pImportPopup; - KviServer * m_pClipboard; + KviIrcServer * m_pClipboard; //QCheckBox * m_pIPv6Check; QPushButton * m_pConnectCurrent; QPushButton * m_pConnectNew; - KviServerOptionsTreeWidgetItem * m_pLastEditedItem; - KviServerDetailsWidget * m_pServerDetailsDialog; - KviNetworkDetailsWidget * m_pNetworkDetailsDialog; + KviIrcServerOptionsTreeWidgetItem * m_pLastEditedItem; + KviIrcServerDetailsWidget * m_pServerDetailsDialog; + KviIrcNetworkDetailsWidget * m_pNetworkDetailsDialog; KviMexServerImport * m_pImportFilter; QToolButton * m_pNewServerButton; @@ -201,11 +201,11 @@ protected: private: void fillServerList(); void saveLastItem(); - KviServerOptionsTreeWidgetItem * findNetItem(const QString &netname); + KviIrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname); void selectBestServerByUrl(const QString &szUrl); protected slots: void importerDead(); - void importServer(const KviServer & s,const QString &network); + void importServer(const KviIrcServer & s,const QString &network); void importPopupAboutToShow(); void currentItemChanged(QTreeWidgetItem *cur,QTreeWidgetItem *prev); void customContextMenuRequested(const QPoint &pnt); diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp index 76f1014f6..196c300a0 100644 --- a/src/modules/serverdb/libkviserverdb.cpp +++ b/src/modules/serverdb/libkviserverdb.cpp @@ -30,7 +30,7 @@ #include <QString> -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; /* @doc: serverdb @@ -126,7 +126,7 @@ static bool serverdb_kvs_fnc_networkExists(KviKvsModuleFunctionCall * c) return false; } - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetwork); + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetwork); if(!pNetwork) { c->returnValue()->setBoolean(false); @@ -172,14 +172,14 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) if(!szNetwork.isEmpty()) { // Check in the given network - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); if(!pRecord) { c->returnValue()->setBoolean(false); return true; } - KviServer * pCheckServer = pRecord->findServer(szServer); + KviIrcServer * pCheckServer = pRecord->findServer(szServer); if(!pCheckServer) { c->returnValue()->setBoolean(false); @@ -189,13 +189,13 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) c->returnValue()->setBoolean(true); } else { // Check through all networks - KviPointerHashTableIterator<QString,KviNetwork> it(*(g_pServerDataBase->recordDict())); + KviPointerHashTableIterator<QString,KviIrcNetwork> it(*(g_pServerDataBase->recordDict())); - while(KviNetwork * r = it.current()) + while(KviIrcNetwork * r = it.current()) { - KviPointerList<KviServer> * sl = r->serverList(); + KviPointerList<KviIrcServer> * sl = r->serverList(); - for(KviServer * s = sl->first(); s; s = sl->next()) + for(KviIrcServer * s = sl->first(); s; s = sl->next()) { if(QString::compare(s->hostName().toUtf8().data(),szServer,Qt::CaseInsensitive)==0) { @@ -227,7 +227,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) return false; \ } \ \ - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ if(!pNetwork) \ { \ c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \ @@ -268,14 +268,14 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) return false; \ } \ \ - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ if(!pRecord) \ { \ c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \ return false; \ } \ \ - KviServer * pServer = pRecord->findServer(szServName); \ + KviIrcServer * pServer = pRecord->findServer(szServName); \ if(!pServer) \ { \ c->error(__tr2qs_ctx("The specified server does not exist","serverdb")); \ @@ -826,7 +826,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c) return false; } - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetName); + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetName); if(pNetwork) { if(c->switches()->find('q',"quiet")) return true; @@ -834,7 +834,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c) return false; } - pNetwork = new KviNetwork(szNetName); + pNetwork = new KviIrcNetwork(szNetName); if(c->switches()->find('a',"autoconnect")) pNetwork->setAutoConnect(true); g_pServerDataBase->addNetwork(pNetwork); @@ -903,7 +903,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; } - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); if(!pRecord) { // FIXME: default to orphan servers @@ -911,10 +911,10 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; } - KviServer * pServer = new KviServer(); + KviIrcServer * pServer = new KviIrcServer(); pServer->setHostName(szServer); - KviServer * pServerRecord = pRecord->findServer(pServer); + KviIrcServer * pServerRecord = pRecord->findServer(pServer); if(pServerRecord) { if(c->switches()->find('q',"quiet")) return true; @@ -960,7 +960,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ if(!pNetwork) \ { \ if(c->switches()->find('q',"quiet")) return true; \ @@ -996,7 +996,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ if(!pRecord) \ { \ if(c->switches()->find('q',"quiet")) return true; \ @@ -1004,7 +1004,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviServer * pServer = pRecord->findServer(szServName); \ + KviIrcServer * pServer = pRecord->findServer(szServName); \ if(!pServer) \ { \ if(c->switches()->find('q',"quiet")) return true; \ diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp index 2ba30a640..200338068 100644 --- a/src/modules/theme/libkvitheme.cpp +++ b/src/modules/theme/libkvitheme.cpp @@ -31,7 +31,7 @@ #include "KviQString.h" #include "KviParameterList.h" #include "KviCommandFormatter.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_iconmanager.h" #include "KviMircCntrl.h" diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp index 66a70c8b8..ac8266cfe 100644 --- a/src/modules/toolbar/libkvitoolbar.cpp +++ b/src/modules/toolbar/libkvitoolbar.cpp @@ -26,7 +26,7 @@ #include "KviLocale.h" #include "kvi_window.h" #include "kvi_app.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviCommandFormatter.h" #include "kvi_customtoolbar.h" #include "kvi_customtoolbardescriptor.h" diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 5b7bf103c..e5f622110 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -31,7 +31,7 @@ #include "kvi_frame.h" #include "KviLocale.h" #include "kvi_app.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_ircview.h" #include "kvi_input.h" #include "kvi_iconmanager.h" |