diff options
| author |  Szymon Tomasz Stefanek | 2010-12-26 18:29:52 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2010-12-26 18:29:52 +0000 |
| commit | 4aed5e3d6ac6c4e71fbbe97f8c6c953a4072e717 (patch) | |
| tree | cf8f7273f432e478ebf1988391e4916f41875900 | |
| parent | pseudotransparency: small perfomance gain (diff) | |
| download | KVIrc-4aed5e3d6ac6c4e71fbbe97f8c6c953a4072e717.tar.gz KVIrc-4aed5e3d6ac6c4e71fbbe97f8c6c953a4072e717.tar.bz2 KVIrc-4aed5e3d6ac6c4e71fbbe97f8c6c953a4072e717.zip | |
More renaming & cleanup.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5233 17fca916-40b9-46aa-a4ea-0a15b648b75c
215 files changed, 492 insertions, 492 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 88006c468..5b97a6a94 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -20,24 +20,24 @@ SET(kvilib_MOC_HDRS ext/KviRegisteredUserDataBase.h ext/KviSharedFilesManager.h irc/KviIrcUserDataBase.h - net/kvi_dns.h - net/kvi_http.h + net/KviDnsResolver.h + net/KviHttpRequest.h system/KviLocale.h system/KviThread.h - tal/kvi_tal_application.h - tal/kvi_tal_filedialog.h - tal/kvi_tal_groupbox.h - tal/kvi_tal_hbox.h - tal/kvi_tal_listwidget.h - tal/kvi_tal_mainwindow.h - tal/kvi_tal_menubar.h - tal/kvi_tal_popupmenu.h - tal/kvi_tal_tabdialog.h - tal/kvi_tal_tablewidget.h - tal/kvi_tal_toolbar.h - tal/kvi_tal_tooltip.h - tal/kvi_tal_vbox.h - tal/kvi_tal_wizard.h + tal/KviTalApplication.h + tal/KviTalFileDialog.h + tal/KviTalGroupBox.h + tal/KviTalHBox.h + tal/KviTalListWidget.h + tal/KviTalMainWindow.h + tal/KviTalMenuBar.h + tal/KviTalPopupMenu.h + tal/KviTalTabDialog.h + tal/KviTalTableWidget.h + tal/KviTalToolBar.h + tal/KviTalToolTip.h + tal/KviTalVBox.h + tal/KviTalWizard.h ) IF(COMPILE_DBUS_SUPPORT) @@ -96,33 +96,33 @@ SET(kvilib_SRCS irc/KviNetwork.cpp irc/KviNickServRuleSet.cpp irc/KviUserIdentity.cpp - net/kvi_dns.cpp - net/kvi_http.cpp - net/kvi_netutils.cpp - net/kvi_sasl.cpp + net/KviDnsResolver.cpp + net/KviHttpRequest.cpp + net/KviNetUtils.cpp + net/KviSASL.cpp net/kvi_socket.cpp - net/kvi_ssl.cpp - net/kvi_url.cpp + net/KviSSL.cpp + net/KviUrl.cpp system/KviEnvironment.cpp system/KviLocale.cpp system/KviThread.cpp system/KviTimeUtils.cpp - tal/kvi_tal_application.cpp - tal/kvi_tal_filedialog.cpp - tal/kvi_tal_groupbox.cpp - tal/kvi_tal_hbox.cpp - tal/kvi_tal_itemdelegates.cpp - tal/kvi_tal_listwidget.cpp - tal/kvi_tal_mainwindow.cpp - tal/kvi_tal_menubar.cpp - tal/kvi_tal_popupmenu.cpp - tal/kvi_tal_splitter.cpp - tal/kvi_tal_tabdialog.cpp - tal/kvi_tal_tablewidget.cpp - tal/kvi_tal_toolbar.cpp - tal/kvi_tal_tooltip.cpp - tal/kvi_tal_vbox.cpp - tal/kvi_tal_wizard.cpp + tal/KviTalApplication.cpp + tal/KviTalFileDialog.cpp + tal/KviTalGroupBox.cpp + tal/KviTalHBox.cpp + tal/KviTalIconAndRichTextItemDelegate.cpp + tal/KviTalListWidget.cpp + tal/KviTalMainWindow.cpp + tal/KviTalMenuBar.cpp + tal/KviTalPopupMenu.cpp + tal/KviTalSplitter.cpp + tal/KviTalTabDialog.cpp + tal/KviTalTableWidget.cpp + tal/KviTalToolBar.cpp + tal/KviTalToolTip.cpp + tal/KviTalVBox.cpp + tal/KviTalWizard.cpp ) IF(NOT DEFINED COMPILE_DISABLE_AVDEVICE) diff --git a/src/kvilib/ext/kvi_xlib.h b/src/kvilib/ext/KviXlib.h index bf898a652..818867558 100644 --- a/src/kvilib/ext/kvi_xlib.h +++ b/src/kvilib/ext/KviXlib.h @@ -2,7 +2,7 @@ #define _KVI_XLIB_H_ //============================================================================= // -// File : kvi_xlib.h +// File : KviXlib.h // Creation date : Tue Aug 14 18:17:21 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/irc/KviIrcServerDataBase.cpp b/src/kvilib/irc/KviIrcServerDataBase.cpp index 163b6e70d..5aae7b1d8 100644 --- a/src/kvilib/irc/KviIrcServerDataBase.cpp +++ b/src/kvilib/irc/KviIrcServerDataBase.cpp @@ -26,7 +26,7 @@ #include "KviIrcServerDataBase.h" #include "KviConfigurationFile.h" #include "KviLocale.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "KviNickServRuleSet.h" #include <QApplication> diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/KviDnsResolver.cpp index aabace901..ef4cfcefb 100644 --- a/src/kvilib/net/kvi_dns.cpp +++ b/src/kvilib/net/KviDnsResolver.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_dns.cpp +// File : KviDnsResolver.cpp // Creation date : Sat Jul 21 2000 17:19:31 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -22,9 +22,9 @@ // //============================================================================= -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "kvi_error.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include <errno.h> @@ -56,7 +56,7 @@ -KviDnsResult::KviDnsResult() +KviDnsResolverResult::KviDnsResolverResult() { m_iError = KviError_success; m_pHostnameList = new KviPointerList<QString>; @@ -66,35 +66,35 @@ KviDnsResult::KviDnsResult() } -KviDnsResult::~KviDnsResult() +KviDnsResolverResult::~KviDnsResolverResult() { delete m_pHostnameList; delete m_pIpAddressList; } -void KviDnsResult::appendHostname(const QString &host) +void KviDnsResolverResult::appendHostname(const QString &host) { m_pHostnameList->append(new QString(host)); } -void KviDnsResult::appendAddress(const QString &addr) +void KviDnsResolverResult::appendAddress(const QString &addr) { m_pIpAddressList->append(new QString(addr)); } -KviDnsThread::KviDnsThread(KviDns * pDns) +KviDnsResolverThread::KviDnsResolverThread(KviDnsResolver * pDns) { m_pParentDns = pDns; } -KviDnsThread::~KviDnsThread() +KviDnsResolverThread::~KviDnsResolverThread() { } -int KviDnsThread::translateDnsError(int iErr) +int KviDnsResolverThread::translateDnsError(int iErr) { #if defined(COMPILE_IPV6_SUPPORT) || (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)) @@ -130,17 +130,17 @@ int KviDnsThread::translateDnsError(int iErr) return KviError_dnsQueryFailed; } -void KviDnsThread::postDnsError(KviDnsResult * dns,int iErr) +void KviDnsResolverThread::postDnsError(KviDnsResolverResult * dns,int iErr) { dns->setError(iErr); - KviThreadDataEvent<KviDnsResult> * e = new KviThreadDataEvent<KviDnsResult>(KVI_DNS_THREAD_EVENT_DATA); + KviThreadDataEvent<KviDnsResolverResult> * e = new KviThreadDataEvent<KviDnsResolverResult>(KVI_DNS_THREAD_EVENT_DATA); e->setData(dns); postEvent(m_pParentDns,e); } -void KviDnsThread::run() +void KviDnsResolverThread::run() { - KviDnsResult * dns = new KviDnsResult(); + KviDnsResolverResult * dns = new KviDnsResolverResult(); dns->setQuery(m_szQuery); @@ -151,20 +151,20 @@ void KviDnsThread::run() } #ifndef COMPILE_IPV6_SUPPORT - if(m_queryType != KviDns::IPv4) + if(m_queryType != KviDnsResolver::IPv4) { - if(m_queryType == KviDns::IPv6) + if(m_queryType == KviDnsResolver::IPv6) { postDnsError(dns,KviError_noIPv6Support); return; } - m_queryType = KviDns::IPv4; + m_queryType = KviDnsResolver::IPv4; } #endif #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)) && !defined(COMPILE_IPV6_SUPPORT) - if(m_queryType == KviDns::IPv6) + if(m_queryType == KviDnsResolver::IPv6) { postDnsError(dns,KviError_noIPv6Support); return; @@ -281,7 +281,7 @@ void KviDnsThread::run() struct addrinfo hints; hints.ai_flags = 0; //AI_CANONNAME; <-- for IPV6 it makes cannoname to point to the IP address! #ifdef COMPILE_IPV6_SUPPORT - hints.ai_family = (m_queryType == KviDns::IPv6) ? PF_INET6 : ((m_queryType == KviDns::IPv4) ? PF_INET : PF_UNSPEC); + hints.ai_family = (m_queryType == KviDnsResolver::IPv6) ? PF_INET6 : ((m_queryType == KviDnsResolver::IPv4) ? PF_INET : PF_UNSPEC); #else hints.ai_family = PF_INET; #endif @@ -340,22 +340,22 @@ void KviDnsThread::run() #endif // !COMPILE_ON_WINDOWS - KviThreadDataEvent<KviDnsResult> * e = new KviThreadDataEvent<KviDnsResult>(KVI_DNS_THREAD_EVENT_DATA); + KviThreadDataEvent<KviDnsResolverResult> * e = new KviThreadDataEvent<KviDnsResolverResult>(KVI_DNS_THREAD_EVENT_DATA); e->setData(dns); postEvent(m_pParentDns,e); } -KviDns::KviDns() +KviDnsResolver::KviDnsResolver() : QObject() { - m_pSlaveThread = new KviDnsThread(this); - m_pDnsResult = new KviDnsResult(); + m_pSlaveThread = new KviDnsResolverThread(this); + m_pDnsResult = new KviDnsResolverResult(); m_pAuxData = 0; m_state = Idle; } -KviDns::~KviDns() +KviDnsResolver::~KviDnsResolver() { if(m_pSlaveThread)delete m_pSlaveThread; // will eventually terminate it (but it will also block us!!!) KviThreadManager::killPendingEvents(this); @@ -363,12 +363,12 @@ KviDns::~KviDns() if(m_pAuxData)qDebug("You're leaking memory man! m_pAuxData is non 0!"); } -bool KviDns::isRunning() const +bool KviDnsResolver::isRunning() const { return (m_state == Busy); } -bool KviDns::lookup(const QString &query,QueryType type) +bool KviDnsResolver::lookup(const QString &query,QueryType type) { if(m_state == Busy)return false; m_pSlaveThread->setQuery(KviQString::trimmed(query),type); @@ -377,65 +377,65 @@ bool KviDns::lookup(const QString &query,QueryType type) return bStarted; } -int KviDns::error() +int KviDnsResolver::error() { if(!m_pDnsResult)return KviError_dnsQueryFailed; return m_pDnsResult->error(); } -KviDnsResult * KviDns::result() +KviDnsResolverResult * KviDnsResolver::result() { - if(!m_pDnsResult)m_pDnsResult = new KviDnsResult(); + if(!m_pDnsResult)m_pDnsResult = new KviDnsResolverResult(); return m_pDnsResult; } -KviPointerList<QString> * KviDns::hostnameList() +KviPointerList<QString> * KviDnsResolver::hostnameList() { return result()->hostnameList(); } -KviPointerList<QString> * KviDns::ipAddressList() +KviPointerList<QString> * KviDnsResolver::ipAddressList() { return result()->ipAddressList(); } -int KviDns::hostnameCount() +int KviDnsResolver::hostnameCount() { return result()->hostnameList()->count(); } -int KviDns::ipAddressCount() +int KviDnsResolver::ipAddressCount() { return result()->ipAddressList()->count(); } -const QString & KviDns::firstHostname() +const QString & KviDnsResolver::firstHostname() { QString * pStr = result()->hostnameList()->first(); if(pStr)return *pStr; return KviQString::Empty; } -const QString & KviDns::firstIpAddress() +const QString & KviDnsResolver::firstIpAddress() { QString * pStr = result()->ipAddressList()->first(); if(pStr)return *pStr; return KviQString::Empty; } -const QString & KviDns::query() +const QString & KviDnsResolver::query() { return result()->query(); } -bool KviDns::event(QEvent *e) +bool KviDnsResolver::event(QEvent *e) { if(e->type() == KVI_THREAD_EVENT) { if(((KviThreadEvent *)e)->id() == KVI_DNS_THREAD_EVENT_DATA) { if(m_pDnsResult)delete m_pDnsResult; - m_pDnsResult = ((KviThreadDataEvent<KviDnsResult> *)e)->getData(); + m_pDnsResult = ((KviThreadDataEvent<KviDnsResolverResult> *)e)->getData(); m_state = (m_pDnsResult->error() == KviError_success) ? Success : Failure; emit lookupDone(this); return true; diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/KviDnsResolver.h index 9a9825b23..bf3552179 100644 --- a/src/kvilib/net/kvi_dns.h +++ b/src/kvilib/net/KviDnsResolver.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_dns.h +// File : KviDnsResolver.h // Creation date : Sat Jul 21 2000 13:59:11 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -31,17 +31,17 @@ #include "KviQString.h" -class KviDnsThread; // not part of the API +class KviDnsResolverThread; // not part of the API -class KVILIB_API KviDnsResult : public KviHeapObject +class KVILIB_API KviDnsResolverResult : public KviHeapObject { - friend class KviDns; - friend class KviDnsThread; + friend class KviDnsResolver; + friend class KviDnsResolverThread; protected: - KviDnsResult(); + KviDnsResolverResult(); public: - ~KviDnsResult(); + ~KviDnsResolverResult(); protected: int m_iError; KviPointerList<QString> * m_pHostnameList; @@ -63,20 +63,20 @@ protected: -class KVILIB_API KviDns : public QObject, public KviHeapObject +class KVILIB_API KviDnsResolver : public QObject, public KviHeapObject { Q_OBJECT Q_PROPERTY(bool blockingDelete READ isRunning) public: - KviDns(); - ~KviDns(); + KviDnsResolver(); + ~KviDnsResolver(); public: enum QueryType { IPv4, IPv6, Any }; enum State { Idle, Busy, Failure, Success }; protected: void * m_pAuxData; - KviDnsThread * m_pSlaveThread; - KviDnsResult * m_pDnsResult; + KviDnsResolverThread * m_pSlaveThread; + KviDnsResolverResult * m_pDnsResult; State m_state; public: ///////////////////////////////////////////////////////////////////////////////////////////////////// @@ -107,9 +107,9 @@ public: protected: virtual bool event(QEvent *e); private: - KviDnsResult * result(); + KviDnsResolverResult * result(); signals: - void lookupDone(KviDns *); + void lookupDone(KviDnsResolver *); }; @@ -120,22 +120,22 @@ signals: #define KVI_DNS_THREAD_EVENT_DATA (KVI_THREAD_USER_EVENT_BASE + 7432) -class KviDnsThread : public KviThread +class KviDnsResolverThread : public KviThread { - friend class KviDns; + friend class KviDnsResolver; protected: - KviDnsThread(KviDns * pDns); - ~KviDnsThread(); + KviDnsResolverThread(KviDnsResolver * pDns); + ~KviDnsResolverThread(); protected: QString m_szQuery; - KviDns::QueryType m_queryType; - KviDns * m_pParentDns; + KviDnsResolver::QueryType m_queryType; + KviDnsResolver * m_pParentDns; public: - void setQuery(const QString &query,KviDns::QueryType type){ m_szQuery = query; m_queryType = type; }; + void setQuery(const QString &query,KviDnsResolver::QueryType type){ m_szQuery = query; m_queryType = type; }; protected: virtual void run(); int translateDnsError(int iErr); - void postDnsError(KviDnsResult * dns,int iErr); + void postDnsError(KviDnsResolverResult * dns,int iErr); }; diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/KviHttpRequest.cpp index 4bbec0d59..1dfd59acc 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/KviHttpRequest.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_http.cpp +// File : KviHttpRequest.cpp // Creation date : Sat Aug 17 13:43:32 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -28,17 +28,17 @@ #include <QTimer> //#include <zlib.h> -#include "kvi_http.h" +#include "KviHttpRequest.h" #include "KviLocale.h" -#include "kvi_netutils.h" -#include "kvi_dns.h" +#include "KviNetUtils.h" +#include "KviDnsResolver.h" #include "kvi_error.h" #include "kvi_debug.h" #include "kvi_socket.h" #include "KviTimeUtils.h" #ifdef COMPILE_SSL_SUPPORT - #include "kvi_ssl.h" + #include "KviSSL.h" #endif @@ -181,10 +181,10 @@ bool KviHttpRequest::start() bool KviHttpRequest::startDnsLookup() { - m_pDns = new KviDns(); - connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupDone(KviDns *))); + m_pDns = new KviDnsResolver(); + connect(m_pDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(dnsLookupDone(KviDnsResolver *))); - if(!m_pDns->lookup(m_url.host(),KviDns::IPv4)) + if(!m_pDns->lookup(m_url.host(),KviDnsResolver::IPv4)) { resetInternalStatus(); m_szLastError = __tr2qs("Unable to start the DNS lookup"); @@ -200,9 +200,9 @@ bool KviHttpRequest::startDnsLookup() return true; } -void KviHttpRequest::dnsLookupDone(KviDns *d) +void KviHttpRequest::dnsLookupDone(KviDnsResolver *d) { - if(d->state() == KviDns::Success) + if(d->state() == KviDnsResolver::Success) { m_szIp = d->firstIpAddress(); delete m_pDns; diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/KviHttpRequest.h index c53d32ce6..db4c96ab9 100644 --- a/src/kvilib/net/kvi_http.h +++ b/src/kvilib/net/KviHttpRequest.h @@ -2,7 +2,7 @@ #define _KVI_HTTP_H_ //============================================================================= // -// File : kvi_http.h +// File : KviHttpRequest.h // Creation date : Sat Aug 17 13:43:31 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -31,14 +31,14 @@ #include "kvi_sockettype.h" #include "KviDataBuffer.h" #include "kvi_inttypes.h" -#include "kvi_url.h" +#include "KviUrl.h" #include "KviPointerHashTable.h" #include "KviFile.h" #include <QObject> #include <QStringList> -class KviDns; +class KviDnsResolver; class KviSSL; class KviHttpRequestThread; @@ -86,7 +86,7 @@ protected: unsigned int m_uReceivedSize; // internal status QString m_szIp; - KviDns * m_pDns; + KviDnsResolver * m_pDns; KviHttpRequestThread * m_pThread; KviDataBuffer * m_pBuffer; bool m_bHeaderProcessed; @@ -108,7 +108,7 @@ protected: void resetData(); void resetInternalStatus(); protected slots: - void dnsLookupDone(KviDns *d); + void dnsLookupDone(KviDnsResolver *d); void haveServerIp(); public: void setConnectionTimeout(unsigned int uConnectionTimeout) diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/KviNetUtils.cpp index 304ddb0b3..4e4edcfa2 100644 --- a/src/kvilib/net/kvi_netutils.cpp +++ b/src/kvilib/net/KviNetUtils.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_netutlis.cpp +// File : KviNetUtils.cpp // Creation date : Sun Jun 18 2000 18:37:27 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -30,7 +30,7 @@ #define _WIN32_WINNT _WIN32_WINNT_WINXP #endif -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_memmove.h" #include <QStringList> diff --git a/src/kvilib/net/kvi_netutils.h b/src/kvilib/net/KviNetUtils.h index ac8c8d5ea..f7872ad07 100644 --- a/src/kvilib/net/kvi_netutils.h +++ b/src/kvilib/net/KviNetUtils.h @@ -2,7 +2,7 @@ #define _KVI_NETUTILS_H_ //============================================================================= // -// File : kvi_netutlis.h +// File : KviNetUtils.h // Creation date : Sun Jun 18 2000 18:37:27 by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/net/kvi_sasl.cpp b/src/kvilib/net/KviSASL.cpp index 3a56749a7..39d56ea67 100644 --- a/src/kvilib/net/kvi_sasl.cpp +++ b/src/kvilib/net/KviSASL.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_sasl.cpp +// File : KviSASL.cpp // Creation date : Mon Feb 14 2010 19:36:12 CEST by Fabio Bas // // This file is part of the KVirc irc client distribution @@ -24,7 +24,7 @@ -#include "kvi_sasl.h" +#include "KviSASL.h" #include "KviMemory.h" @@ -34,7 +34,7 @@ #include <openssl/bn.h> #include <openssl/dh.h> #include <openssl/err.h> -#include <kvi_netutils.h> +#include <KviNetUtils.h> #endif diff --git a/src/kvilib/net/kvi_sasl.h b/src/kvilib/net/KviSASL.h index 12db86dc3..511ba1796 100644 --- a/src/kvilib/net/kvi_sasl.h +++ b/src/kvilib/net/KviSASL.h @@ -2,7 +2,7 @@ #define _KVI_SASL_H_ //============================================================================= // -// File : kvi_sasl.h +// File : KviSASL.h // Creation date : Mon Feb 14 2010 19:36:12 CEST by Fabio Bas // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/KviSSL.cpp index b807d12b9..dedc70632 100644 --- a/src/kvilib/net/kvi_ssl.cpp +++ b/src/kvilib/net/KviSSL.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_ssl.cpp +// File : KviSSL.cpp // Creation date : Mon May 27 2002 21:36:12 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -24,7 +24,7 @@ -#include "kvi_ssl.h" +#include "KviSSL.h" #include "KviLocale.h" #ifdef COMPILE_SSL_SUPPORT diff --git a/src/kvilib/net/kvi_ssl.h b/src/kvilib/net/KviSSL.h index 66413d627..0555d7c44 100644 --- a/src/kvilib/net/kvi_ssl.h +++ b/src/kvilib/net/KviSSL.h @@ -2,7 +2,7 @@ #define _KVI_SSL_H_ //============================================================================= // -// File : kvi_ssl.h +// File : KviSSL.h // Creation date : Mon May 27 2002 21:36:12 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/net/kvi_url.cpp b/src/kvilib/net/KviUrl.cpp index f644d8fe1..24204cfd0 100644 --- a/src/kvilib/net/kvi_url.cpp +++ b/src/kvilib/net/KviUrl.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_url.cpp +// File : KviUrl.cpp // Creation date : Sat Aug 17 14:09:18 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -24,7 +24,7 @@ -#include "kvi_url.h" +#include "KviUrl.h" #include <QUrl> KviUrl::KviUrl() diff --git a/src/kvilib/net/kvi_url.h b/src/kvilib/net/KviUrl.h index 813af9645..39b046ad8 100644 --- a/src/kvilib/net/kvi_url.h +++ b/src/kvilib/net/KviUrl.h @@ -2,7 +2,7 @@ #define _KVI_URL_H_ //============================================================================= // -// File : kvi_url.h +// File : KviUrl.h // Creation date : Sat Aug 17 14:09:16 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/KviTalApplication.cpp index 5cf1178ae..9e2a2f538 100644 --- a/src/kvilib/tal/kvi_tal_application.cpp +++ b/src/kvilib/tal/KviTalApplication.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_application.cpp +// File : KviTalApplication.cpp // Creation date : Sun Aug 12 2001 04:34:21 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ //============================================================================= -#include "kvi_tal_application.h" +#include "KviTalApplication.h" #ifdef COMPILE_KDE_SUPPORT KviTalApplication::KviTalApplication(int &, char **) @@ -52,5 +52,5 @@ void KviTalApplication::commitData(QSessionManager & manager) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_application.moc" + #include "KviTalApplication.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_application.h b/src/kvilib/tal/KviTalApplication.h index a915d5b79..cbbe5c889 100644 --- a/src/kvilib/tal/kvi_tal_application.h +++ b/src/kvilib/tal/KviTalApplication.h @@ -2,7 +2,7 @@ #define _KVI_TAL_APPLICATION_H_ //============================================================================= // -// File : kvi_tal_application.h +// File : KviTalApplication.h // Creation date : Sun Jun 18 2000 12:53:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -29,7 +29,7 @@ //============================================================================= /** -* \file kvi_tal_application.h +* \file KviTalApplication.h * \author Szymon Stefanek * \brief Toolkit Abstraction Level class */ diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/KviTalFileDialog.cpp index 7403e6e60..b60cfc870 100644 --- a/src/kvilib/tal/kvi_tal_filedialog.cpp +++ b/src/kvilib/tal/KviTalFileDialog.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_filedialog.cpp +// File : KviTalFileDialog.cpp // Creation date : Thu Sep 11 2003 04:09:24 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -24,7 +24,7 @@ -#include "kvi_tal_filedialog.h" +#include "KviTalFileDialog.h" #ifdef COMPILE_KDE_SUPPORT @@ -108,5 +108,5 @@ void KviTalFileDialog::setDirectory(const QString & szDirectory) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_filedialog.moc" + #include "KviTalFileDialog.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_filedialog.h b/src/kvilib/tal/KviTalFileDialog.h index 19c51013a..523cda79b 100644 --- a/src/kvilib/tal/kvi_tal_filedialog.h +++ b/src/kvilib/tal/KviTalFileDialog.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_filedialog.h +// File : KviTalFileDialog.h // Creation date : Thu Sep 11 2003 04:41:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ //============================================================================= /** -* \file kvi_tal_filedialog.h +* \file KviTalFileDialog.h * \author Szymon Stefanek * \brief Toolkit Abstraction Layer class */ diff --git a/src/kvilib/tal/kvi_tal_groupbox.cpp b/src/kvilib/tal/KviTalGroupBox.cpp index 019632ddb..86ba10935 100644 --- a/src/kvilib/tal/kvi_tal_groupbox.cpp +++ b/src/kvilib/tal/KviTalGroupBox.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_groupbox.cpp +// File : KviTalGroupBox.cpp // Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_tal_groupbox.h" +#include "KviTalGroupBox.h" #include <QChildEvent> #include <QGroupBox> @@ -136,5 +136,5 @@ void KviTalGroupBox::setLayout(QLayout * layout) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_groupbox.moc" + #include "KviTalGroupBox.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_groupbox.h b/src/kvilib/tal/KviTalGroupBox.h index b1a01b8e8..767fe08eb 100644 --- a/src/kvilib/tal/kvi_tal_groupbox.h +++ b/src/kvilib/tal/KviTalGroupBox.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_groupbox.h +// File : KviTalGroupBox.h // Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ //============================================================================= /** -* \file kvi_tal_groupbox.h +* \file KviTalGroupBox.h * \author Szymon Stefanek * \brief Class for groupbox */ diff --git a/src/kvilib/tal/kvi_tal_hbox.cpp b/src/kvilib/tal/KviTalHBox.cpp index 1ef76a912..4953a012d 100644 --- a/src/kvilib/tal/kvi_tal_hbox.cpp +++ b/src/kvilib/tal/KviTalHBox.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_hbox.cpp +// File : KviTalHBox.cpp // Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QChildEvent> @@ -124,5 +124,5 @@ void KviTalHBox::addSpacing(int iSpacing) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_hbox.moc" + #include "KviTalHBox.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_hbox.h b/src/kvilib/tal/KviTalHBox.h index c5d0f0dd8..07870c31a 100644 --- a/src/kvilib/tal/kvi_tal_hbox.h +++ b/src/kvilib/tal/KviTalHBox.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_hbox.h +// File : KviTalHBox.h // Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -27,7 +27,7 @@ //============================================================================= /** -* \file kvi_tal_hbox.h +* \file KviTalHBox.h * \author Szymon Stefanek * \brief Class for horizontal box */ diff --git a/src/kvilib/tal/kvi_tal_itemdelegates.cpp b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp index ff2519971..6d658836b 100644 --- a/src/kvilib/tal/kvi_tal_itemdelegates.cpp +++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_itemdelegates.cpp +// File : KviTalIconAndRichTextItemDelegate.cpp // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_tal_itemdelegates.h" +#include "KviTalIconAndRichTextItemDelegate.h" #include <QListWidget> #include <QPainter> diff --git a/src/kvilib/tal/kvi_tal_itemdelegates.h b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h index 5045a5bbe..6bfb429b5 100644 --- a/src/kvilib/tal/kvi_tal_itemdelegates.h +++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_itemdelegates.h +// File : KviTalIconAndRichTextItemDelegate.h // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ //============================================================================= /** -* \file kvi_tal_itemdelegates.h +* \file KviTalIconAndRichTextItemDelegate.h * \author Szymon Stefanek * \brief Class for item delegates */ diff --git a/src/kvilib/tal/kvi_tal_listwidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp index dea5bcac6..dd92bfe64 100644 --- a/src/kvilib/tal/kvi_tal_listwidget.cpp +++ b/src/kvilib/tal/KviTalListWidget.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_listwidget.cpp +// File : KviTalListWidget.cpp // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution @@ -22,8 +22,8 @@ // //============================================================================= -#include "kvi_tal_listwidget.h" -#include "kvi_tal_itemdelegates.h" +#include "KviTalListWidget.h" +#include "KviTalIconAndRichTextItemDelegate.h" #include <QEvent> #include <QPainter> @@ -185,5 +185,5 @@ int KviTalListWidgetPixmap::rtti() const } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_listwidget.moc" + #include "KviTalListWidget.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_listwidget.h b/src/kvilib/tal/KviTalListWidget.h index e3243f72d..266571ebd 100644 --- a/src/kvilib/tal/kvi_tal_listwidget.h +++ b/src/kvilib/tal/KviTalListWidget.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_listwidget.h +// File : KviTalListWidget.h // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_tal_itemdelegates.h" +#include "KviTalIconAndRichTextItemDelegate.h" #include <QListWidget> diff --git a/src/kvilib/tal/kvi_tal_mainwindow.cpp b/src/kvilib/tal/KviTalMainWindow.cpp index 779ce060d..6ffd0f703 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.cpp +++ b/src/kvilib/tal/KviTalMainWindow.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_mainwindow.coo +// File : KviTalMainWindow.coo // Creation date : Sun Aug 12 2001 04:40:24 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ //============================================================================= -#include "kvi_tal_mainwindow.h" +#include "KviTalMainWindow.h" #ifdef COMPILE_KDE_SUPPORT @@ -61,5 +61,5 @@ void KviTalMainWindow::setUsesBigPixmaps(bool bUse) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_mainwindow.moc" + #include "KviTalMainWindow.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_mainwindow.h b/src/kvilib/tal/KviTalMainWindow.h index 834e8101e..a51309320 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.h +++ b/src/kvilib/tal/KviTalMainWindow.h @@ -2,7 +2,7 @@ #define _KVI_TAL_MAINWINDOW_H_ //============================================================================= // -// File : kvi_tal_mainwindow.h +// File : KviTalMainWindow.h // Creation date : Sun Aug 12 2001 04:41:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -25,7 +25,7 @@ //============================================================================= /** -* \file kvi_tal_mainwindow.h +* \file KviTalMainWindow.h * \author Szymon Stefanek * \brief Toolkit Abstraction Layer class */ diff --git a/src/kvilib/tal/kvi_tal_menubar.cpp b/src/kvilib/tal/KviTalMenuBar.cpp index 8580bba6c..fd396c676 100644 --- a/src/kvilib/tal/kvi_tal_menubar.cpp +++ b/src/kvilib/tal/KviTalMenuBar.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_menubar.cpp +// File : KviTalMenuBar.cpp // Creation date : Sun Aug 12 06:35:18 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ //============================================================================= -#include "kvi_tal_menubar.h" +#include "KviTalMenuBar.h" #ifdef COMPILE_KDE_SUPPORT @@ -47,5 +47,5 @@ KviTalMenuBar::~KviTalMenuBar() } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_menubar.moc" + #include "KviTalMenuBar.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_menubar.h b/src/kvilib/tal/KviTalMenuBar.h index 6415f0aa3..e845753b1 100644 --- a/src/kvilib/tal/kvi_tal_menubar.h +++ b/src/kvilib/tal/KviTalMenuBar.h @@ -2,7 +2,7 @@ #define _KVI_TAL_MENUBAR_H_ //============================================================================= // -// File : kvi_tal_menubar.h +// File : KviTalMenuBar.h // Creation date : Sun Aug 12 06:35:15 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -25,7 +25,7 @@ //============================================================================= /** -* \file kvi_tal_menubar.h +* \file KviTalMenuBar.h * \author Szymon Stefanek * \brief Toolkit Abstraction Layer class */ diff --git a/src/kvilib/tal/kvi_tal_popupmenu.cpp b/src/kvilib/tal/KviTalPopupMenu.cpp index f4f321831..c99aae95b 100644 --- a/src/kvilib/tal/kvi_tal_popupmenu.cpp +++ b/src/kvilib/tal/KviTalPopupMenu.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_popupmenu.cpp +// File : KviTalPopupMenu.cpp // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QMenu> #include <QHash> @@ -210,6 +210,6 @@ void KviTalPopupMenu::slotActionTriggered(bool) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_popupmenu.moc" + #include "KviTalPopupMenu.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_popupmenu.h b/src/kvilib/tal/KviTalPopupMenu.h index e218287af..e0cedc352 100644 --- a/src/kvilib/tal/kvi_tal_popupmenu.h +++ b/src/kvilib/tal/KviTalPopupMenu.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_popupmenu.h +// File : KviTalPopupMenu.h // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/tal/kvi_tal_splitter.cpp b/src/kvilib/tal/KviTalSplitter.cpp index f532f10fc..48cd0a83a 100644 --- a/src/kvilib/tal/kvi_tal_splitter.cpp +++ b/src/kvilib/tal/KviTalSplitter.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_splitter.cpp +// File : KviTalSplitter.cpp // Creation date : Mon Aug 31 2009 19:47:08 by Fabio Bas // // This file is part of the KVirc irc client distribution @@ -22,4 +22,4 @@ // //============================================================================= -#include "kvi_tal_splitter.h" +#include "KviTalSplitter.h" diff --git a/src/kvilib/tal/kvi_tal_splitter.h b/src/kvilib/tal/KviTalSplitter.h index 59ee29cff..945f055ee 100644 --- a/src/kvilib/tal/kvi_tal_splitter.h +++ b/src/kvilib/tal/KviTalSplitter.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_splitter.cpp +// File : KviTalSplitter.cpp // Creation date : Mon Aug 31 2009 19:47:08 by Fabio Bas // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ //============================================================================= /** -* \file kvi_tal_splitter.h +* \file KviTalSplitter.h * \author fabio bas * \brief Class used to workaround unwanted behaviours in QSplitter */ diff --git a/src/kvilib/tal/kvi_tal_tabdialog.cpp b/src/kvilib/tal/KviTalTabDialog.cpp index a5acd2a1a..566768d14 100644 --- a/src/kvilib/tal/kvi_tal_tabdialog.cpp +++ b/src/kvilib/tal/KviTalTabDialog.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_tabdialog.cpp +// File : KviTalTabDialog.cpp // Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_tal_tabdialog.h" +#include "KviTalTabDialog.h" #include <QDialog> #include <QTabWidget> @@ -78,5 +78,5 @@ void KviTalTabDialog::cancelPressed() } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_tabdialog.moc" + #include "KviTalTabDialog.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_tabdialog.h b/src/kvilib/tal/KviTalTabDialog.h index 98f3203eb..de8302649 100644 --- a/src/kvilib/tal/kvi_tal_tabdialog.h +++ b/src/kvilib/tal/KviTalTabDialog.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_tabdialog.h +// File : KviTalTabDialog.h // Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/tal/kvi_tal_tablewidget.cpp b/src/kvilib/tal/KviTalTableWidget.cpp index 21a6dca96..1c107c043 100644 --- a/src/kvilib/tal/kvi_tal_tablewidget.cpp +++ b/src/kvilib/tal/KviTalTableWidget.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_tablewidget.cpp +// File : KviTalTableWidget.cpp // Creation date : Fri Jun 27 2008 10:00:08 by Fabio Bas // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ //============================================================================= -#include "kvi_tal_tablewidget.h" +#include "KviTalTableWidget.h" /* #include "KviPointerHashTable.h" @@ -97,5 +97,5 @@ void KviTalTreeWidget::redirect_itemPressed(QTreeWidgetItem *pItem,int col) } */ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_tablewidget.moc" + #include "KviTalTableWidget.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_tablewidget.h b/src/kvilib/tal/KviTalTableWidget.h index 42a1ed494..11956101c 100644 --- a/src/kvilib/tal/kvi_tal_tablewidget.h +++ b/src/kvilib/tal/KviTalTableWidget.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_tablewidget.h +// File : KviTalTableWidget.h // Creation date : Fri Jun 27 2008 10:00:08 by Fabio Bas // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/KviTalToolBar.cpp index 1d465ae4d..98c2895bd 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.cpp +++ b/src/kvilib/tal/KviTalToolBar.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_toolbar.cpp +// File : KviTalToolBar.cpp // Creation date : Mon Aug 13 05:05:45 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_tal_toolbar.h" +#include "KviTalToolBar.h" #ifdef COMPILE_KDE_SUPPORT KviTalToolBar::KviTalToolBar(const QString & szLabel, QMainWindow * pWnd, Qt::ToolBarArea type, bool bNewLine, const char * pcName) @@ -82,5 +82,5 @@ KviTalToolBar::~KviTalToolBar() } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_toolbar.moc" + #include "KviTalToolBar.moc" #endif // COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_toolbar.h b/src/kvilib/tal/KviTalToolBar.h index 70115714f..e59af5179 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.h +++ b/src/kvilib/tal/KviTalToolBar.h @@ -2,7 +2,7 @@ #define _KVI_TAL_TOOLBAR_H_ //============================================================================= // -// File : kvi_tal_toolbar.h +// File : KviTalToolBar.h // Creation date : Mon Aug 13 05:05:44 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ //============================================================================= /** -* \file kvi_tal_toolbar.h +* \file KviTalToolBar.h * \author Szymon Stefanek * \brief Toolkit Abstraction Layer class */ diff --git a/src/kvilib/tal/kvi_tal_tooltip.cpp b/src/kvilib/tal/KviTalToolTip.cpp index b4249ec4b..86f740d06 100644 --- a/src/kvilib/tal/kvi_tal_tooltip.cpp +++ b/src/kvilib/tal/KviTalToolTip.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_tooltip.cpp +// File : KviTalToolTip.cpp // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QEvent> #include <QHelpEvent> @@ -107,6 +107,6 @@ void KviTalToolTip::maybeTip(const QPoint &) #ifndef COMPILE_ON_WINDOWS #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_tooltip.moc" + #include "KviTalToolTip.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/kvilib/tal/kvi_tal_tooltip.h b/src/kvilib/tal/KviTalToolTip.h index 4051696b0..a07e9d02f 100644 --- a/src/kvilib/tal/kvi_tal_tooltip.h +++ b/src/kvilib/tal/KviTalToolTip.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_tooltip.h +// File : KviTalToolTip.h // Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone // // This file is part of the KVirc irc client distribution diff --git a/src/kvilib/tal/kvi_tal_vbox.cpp b/src/kvilib/tal/KviTalVBox.cpp index 6517ce03e..986ea158a 100644 --- a/src/kvilib/tal/kvi_tal_vbox.cpp +++ b/src/kvilib/tal/KviTalVBox.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_vbox.cpp +// File : KviTalVBox.cpp // Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QChildEvent> @@ -94,5 +94,5 @@ void KviTalVBox::setAlignment(QWidget * pChild, Qt::Alignment alignment) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_vbox.moc" + #include "KviTalVBox.moc" #endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvilib/tal/kvi_tal_vbox.h b/src/kvilib/tal/KviTalVBox.h index b38436aab..b7f92c485 100644 --- a/src/kvilib/tal/kvi_tal_vbox.h +++ b/src/kvilib/tal/KviTalVBox.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_vbox.h +// File : KviTalVBox.h // Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -27,7 +27,7 @@ //============================================================================= /** -* \file kvi_tal_vbox.h +* \file KviTalVBox.h * \author Szymon Stefanek * \brief Class for vertical box */ diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/KviTalWizard.cpp index e72078395..6ef6e9d12 100644 --- a/src/kvilib/tal/kvi_tal_wizard.cpp +++ b/src/kvilib/tal/KviTalWizard.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_tal_wizard.cpp +// File : KviTalWizard.cpp // Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -22,8 +22,8 @@ // //============================================================================= -#include "kvi_tal_wizard.h" -#include "kvi_tal_hbox.h" +#include "KviTalWizard.h" +#include "KviTalHBox.h" #include "KviPointerList.h" #include "KviLocale.h" @@ -535,6 +535,6 @@ QPushButton * KviTalWizard::backButton() #ifdef COMPILE_ON_WINDOWS #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_wizard.moc" + #include "KviTalWizard.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/kvilib/tal/kvi_tal_wizard.h b/src/kvilib/tal/KviTalWizard.h index 0cba628d5..df8208d12 100644 --- a/src/kvilib/tal/kvi_tal_wizard.h +++ b/src/kvilib/tal/KviTalWizard.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : kvi_tal_wizard.h +// File : KviTalWizard.h // Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 427b55385..37f041290 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -31,7 +31,7 @@ #include "kvi_window.h" #include "kvi_channel.h" #include "kvi_query.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QShortcut> diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 95170fe87..e891e8ca8 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -54,7 +54,7 @@ #include "KviNickServRuleSet.h" #include "KviIdentityProfile.h" #include "kvi_defaultscript.h" -#include "kvi_xlib.h" +#include "KviXlib.h" #include "kvi_texticonmanager.h" #include "kvi_texticonwin.h" #include "kvi_historywin.h" @@ -83,14 +83,14 @@ #include "kvi_kvs_eventtriggers.h" #include "kvi_sourcesdate.h" #include "KviPointerHashTable.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #ifndef COMPILE_NO_IPC #include "kvi_ipc.h" #endif #ifdef COMPILE_SSL_SUPPORT - #include "kvi_ssl.h" + #include "KviSSL.h" #endif #include <QSplitter> diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index c034b0cd3..9f3eac555 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include "KviCString.h" #include "KviQString.h" -#include "kvi_tal_application.h" +#include "KviTalApplication.h" #include "KviPointerList.h" #include "KviTimeUtils.h" #include "KviPointerHashTable.h" // ? diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 8ce351051..44e5f9569 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -44,7 +44,7 @@ #include "kvi_coreactionnames.h" #include "kvi_ircconnectionserverinfo.h" #include "kvi_kvs_script.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QObject> diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index 1bb617cbf..b3860b658 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -28,7 +28,7 @@ #include "kvi_app.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" static KviFileTransferManager * g_pFileTransferManager = 0; diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h index 5ae77cbc2..45f64cddb 100644 --- a/src/kvirc/kernel/kvi_filetransfer.h +++ b/src/kvirc/kernel/kvi_filetransfer.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "KviPointerList.h" -#include "kvi_tal_tablewidget.h" +#include "KviTalTableWidget.h" #include <QObject> diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h index 508373f01..e3d68071e 100644 --- a/src/kvirc/kernel/kvi_ipc.h +++ b/src/kvirc/kernel/kvi_ipc.h @@ -39,7 +39,7 @@ #else #ifdef COMPILE_X11_SUPPORT #include <qcoreevent.h> - #include "kvi_xlib.h" // for XEvent + #include "KviXlib.h" // for XEvent #endif //!COMPILE_X11_SUPPORT #endif diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 3e4aa040b..958902b46 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -45,7 +45,7 @@ #include "kvi_out.h" #include "kvi_options.h" #include "kvi_console.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_internalcmd.h" #include "kvi_frame.h" #include "kvi_mexlinkfilter.h" @@ -57,7 +57,7 @@ #include "kvi_app.h" #include "KviDataBuffer.h" #include "kvi_notifylist.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "kvi_defaults.h" #include "kvi_sparser.h" #include "kvi_ircdatastreammonitor.h" @@ -68,7 +68,7 @@ #include "KviMircCntrl.h" #include "KviUserIdentity.h" #include "KviIdentityProfile.h" -#include "kvi_sasl.h" +#include "KviSASL.h" #include "KviNickColors.h" #include <QTimer> @@ -116,7 +116,7 @@ KviIrcConnection::~KviIrcConnection() m_bIdentdAttached = false; if(m_pLocalhostDns) { - QObject::disconnect(m_pLocalhostDns,SIGNAL(lookupDone(KviDns *)),0,0); + QObject::disconnect(m_pLocalhostDns,SIGNAL(lookupDone(KviDnsResolver *)),0,0); if(m_pLocalhostDns->isRunning()) { m_pLocalhostDns->deleteLater(); @@ -1037,10 +1037,10 @@ void KviIrcConnection::userInfoReceived(const QString & szUserName, const QStrin // look it up too if(m_pLocalhostDns) delete m_pLocalhostDns; // it could be only another local host lookup - m_pLocalhostDns = new KviDns(); - connect(m_pLocalhostDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(hostNameLookupTerminated(KviDns *))); + m_pLocalhostDns = new KviDnsResolver(); + connect(m_pLocalhostDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(hostNameLookupTerminated(KviDnsResolver *))); - if(!m_pLocalhostDns->lookup(szHostName,KviDns::Any)) + if(!m_pLocalhostDns->lookup(szHostName,KviDnsResolver::Any)) { if(!_OUTPUT_MUTE) { @@ -1058,7 +1058,7 @@ void KviIrcConnection::userInfoReceived(const QString & szUserName, const QStrin } } -void KviIrcConnection::hostNameLookupTerminated(KviDns *) +void KviIrcConnection::hostNameLookupTerminated(KviDnsResolver *) { if(!m_pLocalhostDns) { @@ -1066,7 +1066,7 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *) return; } - if(m_pLocalhostDns->state() != KviDns::Success) + if(m_pLocalhostDns->state() != KviDnsResolver::Success) { QString szErr = KviError::getDescription(m_pLocalhostDns->error()); if(!m_pUserInfo->hostIp().isEmpty()) diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h index b0ce0d4b1..e89eff30f 100644 --- a/src/kvirc/kernel/kvi_ircconnection.h +++ b/src/kvirc/kernel/kvi_ircconnection.h @@ -63,7 +63,7 @@ class KviIrcConnectionStatistics; class KviRequestQueue; class KviLagMeter; class KviNotifyListManager; -class KviDns; +class KviDnsResolver; class KviUserIdentity; class KviIdentityProfileSet; class KviCString; @@ -172,7 +172,7 @@ private: KviIrcConnectionStatistics * m_pStatistics; // owned, never null - KviDns * m_pLocalhostDns; // FIXME: this should go to an aux structure + KviDnsResolver * m_pLocalhostDns; // FIXME: this should go to an aux structure QTextCodec * m_pSrvCodec; // connection codec: never null QTextCodec * m_pTextCodec; // connection codec: never null @@ -900,7 +900,7 @@ private slots: * \brief Called when the hostname lookup is finished * \return void */ - void hostNameLookupTerminated(KviDns * pDns); + void hostNameLookupTerminated(KviDnsResolver * pDns); signals: /** * \brief Emitted when the away state changes diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 07fb0a424..0bde7324b 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -25,7 +25,7 @@ #include "kvi_ircconnectiontargetresolver.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "KviLocale.h" #include "KviIrcServerDataBase.h" #include "KviProxyDataBase.h" @@ -34,7 +34,7 @@ #include "kvi_options.h" #include "kvi_ircsocket.h" #include "kvi_console.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_internalcmd.h" #include "kvi_frame.h" #include "kvi_mexlinkfilter.h" @@ -229,11 +229,11 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname() m_pProxyDns = 0; } - m_pProxyDns = new KviDns(); - connect(m_pProxyDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(proxyLookupTerminated(KviDns *))); + m_pProxyDns = new KviDnsResolver(); + connect(m_pProxyDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(proxyLookupTerminated(KviDnsResolver *))); if(!m_pProxyDns->lookup(m_pTarget->proxy()->m_szHostname, - m_pTarget->proxy()->isIPv6() ? KviDns::IPv6 : KviDns::IPv4)) + m_pTarget->proxy()->isIPv6() ? KviDnsResolver::IPv6 : KviDnsResolver::IPv4)) { m_pConsole->outputNoFmt(KVI_OUT_SYSTEMWARNING, __tr2qs("Unable to look up the IRC proxy hostname: Can't start the DNS slave")); @@ -254,9 +254,9 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname() } } -void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *) +void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDnsResolver *) { - if(m_pProxyDns->state() != KviDns::Success) + if(m_pProxyDns->state() != KviDnsResolver::Success) { QString szErr = KviError::getDescription(m_pProxyDns->error()); m_pConsole->output(KVI_OUT_SYSTEMERROR, @@ -346,11 +346,11 @@ void KviIrcConnectionTargetResolver::lookupServerHostname() delete m_pServerDns; m_pServerDns = 0; } - m_pServerDns = new KviDns(); - connect(m_pServerDns,SIGNAL(lookupDone(KviDns *)),this, - SLOT(serverLookupTerminated(KviDns *))); + m_pServerDns = new KviDnsResolver(); + connect(m_pServerDns,SIGNAL(lookupDone(KviDnsResolver *)),this, + SLOT(serverLookupTerminated(KviDnsResolver *))); if(!m_pServerDns->lookup(m_pTarget->server()->m_szHostname, - m_pTarget->server()->isIPv6() ? KviDns::IPv6 : KviDns::IPv4)) + m_pTarget->server()->isIPv6() ? KviDnsResolver::IPv6 : KviDnsResolver::IPv4)) { m_pConsole->outputNoFmt(KVI_OUT_SYSTEMERROR, __tr2qs("Unable to look up the server hostname: Can't start the DNS slave")); @@ -366,9 +366,9 @@ void KviIrcConnectionTargetResolver::lookupServerHostname() } -void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *) +void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDnsResolver *) { - if(m_pServerDns->state() != KviDns::Success) + if(m_pServerDns->state() != KviDnsResolver::Success) { QString szErr = KviError::getDescription(m_pServerDns->error()); m_pConsole->output(KVI_OUT_SYSTEMERROR, diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h index b6d140117..ee5021880 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h @@ -30,7 +30,7 @@ #include <QObject> class KviConsole; -class KviDns; +class KviDnsResolver; class KviIrcConnection; class KviIrcConnectionTarget; @@ -55,8 +55,8 @@ private: // Auxiliary stuff QTimer * m_pStartTimer; // timer used to start the connection - KviDns * m_pProxyDns; // the dns object for the proxy hostnames - KviDns * m_pServerDns; // the dns object for the server hostnames + KviDnsResolver * m_pProxyDns; // the dns object for the proxy hostnames + KviDnsResolver * m_pServerDns; // the dns object for the server hostnames char * m_pReadBuffer; unsigned int m_uReadBufferLen; @@ -73,8 +73,8 @@ public: void abort(); protected slots: void asyncStartResolve(); - void serverLookupTerminated(KviDns *); - void proxyLookupTerminated(KviDns *); + void serverLookupTerminated(KviDnsResolver *); + void proxyLookupTerminated(KviDnsResolver *); private: void cleanup(); void lookupProxyHostname(); diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index a97589952..fb453d711 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -50,7 +50,7 @@ #include "kvi_app.h" #include "kvi_kvs_eventtriggers.h" #include "kvi_kvs_script.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_ircurl.h" #include "KviUserIdentity.h" diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 919941106..e9d5ad11f 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -24,7 +24,7 @@ #include "kvi_irclink.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "KviLocale.h" #include "KviIrcServerDataBase.h" #include "KviProxyDataBase.h" @@ -33,7 +33,7 @@ #include "kvi_options.h" #include "kvi_ircsocket.h" #include "kvi_console.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_internalcmd.h" #include "kvi_frame.h" #include "kvi_mexlinkfilter.h" diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/kvi_irclink.h index fc58deae9..9989fd81b 100644 --- a/src/kvirc/kernel/kvi_irclink.h +++ b/src/kvirc/kernel/kvi_irclink.h @@ -39,7 +39,7 @@ class KviConsole; class KviServer; class KviProxy; class KviIrcSocket; -class KviDns; +class KviDnsResolver; class KviIrcConnection; class KviIrcConnectionTarget; class KviIrcConnectionTargetResolver; diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index 68b6f5514..9803316d9 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -26,7 +26,7 @@ #include "kvi_ircsocket.h" #include "KviIrcServer.h" #include "KviProxyDataBase.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_settings.h" #include "kvi_error.h" #include "KviLocale.h" diff --git a/src/kvirc/kernel/kvi_sslmaster.cpp b/src/kvirc/kernel/kvi_sslmaster.cpp index 0acae6285..83fc67519 100644 --- a/src/kvirc/kernel/kvi_sslmaster.cpp +++ b/src/kvirc/kernel/kvi_sslmaster.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_sslmanager.cpp +// File : KviSSLmanager.cpp // Creation date : Mon Jun 17 2002 20:34:00 by Szymon Stefanek // // This file is part of the KVirc irc client distribution diff --git a/src/kvirc/kernel/kvi_sslmaster.h b/src/kvirc/kernel/kvi_sslmaster.h index 1725cfde3..6fb4a5cfe 100644 --- a/src/kvirc/kernel/kvi_sslmaster.h +++ b/src/kvirc/kernel/kvi_sslmaster.h @@ -28,7 +28,7 @@ #ifdef COMPILE_SSL_SUPPORT -#include "kvi_ssl.h" +#include "KviSSL.h" #include "kvi_sockettype.h" class KviWindow; diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index d4963d9c2..c06bb0c9d 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -25,7 +25,7 @@ #include "kvi_kvs_asyncdnsoperation.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "kvi_kvs_script.h" #include "kvi_kvs_variant.h" #include "kvi_app.h" @@ -37,15 +37,15 @@ #include <QTimer> -KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback,KviKvsVariant * pMagic) +KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDnsResolver::QueryType eType,KviKvsScript * pCallback,KviKvsVariant * pMagic) : KviKvsAsyncOperation(pWnd) { - m_pDns = new KviDns(); + m_pDns = new KviDnsResolver(); m_szQuery = szQuery; m_eType = eType; m_pCallback = pCallback; m_pMagic = pMagic; - connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(lookupTerminated(KviDns *))); + connect(m_pDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(lookupTerminated(KviDnsResolver *))); if(!m_pDns->lookup(szQuery,eType)) QTimer::singleShot(10,this,SLOT(dnsStartFailed())); } @@ -62,7 +62,7 @@ void KviKvsAsyncDnsOperation::dnsStartFailed() lookupTerminated(m_pDns); } -void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) +void KviKvsAsyncDnsOperation::lookupTerminated(KviDnsResolver *) { KviWindow * pWnd = window(); if(!g_pApp->windowExists(pWnd))pWnd = g_pActiveWindow; @@ -71,7 +71,7 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) { KviKvsVariantList params; params.setAutoDelete(true); - if(m_pDns->state() == KviDns::Failure) + if(m_pDns->state() == KviDnsResolver::Failure) { params.append(new KviKvsVariant(m_szQuery)); params.append(new KviKvsVariant((kvs_int_t)0)); @@ -99,7 +99,7 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) QString szQuery = m_pDns->query(); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs_ctx("DNS Lookup result for query \"%Q\"","kvs"),&szQuery); - if(m_pDns->state() == KviDns::Failure) + if(m_pDns->state() == KviDnsResolver::Failure) { QString strDescription(KviError::getDescription(m_pDns->error())); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs_ctx("Error: %Q","kvs"),&strDescription); diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h index 97a4f615f..001a17cd8 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "kvi_kvs_asyncoperation.h" #include "KviQString.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" class KviWindow; class KviKvsScript; @@ -37,16 +37,16 @@ class KVIRC_API KviKvsAsyncDnsOperation : public KviKvsAsyncOperation { Q_OBJECT public: - KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback = 0,KviKvsVariant * pMagic = 0); + KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDnsResolver::QueryType eType,KviKvsScript * pCallback = 0,KviKvsVariant * pMagic = 0); virtual ~KviKvsAsyncDnsOperation(); protected: - KviDns * m_pDns; - KviDns::QueryType m_eType; + KviDnsResolver * m_pDns; + KviDnsResolver::QueryType m_eType; KviKvsVariant * m_pMagic; KviKvsScript * m_pCallback; QString m_szQuery; protected slots: - void lookupTerminated(KviDns *); + void lookupTerminated(KviDnsResolver *); void dnsStartFailed(); }; diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 83c7e8947..cde1e5733 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -42,7 +42,7 @@ #include "kvi_iconmanager.h" #include "KviLocale.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QRegExp> @@ -143,9 +143,9 @@ namespace KviKvsCoreCallbackCommands KVSCCC_PARAMETER("magic",KVS_PT_VARIANT,KVS_PF_OPTIONAL,pMagicPtr) KVSCCC_PARAMETERS_END - KviDns::QueryType queryType = KviDns::IPv4; - if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IPv6; - if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDns::Any; + KviDnsResolver::QueryType queryType = KviDnsResolver::IPv4; + if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDnsResolver::IPv6; + if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDnsResolver::Any; KviKvsVariant * pMagic = pMagicPtr ? new KviKvsVariant(*pMagicPtr) : new KviKvsVariant(); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 200b622a9..c40677a11 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -42,14 +42,14 @@ #ifdef COMPILE_X11_SUPPORT #ifndef COMPILE_NO_X_BELL - #include "kvi_xlib.h" // XBell : THIS SHOULD BE INCLUDED AS LAST! + #include "KviXlib.h" // XBell : THIS SHOULD BE INCLUDED AS LAST! #include <unistd.h> // for usleep(); #include <qx11info_x11.h> #define get_xdisplay QX11Info::display #endif #endif -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" // kvi_app.cpp extern KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict; diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index 0d85bd8ba..49a20bd0f 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -208,9 +208,9 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETER("dnsquery",KVS_PT_NONEMPTYSTRING,0,szQuery) KVSCSC_PARAMETERS_END - KviDns::QueryType queryType = KviDns::IPv4; - if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IPv6; - if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDns::Any; + KviDnsResolver::QueryType queryType = KviDnsResolver::IPv4; + if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDnsResolver::IPv6; + if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDnsResolver::Any; new KviKvsAsyncDnsOperation( KVSCSC_pContext->window(), diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index 7acaddded..ec63ba773 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -33,7 +33,7 @@ #include "kvi_app.h" #include "kvi_asynchronousconnectiondata.h" #include "kvi_frame.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_menubar.h" #include "kvi_userinput.h" #include "kvi_out.h" diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index 440c7f95c..217b18fec 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "kvi_kvs_dnsmanager.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "kvi_app.h" #include "kvi_window.h" #include "kvi_out.h" @@ -37,7 +37,7 @@ KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0; -KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList) +KviKvsDnsObject::KviKvsDnsObject(KviDnsResolver * pDns,KviWindow * pWnd,const QString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList) { m_pDns = pDns; m_pWindow = pWnd; @@ -102,10 +102,10 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject) m_pDnsObjects->setAutoDelete(true); } m_pDnsObjects->replace(pObject->dns(),pObject); - connect(pObject->dns(),SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupTerminated(KviDns *))); + connect(pObject->dns(),SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(dnsLookupTerminated(KviDnsResolver *))); } -void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) +void KviKvsDnsManager::dnsLookupTerminated(KviDnsResolver * pDns) { KviKvsDnsObject * o = m_pDnsObjects->find(pDns); if(!o) @@ -132,7 +132,7 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) if(!o->parameterList()) o->setParameterList(new KviKvsVariantList()); - if(o->dns()->state() == KviDns::Failure) + if(o->dns()->state() == KviDnsResolver::Failure) { // $4... is the magic data o->parameterList()->prepend(new KviKvsVariant()); // $3 @@ -155,7 +155,7 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) QString szQuery = o->dns()->query(); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs_ctx("DNS Lookup result for query \"%Q\"","kvs"),&szQuery); - if(o->dns()->state() == KviDns::Failure) + if(o->dns()->state() == KviDnsResolver::Failure) { QString szErr = KviError::getDescription(o->dns()->error()); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs_ctx("Error: %Q","kvs"),&szErr); diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.h b/src/kvirc/kvs/kvi_kvs_dnsmanager.h index 147b24c41..77b57515c 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.h +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.h @@ -30,7 +30,7 @@ #include <QObject> #include <QString> -class KviDns; +class KviDnsResolver; class KviWindow; class KviKvsScript; class KviKvsVariantList; @@ -38,7 +38,7 @@ class KviKvsVariantList; class KviKvsDnsObject { public: - KviKvsDnsObject(KviDns * pDns, + KviKvsDnsObject(KviDnsResolver * pDns, KviWindow * pWnd, const QString &szQuery, bool bRebindOnWindowClose = true, @@ -46,14 +46,14 @@ public: KviKvsVariantList * pParameterList = 0); ~KviKvsDnsObject(); protected: - KviDns * m_pDns; + KviDnsResolver * m_pDns; KviWindow * m_pWindow; QString m_szQuery; KviKvsScript * m_pCallback; // callback to be executed when the dns terminates KviKvsVariantList * m_pParameterList; // parameter list (magic) bool m_bRebindOnWindowClose; // should we trigger the callback even if m_pWindow no longer exists ? public: - KviDns * dns(){ return m_pDns; }; + KviDnsResolver * dns(){ return m_pDns; }; KviWindow * window(){ return m_pWindow; }; KviKvsScript * callback(){ return m_pCallback; }; KviKvsVariantList * parameterList(){ return m_pParameterList; }; @@ -79,7 +79,7 @@ public: void addDns(KviKvsDnsObject * pObject); protected slots: - void dnsLookupTerminated(KviDns * pDns); + void dnsLookupTerminated(KviDnsResolver * pDns); private: void abortAll(); }; diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h index 390ddbf8a..ed0e89d74 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.h +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h @@ -32,7 +32,7 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_runtimecontext.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QLabel> #include <QPixmap> diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index a041d55e5..f35d82f65 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -30,7 +30,7 @@ #include "kvi_actionmanager.h" #include "kvi_iconmanager.h" #include "KviLocale.h" -#include "kvi_tal_listwidget.h" +#include "KviTalListWidget.h" #include <QLayout> #include <QLabel> diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/kvi_actiondrawer.h index 970666ccf..bfa96443c 100644 --- a/src/kvirc/ui/kvi_actiondrawer.h +++ b/src/kvirc/ui/kvi_actiondrawer.h @@ -32,7 +32,7 @@ #include "kvi_settings.h" #include "KviQString.h" -#include "kvi_tal_listwidget.h" +#include "KviTalListWidget.h" #include <QWidget> #include <QTabWidget> diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index dfa617d00..7d95efdd4 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -55,7 +55,7 @@ #include "KviPointerHashTable.h" #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index c53aff8cc..6866982a0 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -36,10 +36,10 @@ #include "kvi_input.h" #include "kvi_error.h" #include "KviProxyDataBase.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "KviIrcServer.h" #include "KviIrcServerDataBase.h" -#include "kvi_dns.h" +#include "KviDnsResolver.h" #include "kvi_defaults.h" #include "KviIrcUserDataBase.h" #include "kvi_channel.h" @@ -69,8 +69,8 @@ #include "kvi_msgbox.h" #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalHBox.h" +#include "KviTalPopupMenu.h" #include "KviNickColors.h" #ifdef COMPILE_SSL_SUPPORT diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index 7f3295c0e..1dc43dcd9 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -43,7 +43,7 @@ class QToolBar; class KviAvatar; -class KviDns; +class KviDnsResolver; class KviIrcUserDataBase; class KviIrcUserEntry; class KviServer; diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index 154f554e5..f63f75735 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -30,7 +30,7 @@ #include "KviCryptEngine.h" #include "KviHeapObject.h" #include "kvi_toolwindows_container.h" - #include "kvi_tal_listwidget.h" + #include "KviTalListWidget.h" #include <QWidget> #include <QPushButton> diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 1b5521393..5bb10534b 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -30,7 +30,7 @@ #include "kvi_app.h" #include "kvi_actionmanager.h" #include "kvi_customtoolbardescriptor.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QCursor> #include <QLayout> diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h index 65480e0a5..3a3e1e4dd 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.h +++ b/src/kvirc/ui/kvi_dynamictooltip.h @@ -25,7 +25,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QObject> diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index e262b40d5..9cda81d10 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -30,7 +30,7 @@ #include "KviFileUtils.h" #include "kvi_frame.h" #include "KviQString.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QDir> #include <QIcon> diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h index 827e80f8a..9b0ef465a 100644 --- a/src/kvirc/ui/kvi_filedialog.h +++ b/src/kvirc/ui/kvi_filedialog.h @@ -36,7 +36,7 @@ #include "kvi_settings.h" #include "KviCString.h" -#include "kvi_tal_filedialog.h" +#include "KviTalFileDialog.h" #include <QStringList> diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index a5800bc14..778d1bcf1 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -58,7 +58,7 @@ #include "kvi_ircview.h" #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_texticonmanager.h" #include "kvi_shortcuts.h" diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index a1b46bf6f..d3eade256 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -33,7 +33,7 @@ #include "kvi_settings.h" -#include "kvi_tal_mainwindow.h" +#include "KviTalMainWindow.h" #include "KviQString.h" #include "KviPointerList.h" diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 2ca37c120..0b0c78ebb 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" #include "kvi_dynamictooltip.h" -#include "kvi_tal_listwidget.h" +#include "KviTalListWidget.h" #include <QDialog> #include <QComboBox> diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 8760129e3..5566813b1 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -41,9 +41,9 @@ #include "kvi_historywin.h" #include "kvi_userinput.h" #include "kvi_shortcuts.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_tooltip.h" +#include "KviTalPopupMenu.h" +#include "KviTalHBox.h" +#include "KviTalToolTip.h" #include <QLabel> #include <QFileDialog> diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp index fae285928..a341e9530 100644 --- a/src/kvirc/ui/kvi_input_editor.cpp +++ b/src/kvirc/ui/kvi_input_editor.cpp @@ -41,7 +41,7 @@ #include "kvi_options.h" #include "KviQString.h" #include "kvi_out.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_texticonwin.h" #include "kvi_texticonmanager.h" #include "kvi_userinput.h" diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index 014f7c0ce..797981c68 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -40,7 +40,7 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_irccontext.h" #include "kvi_lagmeter.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_mdimanager.h" #include <QStyle> diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 82a5dd573..8f16bc801 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -96,7 +96,7 @@ #include "kvi_ircconnection.h" #include "kvi_mdimanager.h" #include "kvi_userinput.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "KviAnimatedPixmap.h" #include <QBitmap> diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h index 9fdf87821..d38d32f2d 100644 --- a/src/kvirc/ui/kvi_ircviewtools.h +++ b/src/kvirc/ui/kvi_ircviewtools.h @@ -25,7 +25,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QFrame> #include <QString> diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 190eaa3a6..4c3418eb8 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -38,7 +38,7 @@ #include "kvi_settings.h" #include "kvi_iconmanager.h" #include "kvi_window.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_ircconnection.h" #include "kvi_ircconnectiontarget.h" #include "kvi_irccontext.h" diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 82cbdee88..74e79dd51 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -39,8 +39,8 @@ #include "kvi_frame.h" #include "kvi_menubar.h" #include "kvi_app.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_hbox.h" +#include "KviTalPopupMenu.h" +#include "KviTalHBox.h" #include <QMenuBar> #include <QLayout> diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index cfe782917..5554023ad 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -39,7 +39,7 @@ #include "kvi_actionmanager.h" #include "kvi_coreactionnames.h" #include "kvi_kvs_script.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" KviMenuBar::KviMenuBar(KviFrame * par,const char * name) : KviTalMenuBar(par,name) diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/kvi_menubar.h index debbea53b..7f2e17669 100644 --- a/src/kvirc/ui/kvi_menubar.h +++ b/src/kvirc/ui/kvi_menubar.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include "KviPointerList.h" #include "KviCString.h" -#include "kvi_tal_menubar.h" +#include "KviTalMenuBar.h" class KviFrame; class KviTalPopupMenu; diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 847dfde57..a6ac2c992 100644 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -26,7 +26,7 @@ #include "kvi_options.h" #include "kvi_ircconnectionserverinfo.h" #include "kvi_ircconnectionuserinfo.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QEvent> #include <QResizeEvent> diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 8c944189d..ccadb5163 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -31,7 +31,7 @@ #include "KviLocale.h" #include "kvi_app.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #define KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER 4 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE 6 diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 890f13303..18fc9ba69 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include "kvi_selectors.h" #include "KviPointerList.h" -#include "kvi_tal_groupbox.h" +#include "KviTalGroupBox.h" #include <QFrame> #include <QLayout> diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 2436eb7d8..2b6577116 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -46,7 +46,7 @@ #include "KviMircCntrl.h" #include "kvi_toolwindows_container.h" #include "kvi_kvs_eventtriggers.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index f77678c7b..c822813d6 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -31,7 +31,7 @@ #include "KviMircCntrl.h" #include "kvi_filedialog.h" #include "kvi_kvs_script.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QLabel> #include <QPainter> diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index c0c4a5e20..ee4a7de01 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -29,9 +29,9 @@ #include "kvi_settings.h" #include "KviCString.h" #include "KviPixmap.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_listwidget.h" +#include "KviTalHBox.h" +#include "KviTalVBox.h" +#include "KviTalListWidget.h" #include <QTreeWidget> #include <QScrollArea> diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index a00c65aff..32c1449b5 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -37,7 +37,7 @@ #include "kvi_modulemanager.h" #include "kvi_statusbarapplet.h" #include "kvi_dynamictooltip.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QPainter> #include <QStyle> diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h index ebca92d3c..6bf056122 100644 --- a/src/kvirc/ui/kvi_statusbar.h +++ b/src/kvirc/ui/kvi_statusbar.h @@ -39,7 +39,7 @@ #include "KviPointerList.h" #include "KviHeapObject.h" #include "KviPointerHashTable.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QString> #include <QStatusBar> diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index d81ac9048..0f70ee8d1 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -46,10 +46,10 @@ #include "kvi_buildinfo.h" #include "kvi_settings.h" #include "KviMiscUtils.h" -#include "kvi_http.h" -#include "kvi_url.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_tooltip.h" +#include "KviHttpRequest.h" +#include "KviUrl.h" +#include "KviTalPopupMenu.h" +#include "KviTalToolTip.h" #include <QPainter> #include <QStyle> diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h index 8d163cb5c..82b3f4d06 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.h +++ b/src/kvirc/ui/kvi_statusbarapplet.h @@ -30,7 +30,7 @@ #include "KviHeapObject.h" #include "kvi_statusbar.h" #include "KviPointerHashTable.h" -#include "kvi_http.h" +#include "KviHttpRequest.h" #include <QString> #include <QStatusBar> diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index 69cd9ee8c..f8361c3ee 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -26,7 +26,7 @@ #include "kvi_frame.h" #include "KviLocale.h" #include "kvi_app.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QCursor> #include <QEvent> diff --git a/src/kvirc/ui/kvi_toolbar.h b/src/kvirc/ui/kvi_toolbar.h index ddaa3976f..0fdcff460 100644 --- a/src/kvirc/ui/kvi_toolbar.h +++ b/src/kvirc/ui/kvi_toolbar.h @@ -24,7 +24,7 @@ // //============================================================================= -#include "kvi_tal_toolbar.h" +#include "KviTalToolBar.h" class KVIRC_API KviToolBar : public KviTalToolBar { diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 39908dbd3..7cd32703c 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -26,7 +26,7 @@ #include "kvi_toolwindows_container.h" #include "kvi_iconmanager.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QPainter> #include <QApplication> diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 1157ecfb7..e003fe84b 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -42,8 +42,8 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_htmlgenerator.h" #include "KviMircCntrl.h" -#include "kvi_tal_tooltip.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalToolTip.h" +#include "KviTalPopupMenu.h" #include "kvi_themedlabel.h" #include <QLineEdit> diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h index 5fbe21ef3..228b18347 100644 --- a/src/kvirc/ui/kvi_topicw.h +++ b/src/kvirc/ui/kvi_topicw.h @@ -28,8 +28,8 @@ #include "KviCString.h" #include "kvi_app.h" #include "kvi_input_editor.h" -#include "kvi_tal_listwidget.h" -#include "kvi_tal_itemdelegates.h" +#include "KviTalListWidget.h" +#include "KviTalIconAndRichTextItemDelegate.h" #include <QFrame> #include <QPushButton> diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index 6ff046738..5b51ac21f 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -45,7 +45,7 @@ #include "KviIrcUserDataBase.h" #include "KviIrcMask.h" #include "KviTimeUtils.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <time.h> diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 745e81018..f71f67eb5 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -55,8 +55,8 @@ #include "KviMircCntrl.h" #include "kvi_toolwindows_container.h" #include "kvi_kvs_script.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_tooltip.h" +#include "KviTalPopupMenu.h" +#include "KviTalToolTip.h" #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index a7482729f..03a92e412 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -37,8 +37,8 @@ #include "kvi_irccontext.h" #include "kvi_ircconnection.h" #include "kvi_input.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_splitter.h" +#include "KviTalHBox.h" +#include "KviTalSplitter.h" #ifdef COMPILE_ON_WINDOWS // The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition diff --git a/src/kvirc/ui/kvi_windowlist.h b/src/kvirc/ui/kvi_windowlist.h index b6741bc00..7f6615c10 100644 --- a/src/kvirc/ui/kvi_windowlist.h +++ b/src/kvirc/ui/kvi_windowlist.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" #include "KviPointerList.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QPushButton> #include <QFrame> diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp index 0e68e098f..3e5dc2f61 100644 --- a/src/kvirc/ui/kvi_windowlist_tree.cpp +++ b/src/kvirc/ui/kvi_windowlist_tree.cpp @@ -29,7 +29,7 @@ #include "kvi_frame.h" #include "KviLocale.h" #include "kvi_options.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_window.h" #include "kvi_windowlist_tree.h" diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/aboutdialog.h index 9fd444907..198a193e6 100644 --- a/src/modules/about/aboutdialog.h +++ b/src/modules/about/aboutdialog.h @@ -24,7 +24,7 @@ // //============================================================================= -#include "kvi_tal_tabdialog.h" +#include "KviTalTabDialog.h" class KviAboutDialog : public KviTalTabDialog { diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 17948b033..44cc175bb 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -39,9 +39,9 @@ #include "kvi_action.h" #include "kvi_kvs_useraction.h" #include "kvi_customtoolbarmanager.h" -#include "kvi_tal_vbox.h" -#include <kvi_tal_groupbox.h> -#include "kvi_tal_itemdelegates.h" +#include "KviTalVBox.h" +#include <KviTalGroupBox.h> +#include "KviTalIconAndRichTextItemDelegate.h" #include "kvi_fileextensions.h" #include <QList> diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index fc8542714..107d115c3 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -37,8 +37,8 @@ #include "kvi_fileextensions.h" #include "kvi_kvs_script.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_listwidget.h" -#include "kvi_tal_tooltip.h" +#include "KviTalListWidget.h" +#include "KviTalToolTip.h" #include <QPainter> #include <QPixmap> diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h index 8288363e5..45a6b8656 100644 --- a/src/modules/addon/managementdialog.h +++ b/src/modules/addon/managementdialog.h @@ -25,7 +25,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_tal_listwidget.h" +#include "KviTalListWidget.h" #include <QWidget> #include <QLabel> diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index a701bcdd0..a4757f1fd 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -41,7 +41,7 @@ #include "kvi_filedialog.h" #include "KviCommandFormatter.h" #include "kvi_module.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include "kvi_fileextensions.h" #include <QList> diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h index 95309481c..ed4d6a4ff 100644 --- a/src/modules/aliaseditor/aliaseditor.h +++ b/src/modules/aliaseditor/aliaseditor.h @@ -27,7 +27,7 @@ #include "kvi_window.h" #include "KviCString.h" #include "KviPointerList.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "KviHeapObject.h" #include <QWidget> diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index 5a576c9f8..6b9fef501 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -30,7 +30,7 @@ #include "KviMemory.h" #include "kvi_app.h" #include "kvi_options.h" -#include "kvi_http.h" +#include "KviHttpRequest.h" #include "kvi_iconmanager.h" #include "KviAvatar.h" #include "KviIrcUserDataBase.h" @@ -44,7 +44,7 @@ #include "kvi_sparser.h" #include "kvi_out.h" #include "KviIrcMask.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QLineEdit> #include <QPushButton> diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index b5a75e1d4..da9026a69 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -34,7 +34,7 @@ #include "kvi_console.h" #include "KviRegisteredChannel.h" #include "kvi_kvs_script.h" -#include "kvi_tal_groupbox.h" +#include "KviTalGroupBox.h" #include <QTreeWidget> #include <QLabel> diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp index 6c0e59ea2..eada4b4ed 100644 --- a/src/modules/classeditor/classeditor.cpp +++ b/src/modules/classeditor/classeditor.cpp @@ -43,7 +43,7 @@ #include "kvi_filedialog.h" #include "KviCommandFormatter.h" #include "kvi_module.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include "kvi_fileextensions.h" #include "kvi_modulemanager.h" diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h index b1418cdcc..6b98f5e3f 100644 --- a/src/modules/classeditor/classeditor.h +++ b/src/modules/classeditor/classeditor.h @@ -33,7 +33,7 @@ #include "kvi_window.h" #include "KviCString.h" #include "KviPointerList.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "KviHeapObject.h" #include "kvi_kvs_object_class.h" diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index 13ad8ab21..bdc856812 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -36,7 +36,7 @@ #include "KviParameterList.h" #include "kvi_kvs_script.h" #include "kvi_kvs_variantlist.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QPushButton> #include <QLayout> diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index ee9fb4b62..01bbf8e3b 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -41,7 +41,7 @@ #include "KviLocale.h" #include "kvi_error.h" #include "kvi_out.h" - #include "kvi_netutils.h" + #include "KviNetUtils.h" #include "kvi_console.h" #include "kvi_frame.h" #include "KviMemory.h" diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index aa1095b34..79012192b 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -27,7 +27,7 @@ #ifdef COMPILE_DCC_CANVAS #include "KviCString.h" #include "KviLocale.h" - #include "kvi_tal_popupmenu.h" + #include "KviTalPopupMenu.h" #include <QCursor> #include <QPainter> diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 3ce235aaf..6ac90a686 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -39,7 +39,7 @@ #include "KviLocale.h" #include "kvi_error.h" #include "kvi_out.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_console.h" #include "kvi_frame.h" #include "KviMemory.h" @@ -54,7 +54,7 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_kvs_eventtriggers.h" #include "KviMircCntrl.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QEvent> #include <QResizeEvent> diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index 61d8b27cc..b3ca78111 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -38,7 +38,7 @@ #include "KviLocale.h" #include "kvi_out.h" #include "kvi_console.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_frame.h" #include "kvi_console.h" #include "kvi_error.h" diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index b97d0ee55..8464c94a7 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -25,7 +25,7 @@ #include "marshal.h" #include "kvi_settings.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_error.h" #include "kvi_options.h" #include "KviLocale.h" diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index dbb8ebb93..d550c114c 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -43,7 +43,7 @@ #include "KviLocale.h" #include "kvi_out.h" #include "kvi_console.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_frame.h" #include "kvi_console.h" #include "kvi_error.h" diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 437890d3c..bbad7d198 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -38,7 +38,7 @@ #include "KviLocale.h" #include "kvi_error.h" #include "kvi_out.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_console.h" #include "kvi_frame.h" #include "KviMemory.h" diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h index 260a28948..3c6cd2abc 100644 --- a/src/modules/dcc/send.h +++ b/src/modules/dcc/send.h @@ -34,9 +34,9 @@ #include "KviPointerList.h" #include "kvi_filetransfer.h" #include "KviTimeUtils.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_vbox.h" +#include "KviTalPopupMenu.h" +#include "KviTalHBox.h" +#include "KviTalVBox.h" #include <QLabel> #include <QProgressBar> diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp index dc712791d..09f0b49dc 100644 --- a/src/modules/dcc/thread.cpp +++ b/src/modules/dcc/thread.cpp @@ -29,7 +29,7 @@ #include "kvi_error.h" #include "kvi_memmove.h" #include "KviMemory.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_socket.h" #ifdef COMPILE_SSL_SUPPORT diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h index 877ea56bb..109ec3a9c 100644 --- a/src/modules/dcc/thread.h +++ b/src/modules/dcc/thread.h @@ -32,7 +32,7 @@ #include <QObject> #ifdef COMPILE_SSL_SUPPORT - #include "kvi_ssl.h" + #include "KviSSL.h" #endif // KviThreadDataEvent<int> diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp index 9c90fe151..e9c1864e4 100644 --- a/src/modules/dcc/utils.cpp +++ b/src/modules/dcc/utils.cpp @@ -28,7 +28,7 @@ #include "kvi_options.h" #include "KviLocale.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_ircsocket.h" #include "kvi_irclink.h" #include "KviQString.h" diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp index 91e875c15..896d7b98b 100644 --- a/src/modules/dcc/video.cpp +++ b/src/modules/dcc/video.cpp @@ -34,13 +34,13 @@ #include "KviLocale.h" #include "kvi_out.h" #include "kvi_error.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_options.h" #include "kvi_console.h" #include "KviMemory.h" #include "kvi_socket.h" #include "kvi_ircconnection.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include "KviMircCntrl.h" #include "kvi_frame.h" diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h index 1213bc369..31588ab7e 100644 --- a/src/modules/dcc/video.h +++ b/src/modules/dcc/video.h @@ -32,7 +32,7 @@ #include "kvi_window.h" #include "KviDataBuffer.h" #include "kvi_sockettype.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include "kvi_themedlabel.h" #include <QLabel> diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index e59ad40fd..df84c9127 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -34,13 +34,13 @@ #include "KviLocale.h" #include "kvi_out.h" #include "kvi_error.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_options.h" #include "kvi_console.h" #include "KviMemory.h" #include "kvi_socket.h" #include "kvi_ircconnection.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QFrame> #include <QSlider> diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h index 35c726d3f..11e5cb31a 100644 --- a/src/modules/dcc/voice.h +++ b/src/modules/dcc/voice.h @@ -32,7 +32,7 @@ #include "kvi_window.h" #include "KviDataBuffer.h" #include "kvi_sockettype.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QLabel> #include <QToolButton> diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp index b08cbf2c4..9b86b483c 100644 --- a/src/modules/dcc/window.cpp +++ b/src/modules/dcc/window.cpp @@ -24,7 +24,7 @@ #include "window.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d) : KviWindow(type,lpFrm,name, d->console()) diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 7bc51493a..7e85774b5 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -35,7 +35,7 @@ #include "kvi_iconmanager.h" #include "kvi_kvs_script.h" #include "kvi_msgbox.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QMessageBox> #include <QLayout> diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 2d2247ff5..6a81bbda2 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -41,9 +41,9 @@ #include "kvi_kvs_kernel.h" #include "kvi_modulemanager.h" #include "KviConfigurationFile.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_groupbox.h" +#include "KviTalVBox.h" +#include "KviTalHBox.h" +#include "KviTalGroupBox.h" #include <QScrollBar> #include <QLayout> diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index 58db627b5..1398b6469 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -28,7 +28,7 @@ #include "kvi_scripteditor.h" #include "KviPointerList.h" #include "kvi_selectors.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QCompleter> #include <QLabel> diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index 00f15aefa..c31d444a3 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -39,8 +39,8 @@ #include "KviQString.h" #include "kvi_filedialog.h" #include "kvi_kvs_eventmanager.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalVBox.h" +#include "KviTalPopupMenu.h" #include <QMessageBox> #include <QSplitter> diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h index eadd127ba..ee9118903 100644 --- a/src/modules/eventeditor/eventeditor.h +++ b/src/modules/eventeditor/eventeditor.h @@ -26,7 +26,7 @@ #include "kvi_window.h" #include "KviCString.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QWidget> #include <QLineEdit> diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 720c5a43c..239f23cc8 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -35,7 +35,7 @@ #include "kvi_themedlabel.h" #include "kvi_input.h" #include "KviQString.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include "kvi_frame.h" #include "kvi_mdimanager.h" diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h index df96484fb..fb6108bc0 100644 --- a/src/modules/filetransferwindow/filetransferwindow.h +++ b/src/modules/filetransferwindow/filetransferwindow.h @@ -32,9 +32,9 @@ #include "kvi_moduleextension.h" #include "kvi_filetransfer.h" #include "kvi_dynamictooltip.h" -#include "kvi_tal_tablewidget.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_itemdelegates.h" +#include "KviTalTableWidget.h" +#include "KviTalPopupMenu.h" +#include "KviTalIconAndRichTextItemDelegate.h" #include <QTimer> #include <QPixmap> diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index 956aed4ae..567d25348 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.h @@ -26,7 +26,7 @@ #include "index.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QTextBrowser> #include <QProgressBar> diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h index 7852e99d0..31b526531 100644 --- a/src/modules/help/helpwindow.h +++ b/src/modules/help/helpwindow.h @@ -26,8 +26,8 @@ #include "kvi_window.h" #include "KviCString.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_listwidget.h" +#include "KviTalVBox.h" +#include "KviTalListWidget.h" #include <QTabWidget> #include <QLineEdit> diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 7c53191b8..feda63127 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -29,11 +29,11 @@ #include "KviLocale.h" #include "kvi_window.h" #include "kvi_iconmanager.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_kvs_eventtriggers.h" #include "kvi_console.h" #include "kvi_kvs_script.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QPainter> @@ -335,7 +335,7 @@ void KviHttpFileTransfer::init() g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>; g_pHttpFileTransfers->setAutoDelete(false); - QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false); + QPixmap * pix = g_pIconManager->getImage("KviHttpRequesticons.png", false); if(pix)g_pHttpIcon = new QPixmap(*pix); else g_pHttpIcon = 0; } diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h index af904a47a..f1449ee60 100644 --- a/src/modules/http/httpfiletransfer.h +++ b/src/modules/http/httpfiletransfer.h @@ -25,7 +25,7 @@ //============================================================================= #include "kvi_filetransfer.h" -#include "kvi_http.h" +#include "KviHttpRequest.h" #include "KviTimeUtils.h" #include "kvi_kvs_variant.h" diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index f9c12a4c1..f071a0cf6 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -28,7 +28,7 @@ #include "kvi_socket.h" #include "kvi_app.h" #include "kvi_out.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "KviLocale.h" #include "kvi_window.h" #include "kvi_options.h" diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 215e0674d..f733ed099 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -36,7 +36,7 @@ #include "kvi_themedlabel.h" #include "kvi_irccontext.h" #include "kvi_ircconnection.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QToolTip> #include <QLabel> diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h index 3b9dcc62a..5c92ffaf7 100644 --- a/src/modules/links/linkswindow.h +++ b/src/modules/links/linkswindow.h @@ -30,7 +30,7 @@ #include "kvi_sparser.h" #include "kvi_console.h" #include "kvi_irccontext.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_themedtreewidget.h" #include <QToolButton> diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 0ec8ab125..9b8a5748a 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -42,7 +42,7 @@ #include "kvi_filedialog.h" #include "kvi_msgbox.h" #include "kvi_fileextensions.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include "kvi_htmlgenerator.h" #include "kvi_themedlineedit.h" diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h index a5ab7e9ed..5725d59ff 100644 --- a/src/modules/list/listwindow.h +++ b/src/modules/list/listwindow.h @@ -31,7 +31,7 @@ #include "kvi_sparser.h" #include "kvi_console.h" #include "kvi_irccontext.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_themedtreewidget.h" #include <QToolButton> diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index b56523cac..62ca73513 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -35,7 +35,7 @@ #include "KviQString.h" #include "kvi_app.h" #include "KviFileUtils.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QList> #include <QPixmap> diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h index 7e8ec68f5..a9e03799b 100644 --- a/src/modules/logview/logviewmdiwindow.h +++ b/src/modules/logview/logviewmdiwindow.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include "kvi_window.h" #include "kvi_moduleextension.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QTreeWidget> #include "KviPointerList.h" diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index fb761d535..3b30d6a62 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -32,7 +32,7 @@ #include "KviConfigurationFile.h" #include "kvi_app.h" #include "KviQString.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QMessageBox> #include <QDir> diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h index 5f37eebe0..091273830 100644 --- a/src/modules/mircimport/libkvimircimport.h +++ b/src/modules/mircimport/libkvimircimport.h @@ -26,8 +26,8 @@ #include "kvi_mexserverimport.h" #include "KviCString.h" -#include "kvi_http.h" -#include <kvi_tal_wizard.h> +#include "KviHttpRequest.h" +#include <KviTalWizard.h> #include <QLineEdit> #include <QLabel> diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h index 5b41b0fec..e659784c2 100644 --- a/src/modules/notifier/notifierwindow.h +++ b/src/modules/notifier/notifierwindow.h @@ -30,7 +30,7 @@ #include "kvi_settings.h" #include "KviQString.h" #include "KviPointerList.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "KviTimeUtils.h" #include <QBitmap> diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 89c714025..6633bbad6 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include <kvi_tal_groupbox.h> +#include <KviTalGroupBox.h> #include "class_groupbox.h" #include "kvi_error.h" #include "kvi_debug.h" diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h index b1447e749..07320df56 100644 --- a/src/modules/objects/class_groupbox.h +++ b/src/modules/objects/class_groupbox.h @@ -27,7 +27,7 @@ -#include <kvi_tal_groupbox.h> +#include <KviTalGroupBox.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index e224b95ec..b38310c65 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -26,7 +26,7 @@ #include "kvi_debug.h" #include "KviLocale.h" #include "class_hbox.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" const char * const align_tbl[] = { "Left", diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 5621b87c1..c1a58580d 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_tal_mainwindow.h" +#include "KviTalMainWindow.h" #include "class_mainwindow.h" #include "kvi_error.h" #include "kvi_debug.h" diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 013fa945e..6c1b78fa7 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -30,7 +30,7 @@ #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QCursor> #include <QMenu> diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index e35c62654..a22082902 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -36,8 +36,8 @@ #include "KviFileUtils.h" #include "KviLocale.h" #include "kvi_error.h" -#include "kvi_netutils.h" -#include "kvi_dns.h" +#include "KviNetUtils.h" +#include "KviDnsResolver.h" #include "kvi_error.h" #include "kvi_socket.h" #include "KviMemory.h" @@ -1000,9 +1000,9 @@ void KviKvsObject_socket::lookupRemoteIp() if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = 0; if(m_pDns)delete m_pDns; - m_pDns = new KviDns(); - connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(lookupDone(KviDns *))); - if(!m_pDns->lookup(m_szRemoteIp,KviDns::Any)) + m_pDns = new KviDnsResolver(); + connect(m_pDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(lookupDone(KviDnsResolver *))); + if(!m_pDns->lookup(m_szRemoteIp,KviDnsResolver::Any)) { unsigned int uOldConnectionId = m_uConnectionId; KviKvsVariantList lParams; @@ -1013,10 +1013,10 @@ void KviKvsObject_socket::lookupRemoteIp() } } -void KviKvsObject_socket::lookupDone(KviDns *pDns) +void KviKvsObject_socket::lookupDone(KviDnsResolver *pDns) { - if(pDns->state() != KviDns::Success) + if(pDns->state() != KviDnsResolver::Success) { unsigned int uOldConnectionId = m_uConnectionId; KviKvsVariantList lParams; diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h index a4e252693..40ac42d47 100644 --- a/src/modules/objects/class_socket.h +++ b/src/modules/objects/class_socket.h @@ -36,7 +36,7 @@ #define KVI_SCRIPT_SOCKET_STATUS_LISTENING 3 #define KVI_SCRIPT_SOCKET_STATUS_CONNECTED 4 -class KviDns; +class KviDnsResolver; class KviDataBuffer; #include "object_macros.h" @@ -56,7 +56,7 @@ protected: kvi_u32_t m_uLocalPort; unsigned int m_uConnectTimeout; QSocketNotifier * m_pSn; - KviDns * m_pDns; + KviDnsResolver * m_pDns; QTimer * m_pDelayTimer; char * m_pInBuffer; unsigned int m_uInBufferLen; @@ -103,7 +103,7 @@ protected: protected slots: void doConnect(); void lookupRemoteIp(); - void lookupDone(KviDns * pDns); + void lookupDone(KviDnsResolver * pDns); void connectTimeoutSlot(); void writeNotifierFired(int); void readNotifierFired(int); diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index b650d38b8..b572bbb08 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -26,8 +26,8 @@ #include "class_toolbar.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_tal_toolbar.h" -#include "kvi_tal_mainwindow.h" +#include "KviTalToolBar.h" +#include "KviTalMainWindow.h" #include "KviLocale.h" #include "kvi_iconmanager.h" #include "class_mainwindow.h" diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 0de288057..4e44c8efa 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -29,7 +29,7 @@ #include "KviLocale.h" #include "kvi_iconmanager.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" /* @doc: toolbutton @keyterms: diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index 5ac157775..dbf172b5a 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -29,7 +29,7 @@ #include "class_vbox.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" // Tables used in $setAlignment & $alignment diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index f2575793c..3debaef5d 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "KviCString.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include "object_macros.h" #ifdef COMPILE_WEBKIT_SUPPORT diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 5d7d5559e..b2b5b2127 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include <kvi_tal_wizard.h> +#include <KviTalWizard.h> #include "class_wizard.h" #include "kvi_error.h" diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/class_wizard.h index 5b5ba6e63..1b71cd06e 100644 --- a/src/modules/objects/class_wizard.h +++ b/src/modules/objects/class_wizard.h @@ -25,7 +25,7 @@ // //============================================================================= -#include <kvi_tal_wizard.h> +#include <KviTalWizard.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index d37e47f6b..5c4ea7e0d 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "kvi_iconmanager.h" #include "kvi_app.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QLayout> #include <QPushButton> diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 47081bc79..a83a2d66e 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -31,10 +31,10 @@ #include "kvi_iconmanager.h" #include "kvi_module.h" #include "KviPointerHashTable.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_tooltip.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_groupbox.h" +#include "KviTalVBox.h" +#include "KviTalToolTip.h" +#include "KviTalPopupMenu.h" +#include "KviTalGroupBox.h" #include <QLayout> #include <QLabel> diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index 03f96ef4f..7e2bc9d46 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -27,7 +27,7 @@ #include "KviLocale.h" #include "kvi_selectors.h" #include "kvi_options.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) : KviOptionsWidget(parent) diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index 6836601da..af86ea88d 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -32,7 +32,7 @@ #include <QLabel> #include <QRadioButton> -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(QWidget * parent) : KviOptionsWidget(parent) diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index a793660bc..120c7d545 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -35,10 +35,10 @@ #include "kvi_filedialog.h" #include "kvi_fileextensions.h" #include "kvi_iconmanager.h" -#include "kvi_http.h" +#include "KviHttpRequest.h" #include "KviIdentityProfile.h" -#include "kvi_tal_tooltip.h" -#include "kvi_tal_hbox.h" +#include "KviTalToolTip.h" +#include "KviTalHBox.h" #include <QTreeWidget> #include <QCheckBox> diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index bc532583c..1265a5bb7 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -28,7 +28,7 @@ #include "kvi_options.h" #include "KviLocale.h" #include "kvi_app.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QLayout> diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index 21de881c1..5fcdbfd2b 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "kvi_options.h" #include "KviLocale.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QLayout> #include <QComboBox> diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 8619b22b9..8aaa893e3 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -27,7 +27,7 @@ #include "kvi_options.h" #include "KviLocale.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QLayout> diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index 2a4a631bf..114be5bf5 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -26,7 +26,7 @@ #include "kvi_options.h" #include "KviLocale.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QLayout> #include <QLabel> diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 8329a621d..8a4e794ea 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -34,7 +34,7 @@ #include "KviMircCntrl.h" #include "KviConfigurationFile.h" #include "kvi_filedialog.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include <QLayout> #include <QPushButton> diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h index e66556f67..90093a8d2 100644 --- a/src/modules/options/optw_messages.h +++ b/src/modules/options/optw_messages.h @@ -26,7 +26,7 @@ #include "kvi_optionswidget.h" #include "KviMessageTypeSettings.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QTreeWidget> #include <QItemDelegate> diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index 0cd0caa97..cd3e49a86 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -29,7 +29,7 @@ #include "KviLocale.h" #include "KviNickServRuleSet.h" #include "KviIrcMask.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QTreeWidget> #include <QLayout> diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index 5454f8140..79c9e1dfe 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -28,12 +28,12 @@ #include "kvi_iconmanager.h" #include "KviProxyDataBase.h" #include "kvi_ipeditor.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_settings.h" #include "kvi_options.h" -#include "kvi_tal_groupbox.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_tooltip.h" +#include "KviTalGroupBox.h" +#include "KviTalPopupMenu.h" +#include "KviTalToolTip.h" #include <QLabel> #include <QLineEdit> diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 1cb23f13c..e742cfa9d 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -34,7 +34,7 @@ #include "kvi_iconmanager.h" #include "KviIrcServerDataBase.h" #include "kvi_ipeditor.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "kvi_settings.h" #include "kvi_filedialog.h" #include "KviConfigurationFile.h" @@ -52,8 +52,8 @@ #include "KviProxyDataBase.h" #include "kvi_kvs_script.h" #include "KviPointerHashTable.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_tooltip.h" +#include "KviTalPopupMenu.h" +#include "KviTalToolTip.h" #include <QLineEdit> #include <QCursor> diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index 54c49ae84..04632afcd 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -30,8 +30,8 @@ #include "kvi_modulemanager.h" #include "KviPointerList.h" #include "KviCString.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_tooltip.h" +#include "KviTalHBox.h" +#include "KviTalToolTip.h" #include "kvi_app.h" #include <QLabel> diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 4bbae171a..d38e19ed4 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -29,7 +29,7 @@ #include "KviLocale.h" #include "kvi_filedialog.h" #include "kvi_fileextensions.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QLayout> #include <QCursor> diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h index 611bc9aee..167975d7c 100644 --- a/src/modules/options/optw_texticons.h +++ b/src/modules/options/optw_texticons.h @@ -26,8 +26,8 @@ #include "kvi_optionswidget.h" #include "kvi_texticonmanager.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_hbox.h" +#include "KviTalPopupMenu.h" +#include "KviTalHBox.h" #include <QToolButton> #include <QTableWidget> diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 55a6e8854..40dc73a47 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -28,7 +28,7 @@ #include "kvi_internalcmd.h" #include "kvi_options.h" #include "KviLocale.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include <QLayout> diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index c4a35c17b..31ff44e4c 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -39,7 +39,7 @@ #include "kvi_kvs_popupmenu.h" #include "kvi_kvs_variantlist.h" #include "KviPointerHashTable.h" -#include "kvi_tal_vbox.h" +#include "KviTalVBox.h" #include "kvi_fileextensions.h" #include <QMessageBox> diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h index 75a0d8fa3..37f29817e 100644 --- a/src/modules/popupeditor/popupeditor.h +++ b/src/modules/popupeditor/popupeditor.h @@ -27,7 +27,7 @@ #include "kvi_window.h" #include "KviCString.h" #include <QTreeWidget> -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QWidget> #include <QLineEdit> diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index e6c3cc1c7..0b56d4ef9 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -39,8 +39,8 @@ #include "KviCommandFormatter.h" #include "kvi_kvs_eventmanager.h" #include "kvi_kvs_eventhandler.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalVBox.h" +#include "KviTalPopupMenu.h" #include <QMessageBox> #include <QSplitter> diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 4d2325d02..6df0a77fb 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -43,8 +43,8 @@ #include "KviStringConversion.h" #include "kvi_options.h" #include "KviPointerHashTable.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_vbox.h" +#include "KviTalHBox.h" +#include "KviTalVBox.h" #include <QLayout> #include <QLabel> diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h index 5e3cb8d47..e3eff6420 100644 --- a/src/modules/reguser/dialog.h +++ b/src/modules/reguser/dialog.h @@ -29,8 +29,8 @@ #include "kvi_selectors.h" #include "KviPointerHashTable.h" #include <QTreeWidget> -#include "kvi_tal_listwidget.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalListWidget.h" +#include "KviTalPopupMenu.h" #include <QWidget> #include <QLineEdit> diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 633458046..d49c2404f 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -43,8 +43,8 @@ #include "KviStringConversion.h" #include "kvi_options.h" #include "KviPointerHashTable.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_vbox.h" +#include "KviTalHBox.h" +#include "KviTalVBox.h" #include <QLayout> #include <QLabel> diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h index e453b9b84..aa5d6fece 100644 --- a/src/modules/reguser/edituser.h +++ b/src/modules/reguser/edituser.h @@ -29,8 +29,8 @@ #include "kvi_selectors.h" #include "KviPointerHashTable.h" #include <QTreeWidget> -#include "kvi_tal_popupmenu.h" -#include <kvi_tal_tabdialog.h> +#include "KviTalPopupMenu.h" +#include <KviTalTabDialog.h> #include <QListWidget> #include <QWidget> diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h index 27481475d..4b9b23afa 100644 --- a/src/modules/reguser/wizard.h +++ b/src/modules/reguser/wizard.h @@ -25,7 +25,7 @@ //============================================================================= #include "KviCString.h" -#include "kvi_tal_wizard.h" +#include "KviTalWizard.h" #include <QCheckBox> diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 2a14b5291..df291feee 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -31,12 +31,12 @@ bool g_bFoundMirc; #include "KviFileUtils.h" #include "kvi_defaults.h" #include "kvi_msgbox.h" -#include "kvi_tal_filedialog.h" +#include "KviTalFileDialog.h" #include "KviQString.h" #include "KviEnvironment.h" #include "kvi_options.h" #include "KviConfigurationFile.h" -#include "kvi_tal_hbox.h" +#include "KviTalHBox.h" #include <QTextEdit> #include <QMessageBox> diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h index f2d0fdd71..f7085cfc4 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/setupwizard.h @@ -27,10 +27,10 @@ #include "kvi_settings.h" #include "KviCString.h" #include "kvi_selectors.h" -#include "kvi_tal_wizard.h" -#include "kvi_tal_vbox.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_groupbox.h" +#include "KviTalWizard.h" +#include "KviTalVBox.h" +#include "KviTalHBox.h" +#include "KviTalGroupBox.h" #include <QLabel> #include <QPixmap> diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 6027be480..3ee9b76f8 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -35,8 +35,8 @@ #include "kvi_themedlabel.h" #include "kvi_input.h" #include "kvi_filedialog.h" -#include "kvi_tal_hbox.h" -#include "kvi_tal_vbox.h" +#include "KviTalHBox.h" +#include "KviTalVBox.h" #include <QDateTimeEdit> #include <QLabel> diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 8696709b3..6f908dc68 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -40,7 +40,7 @@ #if defined( COMPILE_SSL_SUPPORT ) && !defined( COMPILE_NO_EMBEDDED_CODE ) // The current implementation - #include <kvi_ssl.h> + #include <KviSSL.h> #include <openssl/evp.h> #include <openssl/pem.h> #elif defined(COMPILE_NO_EMBEDDED_CODE) diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h index 4c2c076c3..d8ec94900 100644 --- a/src/modules/term/termwidget.h +++ b/src/modules/term/termwidget.h @@ -30,7 +30,7 @@ #include <QFrame> #include <QLabel> #include <QPushButton> - #include "kvi_tal_hbox.h" + #include "KviTalHBox.h" #include "kparts/part.h" diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 49116bcc8..4d92276d6 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -41,8 +41,8 @@ #include "kvi_dynamictooltip.h" #include "kvi_iconmanager.h" #include "kvi_msgbox.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_listwidget.h" +#include "KviTalPopupMenu.h" +#include "KviTalListWidget.h" #include <QLayout> diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h index 3df640222..0b69960c0 100644 --- a/src/modules/theme/managementdialog.h +++ b/src/modules/theme/managementdialog.h @@ -27,9 +27,9 @@ #include "kvi_optionswidget.h" #include "KviPointerList.h" #include "kvi_theme.h" -#include "kvi_tal_popupmenu.h" -#include "kvi_tal_wizard.h" -#include "kvi_tal_listwidget.h" +#include "KviTalPopupMenu.h" +#include "KviTalWizard.h" +#include "KviTalListWidget.h" #include <QWidget> #include <QComboBox> diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h index 145ffdcbf..9d2140727 100644 --- a/src/modules/theme/savethemedialog.h +++ b/src/modules/theme/savethemedialog.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "KviPointerList.h" #include "kvi_theme.h" -#include "kvi_tal_wizard.h" +#include "KviTalWizard.h" #include <QDialog> diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index fdc61fc93..08a3c19dd 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -37,7 +37,7 @@ #include "KviFileUtils.h" #include "kvi_filedialog.h" #include "kvi_kvs_useraction.h" -#include "kvi_tal_tooltip.h" +#include "KviTalToolTip.h" #include "kvi_fileextensions.h" #include <QPushButton> diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index c2ea870a4..c11d6bda8 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -41,7 +41,7 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_options.h" #include "kvi_ircview.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include <QPixmap> #include <QPainter> diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp index 10a69864d..c3eacb17c 100644 --- a/src/modules/upnp/libkviupnp.cpp +++ b/src/modules/upnp/libkviupnp.cpp @@ -25,7 +25,7 @@ #include "kvi_settings.h" #include "kvi_module.h" #include "KviCString.h" -#include "kvi_netutils.h" +#include "KviNetUtils.h" #include "manager.h" diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index abcb31819..3ad3d2ef6 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -36,7 +36,7 @@ #include "kvi_windowlist.h" #include "KviPointerList.h" #include "kvi_kvs_eventmanager.h" -#include "kvi_tal_popupmenu.h" +#include "KviTalPopupMenu.h" #include "kvi_window.h" #include "kvi_options.h" #include "KviQString.h" diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h index e180b2290..a5b1fbc53 100644 --- a/src/modules/url/libkviurl.h +++ b/src/modules/url/libkviurl.h @@ -28,7 +28,7 @@ #include "KviConfigurationFile.h" #include "kvi_irctoolbar.h" #include "kvi_window.h" -#include "kvi_tal_menubar.h" +#include "KviTalMenuBar.h" #include "kvi_mextoolbar.h" #include "kvi_kvs_action.h" #include <QTreeWidget> |