diff options
Diffstat (limited to 'src')
39 files changed, 347 insertions, 866 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 9392c6dd0..031c482f8 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -67,7 +67,6 @@ SET(kvilib_SRCS core/kvi_memmove.cpp core/kvi_qstring.cpp core/kvi_string.cpp - core/kvi_stringarray.cpp ext/kvi_cmdformatter.cpp ext/kvi_config.cpp ext/kvi_crypt.cpp diff --git a/src/kvilib/core/kvi_stringarray.cpp b/src/kvilib/core/kvi_stringarray.cpp deleted file mode 100644 index 6e9169f15..000000000 --- a/src/kvilib/core/kvi_stringarray.cpp +++ /dev/null @@ -1,118 +0,0 @@ -//================================================================================================= -// -// File : kvi_stringarray.cpp -// Creation date : Tue Jun 6 02:20:20 by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -//================================================================================================= - - - -#include "kvi_stringarray.h" -#include "kvi_malloc.h" - -KviStringArray::KviStringArray() -{ - m_uSize = 0; - m_pData = 0; - m_uHighestIdx = 0; -} - -KviStringArray::~KviStringArray() -{ - if(m_pData)clear(); -} - - -void KviStringArray::clear() -{ - if(!m_pData)return; - for(unsigned int i=0;i<m_uSize;i++) - { - if(m_pData[i])delete m_pData[i]; - } - kvi_free(m_pData); - m_pData = 0; - m_uHighestIdx = 0; - m_uSize = 0; -} - -void KviStringArray::insert(unsigned int uIdx,KviStr * pVal) -{ - if(m_uSize <= uIdx) - { - unsigned int uOldSize = m_uSize; - m_uSize = uIdx + KVI_STRING_ARRAY_FREESPACE_SIZE; - m_pData = (KviStr **)kvi_realloc(m_pData,m_uSize * sizeof(KviStr *)); - for(unsigned int u = uOldSize;u < m_uSize;u++) - { - m_pData[u] = 0; - } - } else { - if(m_pData[uIdx])delete m_pData[uIdx]; - } - if(uIdx > m_uHighestIdx)m_uHighestIdx = uIdx; - m_pData[uIdx] = pVal; -} - -void KviStringArray::remove(unsigned int uIdx) -{ - if(uIdx > m_uHighestIdx)return; - if(m_pData[uIdx]) - { - delete m_pData[uIdx]; - m_pData[uIdx] = 0; - if(uIdx == m_uHighestIdx) - { - // shrink the array - if(m_uHighestIdx == 0)clear(); - else { - unsigned int u = m_uHighestIdx - 1; - while(!m_pData[u])u--; - if((m_uHighestIdx - u) > KVI_STRING_ARRAY_FREESPACE_SIZE)shrink(u); - else m_uHighestIdx = u; // just set the max index - } - } - } -} - -void KviStringArray::shrink(unsigned int uMaxItem) -{ - m_uHighestIdx = uMaxItem; - m_uSize = uMaxItem + 1; - m_pData = (KviStr **)kvi_realloc(m_pData,sizeof(KviStr *) * m_uSize); -} - -void KviStringArray::copyFrom(KviStringArray * a) -{ - clear(); - m_uSize = a->m_uSize; - m_uHighestIdx = a->m_uHighestIdx; - if(m_uSize > 0) - { - m_pData = (KviStr **)kvi_malloc(sizeof(KviStr *) * m_uSize); - for(unsigned int i=0;i<m_uSize;i++) - { - if(a->m_pData[i])m_pData[i] = new KviStr(*(a->m_pData[i])); - else m_pData[i] = 0; - } - } else { - m_pData = 0; - } -} diff --git a/src/kvilib/core/kvi_stringarray.h b/src/kvilib/core/kvi_stringarray.h deleted file mode 100644 index e3c9c3262..000000000 --- a/src/kvilib/core/kvi_stringarray.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _KVI_STRINGARRAY_H_ -#define _KVI_STRINGARRAY_H_ -//================================================================================================= -// -// File : kvi_stringarray.h -// Creation date : Tue Jun 6 02:20:20 by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -//================================================================================================= - -#include "kvi_settings.h" -#include "kvi_string.h" -#include "kvi_heapobject.h" - -#define KVI_STRING_ARRAY_FREESPACE_SIZE 16 - -class KVILIB_API KviStringArray : public KviHeapObject -{ -public: - KviStringArray(); - ~KviStringArray(); -public: - unsigned int m_uSize; - unsigned int m_uHighestIdx; - KviStr ** m_pData; -public: - void clear(); - void insert(unsigned int uIdx,KviStr * pVal); - void copyFrom(KviStringArray * a); - unsigned int size(){ return (m_uSize == 0) ? 0 : (m_uHighestIdx + 1); }; - bool isEmpty(){ return m_uSize == 0; }; - void remove(unsigned int uIdx); - void shrink(unsigned int uMaxItem); - KviStr * uncheckedAt(unsigned int uIdx){ return m_pData[uIdx]; }; - KviStr * at(unsigned int uIdx){ return m_uSize > uIdx ? m_pData[uIdx] : 0; }; - KviStr * getAt(unsigned int uIdx){ KviStr * t = at(uIdx); if(t)m_pData[uIdx] = 0; return t; }; -}; - -#endif //_KVI_STRINGARRAY_H_ diff --git a/src/kvilib/core/kvi_valuelist.h b/src/kvilib/core/kvi_valuelist.h deleted file mode 100644 index 65ed2674b..000000000 --- a/src/kvilib/core/kvi_valuelist.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef _KVI_VALUELIST_H_ -#define _KVI_VALUELIST_H_ -//================================================================================================= -// -// File : kvi_valuelist.h -// Creation date : Mon Jan 15 2007 04:53 by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -//================================================================================================= - -#include "kvi_settings.h" - -#include <QList> -#define KviValueList QList - - -#endif //_KVI_VALUELIST_H_ diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp index bfcfe1f78..bc33ae4d2 100644 --- a/src/kvilib/ext/kvi_config.cpp +++ b/src/kvilib/ext/kvi_config.cpp @@ -638,9 +638,9 @@ void KviConfig::writeEntry(const QString & szKey,const QStringList &list) p_group->replace(szKey,p_data); } -////////////////////////////////// KviValueList<int> +////////////////////////////////// QList<int> -KviValueList<int> KviConfig::readIntListEntry(const QString & szKey,const KviValueList<int> &list) +QList<int> KviConfig::readIntListEntry(const QString & szKey,const QList<int> &list) { KviConfigGroup * p_group = getCurrentGroup(); QString * p_str = p_group->find(szKey); @@ -651,7 +651,7 @@ KviValueList<int> KviConfig::readIntListEntry(const QString & szKey,const KviVal } QStringList sl = p_str->split(","); - KviValueList<int> ret; + QList<int> ret; //debug("Got option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),p_str->latin1()); @@ -666,12 +666,12 @@ KviValueList<int> KviConfig::readIntListEntry(const QString & szKey,const KviVal } -void KviConfig::writeEntry(const QString & szKey,const KviValueList<int> &list) +void KviConfig::writeEntry(const QString & szKey,const QList<int> &list) { m_bDirty = true; KviConfigGroup * p_group = getCurrentGroup(); KviStr szData; - for(KviValueList<int>::ConstIterator it = list.begin();it != list.end();++it) + for(QList<int>::ConstIterator it = list.begin();it != list.end();++it) { if(szData.hasData())szData.append(','); szData.append(KviStr::Format,"%d",*it); diff --git a/src/kvilib/ext/kvi_config.h b/src/kvilib/ext/kvi_config.h index f15287912..6102e09ca 100644 --- a/src/kvilib/ext/kvi_config.h +++ b/src/kvilib/ext/kvi_config.h @@ -29,8 +29,8 @@ #include "kvi_settings.h" #include "kvi_heapobject.h" #include "kvi_pointerhashtable.h" -#include "kvi_valuelist.h" +#include <QList> #include <QColor> #include <QFont> #include <QRect> @@ -125,8 +125,8 @@ public: void writeEntry(const QString & szKey,const QRect &rct); QStringList readStringListEntry(const QString & szKey,const QStringList &list); void writeEntry(const QString & szKey,const QStringList &list); - KviValueList<int> readIntListEntry(const QString & ,const KviValueList<int> &list); - void writeEntry(const QString & szKey,const KviValueList<int> &list); + QList<int> readIntListEntry(const QString & ,const QList<int> &list); + void writeEntry(const QString & szKey,const QList<int> &list); QString readQStringEntry(const QString & szKey,const QString &szDefault = QString::null) { return readEntry(szKey,szDefault); }; //void writeEntry(const QString & szKey,const QString &szValue); diff --git a/src/kvilib/ext/kvi_dcophelper.cpp b/src/kvilib/ext/kvi_dcophelper.cpp index fd3b8e1e5..b88dc4824 100644 --- a/src/kvilib/ext/kvi_dcophelper.cpp +++ b/src/kvilib/ext/kvi_dcophelper.cpp @@ -212,7 +212,7 @@ bool KviDCOPHelper::boolRetVoidDCOPCall(const KviQCString &szObj,const KviQCStri return false; } -bool KviDCOPHelper::qvalueListIntRetIntDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,KviValueList<int> &ret, int iVal) +bool KviDCOPHelper::qvalueListIntRetIntDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,QList<int> &ret, int iVal) { if(!ensureAppRunning(m_szAppId)) return false; @@ -227,7 +227,7 @@ bool KviDCOPHelper::qvalueListIntRetIntDCOPCall(const KviQCString &szObj,const K if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData)) return false; - if(replyType != "KviValueList<int>") + if(replyType != "QList<int>") return false; QDataStream replyStream(replyData, IO_ReadOnly); diff --git a/src/kvilib/ext/kvi_dcophelper.h b/src/kvilib/ext/kvi_dcophelper.h index 317d13ad1..da193431b 100644 --- a/src/kvilib/ext/kvi_dcophelper.h +++ b/src/kvilib/ext/kvi_dcophelper.h @@ -28,11 +28,11 @@ #include "kvi_settings.h" #include "kvi_qstring.h" #include "kvi_qcstring.h" -#include "kvi_valuelist.h" +#include <QList> #ifdef COMPILE_KDE3_SUPPORT -typedef KviValueList<KviQCString> KviQCStringList; +typedef QList<KviQCString> KviQCStringList; class KVILIB_API KviDCOPHelper { @@ -72,7 +72,7 @@ protected: bool intRetIntDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,int &ret, int iVal); bool boolRetVoidDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,bool &ret); - bool qvalueListIntRetIntDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,KviValueList<int> &ret, int iVal); + bool qvalueListIntRetIntDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,QList<int> &ret, int iVal); bool qcstringListRetIntDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,KviQCStringList &ret, int iVal); bool qcstringListRetVoidDCOPCall(const KviQCString &szObj,const KviQCString &szFunc,KviQCStringList &ret); }; diff --git a/src/kvilib/ext/kvi_draganddrop.h b/src/kvilib/ext/kvi_draganddrop.h deleted file mode 100644 index 21c172f98..000000000 --- a/src/kvilib/ext/kvi_draganddrop.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _KVI_DRAGANDDROP_H_ -#define _KVI_DRAGANDDROP_H_ - -//============================================================================= -// -// File : kvi_draganddrop.h -// Creation date : Wed Feb 01 2007 01:45:21 CEST by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -//============================================================================= - -#include "kvi_settings.h" - -#include <QMimeData> -#define KviDragObject QMimeData -#define KviUriDrag QMimeData -#define KviTextDrag QMimeData -#define KviImageDrag QMimeData - -#endif //!_KVI_DRAGANDDROP_H_ diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index ef9e10255..d398074ee 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -901,65 +901,6 @@ void KviApp::destroySplashScreen() } -QString KviApp::getClipboardText() -{ - /* - QString buffer; -#if QT_VERSION >= 300 - bool bOldMode = clipboard()->selectionModeEnabled(); - clipboard()->setSelectionMode(false); -#endif - buffer = clipboard()->text(); -#if QT_VERSION >= 300 - if(buffer.isEmpty()) - { - // lookup the global clipboard - clipboard()->setSelectionMode(true); - buffer = clipboard()->text(); - } - clipboard()->setSelectionMode(bOldMode); -#endif - return buffer; - */ - - QString buffer = clipboard()->text(QClipboard::Clipboard); - if(buffer.isEmpty())return clipboard()->text(QClipboard::Selection); - return buffer; -} - -void KviApp::getClipboardText(KviStr &buffer) -{ - buffer = getClipboardText(); -} - -void KviApp::setClipboardText(const QString &str) -{ - /* -#if QT_VERSION >= 300 - if(clipboard()->supportsSelection()) - { - bool bOldMode = clipboard()->selectionModeEnabled(); - clipboard()->setSelectionMode(true); - clipboard()->setText(str); - clipboard()->setSelectionMode(false); - clipboard()->setText(str); - clipboard()->setSelectionMode(bOldMode); - } else { -#endif - clipboard()->setText(str); -#if QT_VERSION >= 300 - } -#endif*/ - clipboard()->setText(str,QClipboard::Clipboard); - clipboard()->setText(str,QClipboard::Selection); -} - -void KviApp::setClipboardText(const KviStr &str) -{ - qDebug("WARNING: KviApp::setClipboardText(const KviStr &) is deprecated!"); - setClipboardText(QString(str.ptr())); -} - void KviApp::setAvatarFromOptions() { KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict); @@ -1850,12 +1791,6 @@ void KviApp::addRecentUrl(const QString& text) emit(recentUrlsChanged()); } -void KviApp::addRecentNickname(const char * newNick) -{ - QString nk(newNick); - merge_to_stringlist_option(nk,KviOption_stringlistRecentNicknames,KVI_MAX_RECENT_NICKNAMES); -} - void KviApp::addRecentNickname(const QString& newNick) { merge_to_stringlist_option(newNick,KviOption_stringlistRecentNicknames,KVI_MAX_RECENT_NICKNAMES); @@ -1997,37 +1932,6 @@ void KviApp::fillRecentServersListBox(KviTalListBox * l) } */ -bool KviApp::playFile(const char * filename,KviStr &error,KviWindow * w) -{ - g_pMediaManager->lock(); - KviMediaType * m = g_pMediaManager->findMediaType(filename); - if(m) - { - KviStr szCommandline = m->szCommandline; - KviStr szDescription = m->szDescription; - g_pMediaManager->unlock(); - if(szCommandline.hasData()) - { - KviKvsVariantList l; - l.append(new KviKvsVariant(QString(filename))); - - if(!KviKvsScript::run(szCommandline.ptr(),w ? w : g_pActiveWindow,&l)) - { - error.sprintf(__tr("The commandline for media type '%s' seems to be broken"),szDescription.ptr()); - return false; - } - } else { - error.sprintf(__tr("Media type of file %s matched to '%s' but no commandline specified"),filename,szDescription.ptr()); - return false; - } - } else { - g_pMediaManager->unlock(); - error.sprintf(__tr("No idea on how to play file %s (no media type match)"),filename); - return false; - } - return true; -} - void KviApp::heartbeat(kvi_time_t tNow) { const struct tm *pTm = localtime(&tNow); diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 1011a7904..9b534ffa7 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -126,13 +126,7 @@ public: public: - void getClipboardText(KviStr &buffer); - void setClipboardText(const KviStr &str); - - QString getClipboardText(); - void setClipboardText(const QString &str); - - + //FIXME: obsolete. We can use QObject::deleteLater() void collectGarbage(QObject * garbage); void destroyFrame(); @@ -147,7 +141,11 @@ public: bool firstTimeRun(){ return m_bFirstTimeRun; }; void setupBegin(); void setupFinish(); + + /* + Unused inline void emitRecentUrlsChanged() { emit(recentUrlsChanged()); }; + */ // kvi_app.cpp (Saving options) void saveIrcServerDataBase(); @@ -187,23 +185,13 @@ public: void getLocalKvircDirectory(KviStr &szData,KvircSubdir dir,const QString &appendFile = QString::null,bool bCreateIfNeeded = true); void getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null,bool bCreateIfNeeded = true); void getTmpFileName(QString &szBuffer,const QString &szEndingFileName = QString::null); - bool trashFile(const char *filename); void getChannelDumpLogFileName(QString &str); static QTextCodec * defaultTextCodec(); static QTextCodec * defaultSrvCodec(); - // if the mediatype can be guessed ,it is looked up in the media type save path - // if found , true is returned - // if not found or the mediatype can't be guessed then false is returned - bool findFileByMediaType(KviStr &szRetPath,const char * filename) KVI_DEPRECATED; - - bool findImageInImageSearchPath(KviStr &szRetPath,const QString &filename); bool findImageInImageSearchPath(QString &szRetPath,const QString &filename); - bool findUserFile(KviStr &szRetPath,const char *filename) KVI_DEPRECATED; - - bool findImage(KviStr &szRetPath,const char *filename); bool findImage(QString &szRetPath,const QString &filename); bool findImageThemeOnlyCompat(QString &szRetPath,const QString &filename); // temporary compat, will be removed soon (do not use) bool findSmallIcon(QString &szRetPath,const QString &filename); @@ -223,7 +211,6 @@ public: // if no config file has been found: in this case the local config // directory is used // - bool getReadOnlyConfigPath(KviStr &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false); bool getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false); // kvi_app.cpp : Window stuff @@ -254,13 +241,9 @@ public: void setAvatarFromOptions(); - bool playFile(const char * filename,KviStr &error,KviWindow * w = 0); - // uMessageLifetime is in seconds! and 0 means "forever" void notifierMessage(KviWindow * pWnd,int iIconId,const QString &szMsg,unsigned int uMessageLifetime); - - void addRecentNickname(const char * newNick); void addRecentNickname(const QString& newNick); void addRecentChannel(const QString& chan,const QString& net); QStringList* getRecentChannels(const QString& net); diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index 6b89bd642..c60bbeb90 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -181,7 +181,7 @@ void KviApp::getGlobalKvircDirectory(KviStr &szData,KvircSubdir dir,const QStrin QString szBuffer = szData.ptr(); getGlobalKvircDirectory(szBuffer,dir,appendFile); szData=szBuffer; - + } //=============== getLocalKvircDirectory ================// @@ -210,39 +210,6 @@ void KviApp::getTmpFileName(QString &szBuffer,const QString &szEndingFileName) } while(KviFileUtils::fileExists(szBuffer)); } -//====================== trashFile ====================// -// -// Moves a file to the local trash directory -// - -bool KviApp::trashFile(const char *filename) -{ - // Exists ? - QFileInfo fi = QFileInfo(QString::fromUtf8(filename)); - if( !fi.exists() ) return false; // nothing to trash - - // Build the filename - KviStr lastPart = filename; - lastPart.cutToLast(KVI_PATH_SEPARATOR_CHAR); // need only the filename - lastPart.append(".bak_"); - QDateTime tm(QDateTime::currentDateTime()); - lastPart.append(tm.toString()); - lastPart.replaceAll(' ',"_"); - // Ok...have lastPart.bak_Dec_11_31_1999 - // Find the thrash directory (make it if necessary) - KviStr trashFile; - getLocalKvircDirectory(trashFile,Trash,lastPart.ptr(),true); - // Check if a such file already exists - fi.setFile(trashFile.ptr()); - while(fi.exists()) - { - trashFile.append(".rnm"); - fi.setFile(trashFile.ptr()); - } - // rename the file - return KviFileUtils::renameFile(filename,trashFile.ptr()); -} - void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * matches) { QString szDir = word; @@ -323,96 +290,6 @@ void KviApp::getChannelDumpLogFileName(QString &str) KviFileUtils::adjustFilePath(str); } -bool KviApp::findFileByMediaType(KviStr &szRetPath,const char * filename) -{ - g_pMediaManager->lock(); - KviMediaType * m = g_pMediaManager->findMediaType(filename,false); - - if(m) - { - if(m->szSavePath.hasData()) - { - szRetPath = m->szSavePath; - szRetPath.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); - szRetPath.append(filename); - if(KviFileUtils::fileExists(szRetPath.ptr())) - { - // check again the media type... check the magic too - KviMediaType * mt = g_pMediaManager->findMediaType(szRetPath.ptr()); - if(mt == m) - { - g_pMediaManager->unlock(); - //if(retMediaType)*retMediaType = mt; - QString szTmp = szRetPath.ptr(); // FIXME - KviFileUtils::adjustFilePath(szTmp); - szRetPath = szTmp; - return true; - } // else mime type not matched...we should not be looking there! - } - } - } - - g_pMediaManager->unlock(); - return false; -} - -//===================== findUserFile =====================// -// -// Looks for an user file in the standard directories -// - -bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) -{ - static KviApp::KvircSubdir localsubdirs[5]={ Avatars , Incoming , Pics , Audio , Log }; - static KviApp::KvircSubdir globalsubdirs[3]={ Avatars , Pics , Audio }; - - // Absolute paths can not be "found"... they are obvious - if(kvi_isAbsolutePath(filename)) - { - szRetPath=filename; - QString szTmp = szRetPath.ptr(); // FIXME - KviFileUtils::adjustFilePath(szTmp); - szRetPath = szTmp; - return KviFileUtils::fileExists(filename); - } - - // FIXME: #warning "Use the user defined path ?" - - // lookup the magic by name match only... - - if(findFileByMediaType(szRetPath,filename))return true; - - int i; - - for(i= 0;i<5; i++) - { - getLocalKvircDirectory(szRetPath,localsubdirs[i],filename); - if(KviFileUtils::fileExists(szRetPath.ptr()))return true; - } - - for(i= 0;i<3; i++) - { - getGlobalKvircDirectory(szRetPath,globalsubdirs[i],filename); - if(KviFileUtils::fileExists(szRetPath.ptr()))return true; - } - - if(findImageInImageSearchPath(szRetPath,filename))return true; - - // Last resort ... - szRetPath = QDir::homePath(); - szRetPath.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); - szRetPath.append(filename); - if(KviFileUtils::fileExists(szRetPath.ptr()))return true;; - - szRetPath = filename; - //if(retMediaType)*retMediaType = m; - return false; - -//gotit: - //if(retMediaType)*retMediaType = g_pMediaManager->findMediaType(szRetPath.ptr()); -// return true; -} - //========================= findImage ===========================// // // Find a file inside the default "Image" directories @@ -424,22 +301,6 @@ bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) // FIXME: #warning "Check WHEN findImage is used and when findUserFile is used...we have a mess here" -bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const QString &filename) -{ - // first lookup the user defined paths - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end();++it) - { - szRetPath = *it; - szRetPath.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); - szRetPath.append(filename); - //debug("LOOK FOR %s",szRetPath.ptr()); - if(KviFileUtils::fileExists(szRetPath.ptr()))return true; - } - - return false; -} - bool KviApp::findImageInImageSearchPath(QString &szRetPath,const QString &filename) { // first lookup the user defined paths @@ -504,7 +365,7 @@ bool KviApp::mapImageFile(QString &szRetPath,const QString &filename) } } } - + for(i=0;i<2;i++) { getGlobalKvircDirectory(szBuffer,pics_globalsubdirs[i],szRetPath); @@ -519,7 +380,7 @@ bool KviApp::mapImageFile(QString &szRetPath,const QString &filename) } } } - + // Last resort szBuffer = QDir::homePath(); szBuffer.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); @@ -548,14 +409,6 @@ bool KviApp::mapImageFile(QString &szRetPath,const QString &filename) } -bool KviApp::findImage(KviStr &szRetPath,const char *filename) -{ - QString buff; - bool ret=findImage(buff,filename); - szRetPath=buff; - return ret; -} - bool KviApp::findImage(QString &szRetPath,const QString &filename) { // Find an user file... @@ -691,15 +544,6 @@ bool KviApp::findSmallIcon(QString &szRetPath,const QString &filename) // We want to READ a config file...find it // -bool KviApp::getReadOnlyConfigPath(KviStr &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail) -{ - // DEPRECATED - QString tmp; - bool bRet = getReadOnlyConfigPath(tmp,config_name,sbd,bNoFail); - buffer = tmp; - return bRet; -} - bool KviApp::getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail) { // Take a look in the local directory.... diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 2e2a37ddc..981571397 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -473,14 +473,14 @@ KviIconManager::KviIconManager() m_pIconWidget = 0; - KviStr buffer; + QString buffer; // Load the userchanstate image g_pApp->findImage(buffer,KVI_USERCHANSTATE_IMAGE_NAME); - g_pUserChanStatePixmap = new QPixmap(buffer.ptr()); + g_pUserChanStatePixmap = new QPixmap(buffer); g_pApp->findImage(buffer,KVI_ACTIVITYMETER_IMAGE_NAME); - g_pActivityMeterPixmap = new QPixmap(buffer.ptr()); + g_pActivityMeterPixmap = new QPixmap(buffer); m_pIconNames = 0; diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 96c5e7871..41658f1a7 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -844,10 +844,10 @@ static void config_set_section(int flag,KviConfig * cfg) void KviApp::loadOptions() { - KviStr buffer; + QString buffer; if(getReadOnlyConfigPath(buffer,KVI_CONFIGFILE_MAIN)) { - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); int prg = 12; int i; diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index 451f114e0..b1c553457 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -141,19 +141,20 @@ void KviTextIconManager::checkDefaultAssociations() void KviTextIconManager::load() { - KviStr tmps; + QString tmp; int upd = 0; - if(g_pApp->getReadOnlyConfigPath(tmps,KVI_CONFIGFILE_TEXTICONS)) + if(g_pApp->getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_TEXTICONS)) { - upd = load(tmps.ptr(),false); + upd = load(tmp,false); } if(upd == TEXTICONMANAGER_CURRENT_CONFIG_UPDATE)return; // do a merge of the texticons if we have a new config version - QString tmp; g_pApp->getGlobalKvircDirectory(tmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS); - if(QFile::exists(tmp))load(tmp,true); + if(QFile::exists(tmp)) { + load(tmp,true); + } } void KviTextIconManager::save() @@ -176,18 +177,18 @@ int KviTextIconManager::load(const QString &filename,bool bMerge) if(dict) { KviConfigGroupIterator it(*dict); - + KviPointerList<QString> names; names.setAutoDelete(true); - + while(it.current()) { names.append(new QString(it.currentKey())); ++it; } - + cfg.setGroup("TextIcons"); - + for(QString * s = names.first();s;s = names.next()) { int id = cfg.readIntEntry(*s,-1); diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index 6c6e93ef4..90d363b0c 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -30,7 +30,6 @@ #include "kvi_actionmanager.h" #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include "kvi_draganddrop.h" #include "kvi_tal_listwidget.h" #include <QLayout> @@ -65,19 +64,19 @@ KviActionDrawerPageListWidgetItem::~KviActionDrawerPageListWidgetItem() KviActionDrawerPageListWidget::KviActionDrawerPageListWidget(KviActionDrawerPage * pParent) : KviTalListWidget(pParent) { - KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(this);
- setItemDelegate(itemDelegate);
- setSelectionMode(QAbstractItemView::SingleSelection);
- setSortingEnabled(true);
- setMinimumHeight(400);
- setMinimumWidth(380);
-
- QString szPic;
- g_pApp->getGlobalKvircDirectory(szPic,KviApp::Pics);
- szPic.replace('\\',"/");
+ KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(this); + setItemDelegate(itemDelegate); + setSelectionMode(QAbstractItemView::SingleSelection); + setSortingEnabled(true); + setMinimumHeight(400); + setMinimumWidth(380); - szPic += "/kvi_actiondrawer.png";
- QString szStyle("QListWidget {background-image: url(" + szPic + ");background-repeat: no-repeat;background-position: bottom right;}");
+ QString szPic; + g_pApp->getGlobalKvircDirectory(szPic,KviApp::Pics); + szPic.replace('\\',"/"); + + szPic += "/kvi_actiondrawer.png"; + QString szStyle("QListWidget {background-image: url(" + szPic + ");background-repeat: no-repeat;background-position: bottom right;}"); setStyleSheet(szStyle); // m_pPage = pParent; // setSelectionMode(Single);[{[' diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index e0d68ade5..3cb339133 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -299,7 +299,7 @@ void KviChannel::saveProperties(KviConfig *cfg) cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes()); cfg->writeEntry("Splitter",m_pSplitter->sizes()); QList<int> tmp = m_pVertSplitter->sizes(); - KviValueList<int> tmp2; + QList<int> tmp2; for(QList<int>::Iterator it = tmp.begin();it != tmp.end();++it) tmp2.append(*it); cfg->writeEntry("VertSplitter",m_pMessageView ? tmp2 : m_VertSplitterSizesList); @@ -313,7 +313,7 @@ void KviChannel::saveProperties(KviConfig *cfg) void KviChannel::loadProperties(KviConfig *cfg) { int w = width(); - KviValueList<int> def; + QList<int> def; def.append((w * 75) / 100); def.append((w * 15) / 100); def.append((w * 10) / 100); diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 3cf286009..6a5c3687d 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -33,9 +33,9 @@ #include "kvi_userlistview.h" #include "kvi_time.h" #include "kvi_modew.h" -#include "kvi_valuelist.h" #include "kvi_pointerhashtable.h" +#include <QList> #include <QDateTime> #include <QStringList> #include <QToolButton> @@ -141,7 +141,7 @@ protected: unsigned int m_uActionHistoryHotActionCount; KviPointerList<KviChannelAction> * m_pActionHistory; kvi_time_t m_tLastReceivedWhoReply; - KviValueList<int> m_VertSplitterSizesList; + QList<int> m_VertSplitterSizesList; KviTalHBox * m_pButtonContainer; protected: bool eventFilter(QObject *, QEvent *); diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 1687a8231..af412bfbd 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -449,10 +449,10 @@ void KviConsole::showNotifyList(bool bShow) void KviConsole::loadProperties(KviConfig *cfg) { int w = width(); - KviValueList<int> def; + QList<int> def; def.append((w * 85) / 100); def.append((w * 15) / 100); - KviValueList<int> cur = cfg->readIntListEntry("Splitter",def); + QList<int> cur = cfg->readIntListEntry("Splitter",def); // check the size correctness if(cur.count() != 2)cur = def; else { diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index b0ff3c0fc..5ade20cc9 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -34,8 +34,8 @@ #include "kvi_parameterlist.h" #include "kvi_frame.h" -#include "kvi_valuelist.h" +#include <QList> #include <QPixmap> #include <QSplitter> @@ -83,7 +83,7 @@ void KviDebugWindow::loadProperties(KviConfig *cfg) { int w = width(); KviWindow::loadProperties(cfg); - KviValueList<int> def; + QList<int> def; def.append((w * 80) / 100); def.append((w * 20) / 100); m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index c8f63c0ed..63e1a9aa1 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -112,7 +112,7 @@ KviImageDialog::KviImageDialog(QWidget * par, g->addWidget(m_pTypeComboBox,0,0,1,3); - m_pTypeList = new KviValueList<int>; + m_pTypeList = new QList<int>; QString bi = __tr2qs("Builtin images"); diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 0c1bb4ac6..d8e4dce1e 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -24,14 +24,13 @@ #include "kvi_settings.h" #include "kvi_dynamictooltip.h" -#include "kvi_valuelist.h" #include "kvi_tal_listbox.h" #include <QDialog> #include <QComboBox> #include <QTimer> #include <QStringList> - +#include <QList> class KviImageDialogItem : public KviTalListBoxPixmap { @@ -71,7 +70,7 @@ public: virtual ~KviImageDialog(); protected: QComboBox * m_pTypeComboBox; - KviValueList<int> * m_pTypeList; + QList<int> * m_pTypeList; KviTalListBox * m_pListBox; QTimer * m_pTimer; int m_iJobType; diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 124c36a67..5612dc7e3 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -51,7 +51,6 @@ #include "kvi_kvs_kernel.h" #include "kvi_doublebuffer.h" #include "kvi_texticonmanager.h" -#include "kvi_draganddrop.h" #include "kvi_pointerlist.h" #include "kvi_tal_popupmenu.h" #include "kvi_tal_hbox.h" diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index d8670b4c0..68c3fec36 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -103,7 +103,6 @@ #include "kvi_kvs_eventtriggers.h" #include "kvi_doublebuffer.h" #include "kvi_ircurl.h" -#include "kvi_draganddrop.h" #include "kvi_qcstring.h" #include "kvi_tal_popupmenu.h" // FIXME: #warning "There should be an option to preserve control codes in copied text (clipboard) (mIrc = CTRL+Copy->with colors)" diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 922caf6e3..10ec0814a 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -48,8 +48,6 @@ #include "kvi_toolwindows_container.h" #include "kvi_qcstring.h" #include "kvi_kvs_eventtriggers.h" -#include "kvi_draganddrop.h" -#include "kvi_valuelist.h" #include "kvi_tal_hbox.h" #ifdef COMPILE_CRYPT_SUPPORT @@ -59,6 +57,7 @@ #include <QPixmap> #include <QSplitter> +#include <QList> KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) : KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole) @@ -77,7 +76,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) // The button box on the right //KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box"); m_pButtonGrid= (QFrame*) new KviTalHBox(m_pButtonBox); - + createTextEncodingButton(m_pButtonGrid); m_pSplitter = new QSplitter(Qt::Horizontal,this); @@ -85,15 +84,15 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); - - + + m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Show User List"),buttonContainer(),true,"list_view_button"); connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); - + #ifdef COMPILE_CRYPT_SUPPORT createCryptControllerButton(m_pButtonGrid); #endif - + m_pUserListView = new KviUserListView(m_pSplitter,m_pListViewButton,connection()->userDataBase(),this,7,__tr2qs("Query Targets"),"user_list_view"); m_pInput = new KviInput(this,m_pUserListView); @@ -103,7 +102,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) m_pIrcView->enableDnd(TRUE); connect(m_pIrcView,SIGNAL(fileDropped(const char *)),this,SLOT(slotDndEvents(const char *))); - + updateCaption(); } @@ -134,43 +133,43 @@ QString KviQuery::getInfoLabelTipText() { QString tmp; QString szMask; - if(e->hasUser()) + if(e->hasUser()) szMask+=e->user(); - else + else szMask+="*"; szMask+="@"; - if(e->hasHost()) + if(e->hasHost()) szMask+=e->host(); - else + else szMask+="*"; tmp+="\n"; QString szChans; connection()->getCommonChannels(m_szName,szChans,0); if(console()->connection()) { - + txt = "<html>" \ "<body>" \ "<table width=\"100%\">"; - + txt += START_TABLE_BOLD_ROW; txt += __tr2qs("Query target:"); txt += END_TABLE_BOLD_ROW; txt += "<tr><td>"; - + if(e->hasRealName()) tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); else tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask); - + tmp.replace('&',"&"); tmp.replace('<',"<"); tmp.replace('>',">"); - + txt += tmp; - + txt += "</td></tr>"; - + if(e->hasServer()) { txt+="<tr><td>"; @@ -180,24 +179,24 @@ QString KviQuery::getInfoLabelTipText() txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server()); txt+="</td></tr>"; } - + if(e->isAway()) { txt+="<tr><td>"; txt+=__tr2qs("%1 is probably away").arg(m_szName); txt+="</td></tr>"; } - + txt+="<tr><td>"; tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans); - + tmp.replace('&',"&"); tmp.replace('<',"<"); tmp.replace('>',">"); - + txt+=tmp; - txt +="</td></tr>"; - + txt +="</td></tr>"; + txt += "</table>" \ "</body>" \ "<html>"; @@ -219,14 +218,14 @@ QString KviQuery::getInfoLabelText() QString szMask; if(console()->connection()) { - if(e->hasUser()) + if(e->hasUser()) szMask+=e->user(); - else + else szMask+="*"; szMask+="@"; - if(e->hasHost()) + if(e->hasHost()) szMask+=e->host(); - else + else szMask+="*"; if(e->hasRealName()) tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); @@ -250,7 +249,7 @@ QString KviQuery::getInfoLabelText() return tmp; } void KviQuery::slotDndEvents(const char *file) -{ +{ KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,QString(file)); } @@ -296,7 +295,7 @@ void KviQuery::loadProperties(KviConfig *cfg) { int w = width(); KviWindow::loadProperties(cfg); - KviValueList<int> def; + QList<int> def; def.append((w * 80) / 100); def.append((w * 20) / 100); m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); @@ -369,7 +368,7 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c KVS_TRIGGER_EVENT_3(KviEvent_OnQueryTargetAdded,this,nick,user,host); updateLabelText(); - return e; + return e; } void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,const QString &host,int iChans,const QString &szChans) @@ -591,7 +590,7 @@ void KviQuery::ownMessage(const QString &buffer) QString szTmpBuffer(buffer); if(!d)return; - + #ifdef COMPILE_CRYPT_SUPPORT if(cryptSessionInfo()) { @@ -645,7 +644,7 @@ void KviQuery::ownMessage(const QString &buffer) * Due to encoding stuff, this is frikin'time eater */ QTextEncoder * p_Encoder = makeEncoder(); // our temp encoder - KviQCString szTmp; // used to calculate the length of an encoded message + KviQCString szTmp; // used to calculate the length of an encoded message int iPos; // contains the index where to truncate szTmpBuffer int iC; // cycles counter (debugging/profiling purpose) float fPosDiff; // optimization internal; aggressivity factor @@ -658,7 +657,7 @@ void KviQuery::ownMessage(const QString &buffer) iPos=szTmpBuffer.length(); iC=0; - // first part (optimization): quickly find an high index that is _surely_lesser_ + // first part (optimization): quickly find an high index that is _surely_lesser_ // than the correct one while(1) { @@ -716,7 +715,7 @@ void KviQuery::ownMessage(const QString &buffer) szTmpBuffer.remove(0, iPos); //printf("Sent %d chars, %d remaining in the Qstring\n",iPos, szTmpBuffer.length()); } - + } else { if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d)) { diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 86ac33eb1..2fa2872c3 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -67,14 +67,14 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pFrame = pFrame; // ugh :D setSizeGripEnabled(false); - + m_pContextPopup = 0; m_pAppletsPopup = 0; m_pClickedApplet = 0; m_pAppletDescriptors = new KviPointerHashTable<QString,KviStatusBarAppletDescriptor>; m_pAppletDescriptors->setAutoDelete(true); - + KviStatusBarClock::selfRegister(this); KviStatusBarAwayIndicator::selfRegister(this); KviStatusBarLagIndicator::selfRegister(this); @@ -107,7 +107,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) connect(m_pFrame,SIGNAL(activeConnectionUserModeChanged()),this,SLOT(setPermanentMessage())); connect(m_pFrame,SIGNAL(activeConnectionNickNameChanged()),this,SLOT(setPermanentMessage())); setPermanentMessage(); - + m_bStopLayoutOnAddRemove = false; @@ -129,12 +129,12 @@ KviStatusBar::~KviStatusBar() void KviStatusBar::load() { - KviStr szBuf; + QString szBuf; if(!g_pApp->getReadOnlyConfigPath(szBuf,"statusbar.kvc"))return; // no config file at all - KviConfig cfg(szBuf.ptr(),KviConfig::Read); + KviConfig cfg(szBuf,KviConfig::Read); cfg.setGroup("Applets"); - + int nApplets = cfg.readIntEntry("Count",0); for(int i=0;i<nApplets;i++) { @@ -166,9 +166,9 @@ void KviStatusBar::save() KviConfig cfg(szBuf.ptr(),KviConfig::Write); cfg.setGroup("Applets"); - + cfg.writeEntry("Count",m_pAppletList->count()); - + int i = 0; for(KviStatusBarApplet * a = m_pAppletList->first();a;a = m_pAppletList->next()) { @@ -219,7 +219,7 @@ bool KviStatusBar::event(QEvent * e) //updateLayout(); return false; // send to parents too! } - if (e->type() == QEvent::ToolTip)
+ if (e->type() == QEvent::ToolTip)
{
QHelpEvent *helpEvent = static_cast<QHelpEvent *>(e);
tipRequest(helpEvent);
@@ -266,7 +266,7 @@ KviStatusBarApplet * KviStatusBar::appletAt(const QPoint &pnt,bool bBestMatch) } return m_pAppletList->last(); // last anyway } - + for(KviStatusBarApplet * a = m_pAppletList->first();a;a = m_pAppletList->next()) { if((local.x() >= a->x()) && (local.y() >= a->y())) @@ -314,7 +314,7 @@ void KviStatusBar::contextMenuRequested(const QPoint &pos) m_pContextPopup = new KviTalPopupMenu(this); connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow())); } - + m_pClickedApplet = appletAt(QCursor::pos()); m_pContextPopup->popup(mapToGlobal(pos)); } @@ -323,7 +323,7 @@ void KviStatusBar::contextPopupAboutToShow() { if(!m_pContextPopup)return; m_pContextPopup->clear(); - + if(appletExists(m_pClickedApplet)) { @@ -338,7 +338,7 @@ void KviStatusBar::contextPopupAboutToShow() m_pContextPopup->insertItem(l); m_pClickedApplet->fillContextPopup(m_pContextPopup); - + KviQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem(tmp,this,SLOT(removeClickedApplet())); @@ -350,7 +350,7 @@ void KviStatusBar::contextPopupAboutToShow() connect(m_pAppletsPopup,SIGNAL(aboutToShow()),this,SLOT(appletsPopupAboutToShow())); connect(m_pAppletsPopup,SIGNAL(activated(int)),this,SLOT(appletsPopupActivated(int))); } - + m_pContextPopup->insertItem(__tr2qs("Add Applet"),m_pAppletsPopup); } @@ -365,10 +365,10 @@ void KviStatusBar::appletsPopupAboutToShow() { if(!m_pAppletsPopup)return; m_pAppletsPopup->clear(); - + // FIXME: could we cache the module results in some way ? g_pModuleManager->loadModulesByCaps("statusbarapplet"); - + KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); while(KviStatusBarAppletDescriptor * d = it.current()) { @@ -498,15 +498,15 @@ void KviStatusBar::mouseMoveEvent(QMouseEvent * e) if(a == m_pClickedApplet)return; // no way to move } } - + m_pAppletList->removeRef(m_pClickedApplet); - + int index=a->index(); debug ("Move from to index %d",index); //removeWidget(m_pClickedApplet); insertPermanentWidget(index,m_pClickedApplet); - + m_pClickedApplet->setIndex(index); //index++; //a->setIndex(index); @@ -560,7 +560,7 @@ void KviStatusBar::messageTimerFired() // nothing else to show delete m_pMessageTimer; m_pMessageTimer = 0; - + setPermanentMessage(); } diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index a3f92235b..c5f2830e0 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -80,19 +80,19 @@ KviAboutDialog::KviAboutDialog() setOkButton(__tr2qs_ctx("Close","about")); // About tab - KviStr buffer; + QString buffer; g_pApp->findImage(buffer,"kvi_splash.png"); - QPixmap pix(buffer.ptr()); + QPixmap pix(buffer); QWidget * w = new QWidget(this); QGridLayout * g = new QGridLayout(w); QLabel * l = new QLabel(w); l->setFrameStyle(QFrame::WinPanel | QFrame::Sunken); - QPalette p = l->palette(); - p.setColor(backgroundRole(), Qt::black); - l->setPalette(p); + QPalette p = l->palette(); + p.setColor(backgroundRole(), Qt::black); + l->setPalette(p); l->setAlignment(Qt::AlignCenter); l->setPixmap(pix); @@ -208,7 +208,7 @@ KviAboutDialog::KviAboutDialog() QString szLicensePath; g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); - + if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { szLicense = __tr2qs_ctx("Oops... Can't find the license file...\n" \ diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 9aaffe16e..a18768472 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -40,11 +40,11 @@ #include "kvi_action.h"
#include "kvi_kvs_useraction.h"
#include "kvi_customtoolbarmanager.h"
-#include "kvi_valuelist.h"
#include "kvi_tal_vbox.h"
#include <kvi_tal_groupbox.h>
#include "kvi_tal_itemdelegates.h"
+#include <QList>
#include <QSplitter>
#include <QLayout>
#include <QToolTip>
@@ -193,7 +193,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) gl->setColumnStretch(1,1);
gl->setRowStretch(6,1);
-
+
tw->addTab(tab,__tr2qs("Properties"));
@@ -209,7 +209,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) "the active window belongs to an irc context"));
gl->addWidget(m_pNeedsContextCheck,0,0,1,4);
// gl->addMultiCellWidget(m_pNeedsContextCheck,0,0,0,3);
-
+
l = new QLabel(tab);
l->setMinimumWidth(40);
@@ -291,7 +291,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) // gl->addMultiCellWidget(l,11,11,0,3);
gl->setColumnStretch(3,1);
gl->setRowStretch(11,1);
-
+
tw->addTab(tab,__tr2qs("Flags"));
tw->setCurrentIndex(0);
@@ -384,14 +384,14 @@ void KviSingleActionEditor::chooseBigIcon() void KviSingleActionEditor::setActionData(KviActionData * d)
{
m_pActionData = d;
-
+
if(d)
{
unsigned int uOldFlags = d->m_uFlags;
d->m_uFlags = KviAction::validateFlags(d->m_uFlags);
if(d->m_uFlags != uOldFlags)
debug("invalid action flags in KviSingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
-
+
m_pNameEdit->setText(d->m_szName);
m_pNameEdit->setEnabled(true);
m_pVisibleNameEdit->setText(d->m_szVisibleName);
@@ -523,7 +523,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d) void KviSingleActionEditor::commit()
{
if(!m_pActionData)return;
-
+
QString tmp = m_pNameEdit->text();
if(tmp != m_pActionData->m_szName)
{
@@ -560,7 +560,7 @@ void KviSingleActionEditor::commit() m_pActionData->m_uFlags |= KviAction::NeedsConnection;
if(m_pEnableAtLoginCheck->isChecked())m_pActionData->m_uFlags |= KviAction::EnableAtLogin;
}
-
+
}
if(m_pSpecificWindowsCheck->isChecked())
{
@@ -616,13 +616,13 @@ void KviActionEditorTreeView::resizeEvent(QResizeEvent * e) KviActionEditor::KviActionEditor(QWidget * par)
: QWidget(par)
{
-
+
QGridLayout * l = new QGridLayout(this);
m_pSplitter = new QSplitter(Qt::Horizontal,this);
m_pSplitter->setOpaqueResize(false);
l->addWidget(m_pSplitter,0,0);
-
-
+
+
KviTalVBox * box = new KviTalVBox(m_pSplitter);
m_pTreeWidget = new KviActionEditorTreeView(box);
KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(m_pTreeWidget);
@@ -693,9 +693,9 @@ void KviActionEditor::exportActions() QString szName = QDir::homePath();
if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
szName += "myactions.kvs";
-
+
QString szFile;
-
+
if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true,true))return;
QString szCode;
@@ -705,7 +705,7 @@ void KviActionEditor::exportActions() if(m_pTreeWidget->topLevelItem(i)->isSelected())
{
KviActionData * a = ((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
-
+
KviKvsUserAction::exportToKvs(szCode,
a->m_szName,
a->m_szScriptCode,
@@ -740,7 +740,7 @@ void KviActionEditor::deleteActions() //if(QMessageBox::question(this,__tr2qsf("Confirm Deletion"),__tr2qsf("Do you really want to delete the selected actions ?"),__tr2qsf("Yes"),__tr2qsf("No")) != 0)
// return;
-
+
for(KviActionEditorTreeWidgetItem * i = l.first();i;i = l.next())
{
if(m_pSingleActionEditor->actionData() == i->actionData())
@@ -799,7 +799,7 @@ bool KviActionEditor::actionExists(const QString &szName) for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
{
if(((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true;
- }
+ }
return false;
}
@@ -808,7 +808,7 @@ void KviActionEditor::currentItemChanged(KviTalTreeWidgetItem * i,KviTalTreeWidg {
if(m_pSingleActionEditor->actionData())
m_pSingleActionEditor->commit();
-
+
m_pTreeWidget->update();
KviActionEditorTreeWidgetItem * it = (KviActionEditorTreeWidgetItem *)i;
@@ -940,7 +940,7 @@ void KviActionEditorWindow::loadProperties(KviConfig *cfg) {
int w = width();
KviWindow::loadProperties(cfg);
- KviValueList<int> def;
+ QList<int> def;
def.append((w * 25) / 100);
def.append((w * 75) / 100);
m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def));
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 5fd398472..22b99bb37 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -37,7 +37,6 @@ #include "kvi_fileextensions.h"
#include "kvi_kvs_script.h"
#include "kvi_sourcesdate.h"
-#include "kvi_draganddrop.h"
#include "kvi_tal_listwidget.h"
#include "kvi_tal_tooltip.h"
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 9f731f9dc..da73cb41e 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -39,9 +39,9 @@ #include "kvi_filedialog.h"
#include "kvi_cmdformatter.h"
#include "kvi_module.h"
-#include "kvi_valuelist.h"
#include "kvi_tal_vbox.h"
+#include <QList>
#include <QSplitter>
#include <QLayout>
#include <QToolTip>
@@ -92,7 +92,7 @@ KviAliasListViewItem::KviAliasListViewItem(KviAliasNamespaceListViewItem * pPare {
setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));
m_cPos=0;
-
+
}
@@ -170,9 +170,9 @@ KviAliasListViewItem * KviAliasNamespaceListViewItem::createFullAliasItem(const if(lNamespaces.isEmpty())
return getAliasItem(szName);
-
+
QStringList::Iterator it = lNamespaces.begin();
-
+
KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it);
++it;
while(it != lNamespaces.end())
@@ -180,7 +180,7 @@ KviAliasListViewItem * KviAliasNamespaceListViewItem::createFullAliasItem(const nit = nit->getNamespaceItem(*it);
++it;
}
-
+
return nit->getAliasItem(szName);
}
@@ -192,9 +192,9 @@ KviAliasNamespaceListViewItem * KviAliasNamespaceListViewItem::createFullNamespa if(lNamespaces.isEmpty())
return getNamespaceItem(szName);
-
+
QStringList::Iterator it = lNamespaces.begin();
-
+
KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it);
++it;
while(it != lNamespaces.end())
@@ -202,7 +202,7 @@ KviAliasNamespaceListViewItem * KviAliasNamespaceListViewItem::createFullNamespa nit = nit->getNamespaceItem(*it);
++it;
}
-
+
return nit->getNamespaceItem(szName);
}
KviAliasEditorListView::KviAliasEditorListView(QWidget * par)
@@ -236,13 +236,13 @@ KviAliasEditor::KviAliasEditor(QWidget * par) m_pSplitter = new QSplitter(Qt::Horizontal,this);
m_pSplitter->setOpaqueResize(false);
l->addWidget(m_pSplitter,0,0);
-
+
KviTalVBox * box = new KviTalVBox(m_pSplitter);
box->setSpacing(0);
box->setMargin(0);
-
+
m_pListView = new KviAliasEditorListView(box);
-
+
box = new KviTalVBox(m_pSplitter);
KviTalHBox * hbox = new KviTalHBox(box);
@@ -296,13 +296,13 @@ KviAliasListViewItem * KviAliasEditor::findAliasItemRecursive(KviAliasEditorList for (int i=0;i<parent->childCount();i++)
{
KviAliasEditorListViewItem *item=(KviAliasEditorListViewItem *)parent->child(i);
-
+
if (!item->isAlias()){
KviAliasListViewItem * itemret=findAliasItemRecursive(item,szName);
if (itemret) return (KviAliasListViewItem*)itemret;
}
else{
- if(KviQString::equalCI(szName,item->name()))
+ if(KviQString::equalCI(szName,item->name()))
return (KviAliasListViewItem*)item;
}
}
@@ -374,9 +374,9 @@ KviAliasListViewItem * KviAliasEditor::createFullAliasItem(const QString &szFull if(lNamespaces.isEmpty())
return getAliasItem(szName);
-
+
QStringList::Iterator it = lNamespaces.begin();
-
+
KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it);
++it;
while(it != lNamespaces.end())
@@ -384,7 +384,7 @@ KviAliasListViewItem * KviAliasEditor::createFullAliasItem(const QString &szFull nit = nit->getNamespaceItem(*it);
++it;
}
-
+
return nit->getAliasItem(szName);
}
@@ -396,9 +396,9 @@ KviAliasNamespaceListViewItem * KviAliasEditor::createFullNamespaceItem(const QS if(lNamespaces.isEmpty())
return getNamespaceItem(szName);
-
+
QStringList::Iterator it = lNamespaces.begin();
-
+
KviAliasNamespaceListViewItem * nit = getNamespaceItem(*it);
++it;
while(it != lNamespaces.end())
@@ -406,7 +406,7 @@ KviAliasNamespaceListViewItem * KviAliasEditor::createFullNamespaceItem(const QS nit = nit->getNamespaceItem(*it);
++it;
}
-
+
return nit->getNamespaceItem(szName);
}
@@ -425,12 +425,12 @@ void KviAliasEditor::oneTimeSetup() item->setBuffer(alias->code());
++it;
}
-
+
connect(m_pListView,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)),
this,SLOT(itemPressed(QTreeWidgetItem *,QPoint)));
connect(m_pListView,SIGNAL(itemChanged(QTreeWidgetItem *,int)),this,SLOT(itemRenamed(QTreeWidgetItem *,int)));
-
+
m_pListView->sortItems(0,Qt::AscendingOrder);
}
@@ -473,7 +473,7 @@ bool KviAliasEditor::itemExists(QTreeWidgetItem *pSearchFor) for (int i=0;i<m_pListView->topLevelItemCount();i++)
{
- debug("Check in top level %d",i);
+ debug("Check in top level %d",i);
if(m_pListView->topLevelItem(i)==pSearchFor) return true;
else
{
@@ -507,9 +507,9 @@ bool KviAliasEditor::itemExistsRecursive(QTreeWidgetItem *pSearchFor,QTreeWidget void KviAliasEditor::itemPressed(QTreeWidgetItem *it,QPoint pnt)
{
m_pContextPopup->clear();
-
+
m_pLastClickedItem = (KviAliasEditorListViewItem *)it;
-
+
int id;
m_pContextPopup->insertItem(
@@ -521,7 +521,7 @@ void KviAliasEditor::itemPressed(QTreeWidgetItem *it,QPoint pnt) *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)),
__tr2qs("Add Namespace"),
this,SLOT(newNamespace()));
-
+
bool bHasItems = m_pListView->topLevelItemCount();
bool bHasSelected = hasSelectedItems();
@@ -584,10 +584,10 @@ void KviAliasEditor::recursiveSearchReplace(const QString &szSearch,KviAliasEdit it->child(i)->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIASHIGHLIGHTED))));
if (bReplace) ((QString &)((KviAliasListViewItem *)it->child(i))->buffer()).replace(szSearch,szReplace,Qt::CaseInsensitive);
openParentItems(it);
- }
+ }
//else
//it->child(i)->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));
- }
+ }
else {
recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)(it->child(i)),bReplace,szReplace);
}
@@ -602,14 +602,14 @@ void KviAliasEditor::slotFind() g_pAliasEditorModule->lock();
bool bOk;
-
+
QString szSearch = QInputDialog::getText(this,
__tr2qs("Find In Aliases"),
__tr2qs("Please enter the text to be searched for. The matching aliases will be highlighted."),
QLineEdit::Normal,
"",
&bOk);
-
+
g_pAliasEditorModule->unlock();
if(!bOk)return;
@@ -622,8 +622,8 @@ void KviAliasEditor::slotFind() if(((KviAliasListViewItem *)m_pListView->topLevelItem(i))->buffer().indexOf(szSearch,0,Qt::CaseInsensitive) != -1)
{
m_pListView->topLevelItem(i)->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIASHIGHLIGHTED))));
- }
- }
+ }
+ }
else {
recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)m_pListView->topLevelItem(i));
}
@@ -633,7 +633,7 @@ void KviAliasEditor::slotFind() void KviAliasEditor::slotFindWord(const QString &szSearch)
{
m_pEditor->setFindText(szSearch);
-
+
// recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)m_pListView->firstChild());
}
@@ -716,12 +716,12 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi g_pAliasEditorModule->unlock();
return;
}
-
+
if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR;
debug ("dir changed in %s",m_szDir.toUtf8().data());
-
+
bool bReplaceAll=false;
-
+
for(KviAliasListViewItem * it = l->first();it;it = l->next())
{
QString tmp;
@@ -730,7 +730,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi szFileName += ".kvs";
szFileName.replace("::","_");
QString szCompletePath=m_szDir+szFileName;
-
+
if (KviFileUtils::fileExists(szCompletePath) && !bReplaceAll)
{
QString szMsg;
@@ -740,11 +740,11 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi KviFileUtils::writeFile(szCompletePath,tmp);
if (ret==1) bReplaceAll=true;
}
-
+
}
else
KviFileUtils::writeFile(szCompletePath,tmp);
-
+
}
g_pAliasEditorModule->unlock();
@@ -753,7 +753,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
{
saveLastEditedItem();
-
+
KviPointerList<KviAliasListViewItem> l;
l.setAutoDelete(false);
@@ -791,7 +791,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
QString szFile;
g_pAliasEditorModule->lock();
-
+
if (count==1)
{
QString tmp=buildFullItemName(tempitem);
@@ -802,7 +802,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) szName += ".kvs";
if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,"*.kvs",false,true,true))
{
- g_pAliasEditorModule->unlock();
+ g_pAliasEditorModule->unlock();
return;
}
m_szDir=QFileInfo(szFile).absolutePath();
@@ -827,7 +827,7 @@ void KviAliasEditor::saveProperties(KviConfig *cfg) void KviAliasEditor::loadProperties(KviConfig *cfg)
{
- KviValueList<int> def;
+ QList<int> def;
def.append(20);
def.append(80);
m_pSplitter->setSizes(cfg->readIntListEntry("Sizes",def));
@@ -969,7 +969,7 @@ void KviAliasEditor::appendSelectedItemsRecursive(KviPointerList<KviAliasEditorL {
for (int i=0;i<it->childCount();i++)
{
- if (it->child(i)->isSelected())
+ if (it->child(i)->isSelected())
{
l->append((KviAliasEditorListViewItem *)it->child(i));
}
@@ -984,7 +984,7 @@ void KviAliasEditor::appendSelectedItems(KviPointerList<KviAliasEditorListViewIt {
for (int i=0;i<m_pListView->topLevelItemCount();i++)
{
- if (m_pListView->topLevelItem(i)->isSelected())
+ if (m_pListView->topLevelItem(i)->isSelected())
{
l->append((KviAliasEditorListViewItem *)m_pListView->topLevelItem(i));
}
@@ -1027,7 +1027,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll switch(ret)
{
case 0:
- // nothing
+ // nothing
break;
case 1:
*pbYesToAll = true;
@@ -1037,7 +1037,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll break;
}
}
-
+
if(it == m_pLastEditedItem)
m_pLastEditedItem = 0;
if(it == m_pLastClickedItem)
@@ -1074,12 +1074,12 @@ void KviAliasEditor::removeSelectedItems() l.setAutoDelete(false);
appendSelectedItems(&l);
bool bYesToAll = false;
-
+
for(KviAliasEditorListViewItem *it = l.first();it;it = l.next())
{
if(!removeItem(it,&bYesToAll,false))return;
}
-
+
}
@@ -1108,7 +1108,7 @@ QString KviAliasEditor::askForAliasName(const QString &szAction,const QString &s g_pAliasEditorModule->unlock();
continue;
}
-
+
// we allow only [\w:]+
QRegExp re("[\\w:]+");
if(!re.exactMatch(szNewName))
@@ -1176,7 +1176,7 @@ QString KviAliasEditor::askForNamespaceName(const QString &szAction,const QStrin g_pAliasEditorModule->unlock();
continue;
}
-
+
// we allow only [\w:]+
QRegExp re("[\\w:]+");
if(!re.exactMatch(szNewName))
@@ -1261,9 +1261,9 @@ void KviAliasEditor::newAlias() if(szNewName.isEmpty())return;
getUniqueItemName(m_pLastClickedItem,szNewName,KviAliasEditorListViewItem::Alias);
-
+
KviAliasListViewItem * it;
-
+
if(m_pLastClickedItem)
it = ((KviAliasNamespaceListViewItem *)m_pLastClickedItem)->createFullAliasItem(szNewName);
else
@@ -1280,15 +1280,15 @@ void KviAliasEditor::newNamespace() if(m_pLastClickedItem->isAlias())
m_pLastClickedItem = m_pLastClickedItem->parentNamespaceItem();
}
-
+
QString szNewName = askForNamespaceName(__tr2qs("Add Namespace"),__tr2qs("Please enter the name for the new namespace"),"mynamespace");
if(szNewName.isEmpty())return;
getUniqueItemName(m_pLastClickedItem,szNewName,KviAliasEditorListViewItem::Namespace);
-
+
KviAliasNamespaceListViewItem * it;
-
+
if(m_pLastClickedItem)
it = ((KviAliasNamespaceListViewItem *)m_pLastClickedItem)->createFullNamespaceItem(szNewName);
else
@@ -1317,7 +1317,7 @@ bool KviAliasEditor::namespaceExists(QString &szFullItemName) {
KviPointerList<KviAliasListViewItem> l;
l.setAutoDelete(false);
-
+
appendNamespaceItems(&l,false);
for(KviAliasListViewItem * it = l.first();it;it = l.next())
{
@@ -1347,7 +1347,7 @@ void KviAliasEditor::renameItem() QString szNewName;
bool bAlias = m_pLastEditedItem->isAlias();
-
+
if(bAlias)
szNewName = askForAliasName(__tr2qs("Rename Alias"),__tr2qs("Please enter the new name for the alias"),szName);
else
@@ -1382,7 +1382,7 @@ void KviAliasEditor::renameItem() return;
}
}
-
+
QString szCode;
int pntCursor;
if(bAlias)
@@ -1411,7 +1411,7 @@ void KviAliasEditor::renameItem() m_pLastEditedItem = 0; // make sure it's true (but it already should be because of removeItem())
m_pLastClickedItem = 0; // make sure it's true (but it already should be because of removeItem())
-
+
if(bAlias)
{
KviAliasListViewItem * ait = createFullAliasItem(szNewName);
@@ -1428,7 +1428,7 @@ void KviAliasEditor::renameItem() ((KviAliasEditorListViewItem*)lChildren.at(i))->setParentNamespaceItem(nit);
nit->insertChild(nit->childCount(),lChildren.at(i));
}
-
+
}
}
@@ -1442,7 +1442,7 @@ void KviAliasEditor::saveLastEditedItem() debug("Check last edit item %s",m_pLastEditedItem->text(0).toUtf8().data());
((KviAliasListViewItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
if(m_pLastEditedItem->isNamespace()){debug("Is namespace");return;}
-
+
QString newCode;
m_pEditor->getText(newCode);
debug("Saving %s",newCode.toUtf8().data());
@@ -1464,7 +1464,7 @@ void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *pre m_pEditor->setEnabled(false);
return;
}
-
+
QString szNam = buildFullItemName(m_pLastEditedItem);
if(m_pLastEditedItem->isNamespace())
{
@@ -1486,7 +1486,7 @@ void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *pre m_pNameLabel->setText(szLabelText);
m_pRenameButton->setEnabled(true);
m_pEditor->setText(((KviAliasListViewItem *)it)->buffer());
-
+
m_pEditor->setFocus();
m_pEditor->setCursorPosition(((KviAliasListViewItem *)it)->cursorPosition());
m_pEditor->setEnabled(true);
@@ -1505,7 +1505,7 @@ void KviAliasEditor::recursiveCommit(KviAliasEditorListViewItem * it) KviKvsScript * a = new KviKvsScript(szName,((KviAliasListViewItem *)it)->buffer());
KviKvsAliasManager::instance()->add(szName,a);
return;
- } else
+ } else
{
for (int i=0;i<it->childCount();i++)
{
@@ -1529,10 +1529,10 @@ void KviAliasEditor::commit() void KviAliasEditor::getUniqueItemName(KviAliasEditorListViewItem *item,QString &buffer,KviAliasEditorListViewItem::Type eType)
{
QString ret;
-
+
int idx = 0;
KviAliasEditorListViewItem * found;
-
+
for(;;)
{
ret = buffer;
@@ -1550,7 +1550,7 @@ void KviAliasEditor::getUniqueItemName(KviAliasEditorListViewItem *item,QString buffer = ret;
return;
}
-
+
if(eType == KviAliasEditorListViewItem::Namespace)
found = ((KviAliasNamespaceListViewItem *)item)->findNamespaceItem(ret);
else
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index b10db335b..ceae44f98 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -30,9 +30,9 @@ #include "kvi_locale.h" #include "kvi_module.h" #include "kvi_config.h" -#include "kvi_valuelist.h" #include "kvi_sourcesdate.h" +#include <QList> #include <QFileInfo> #include <QSplitter> #include <QLineEdit> @@ -51,10 +51,10 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) if(!g_bIndexingDone) { QString szDoclist,szDict; - + g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist." KVI_SOURCES_DATE); g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict." KVI_SOURCES_DATE); - + if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) { g_pDocIndex->readDict(); } else { @@ -67,7 +67,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) } g_bIndexingDone=TRUE; } - + g_pHelpWindowList->append(this); m_pSplitter = new QSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); @@ -76,41 +76,41 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) m_pToolBar=new KviTalVBox(m_pSplitter); m_pTabWidget = new QTabWidget(m_pToolBar); - + m_pIndexTab = new KviTalVBox(m_pTabWidget); m_pTabWidget->addTab(m_pIndexTab,__tr2qs("Index")); - + KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab); m_pIndexSearch = new QLineEdit(pSearchBox); connect( m_pIndexSearch, SIGNAL( textChanged(const QString&) ), this, SLOT( searchInIndex(const QString&) ) ); connect( m_pIndexSearch, SIGNAL( returnPressed() ), this, SLOT( showIndexTopic() ) ); - + QToolButton* pBtnRefreshIndex = new QToolButton(pSearchBox); pBtnRefreshIndex->setIcon(*g_pIconManager->getBigIcon(KVI_REFRESH_IMAGE_NAME)); connect(pBtnRefreshIndex,SIGNAL(clicked()),this,SLOT(refreshIndex())); pBtnRefreshIndex->setToolTip(__tr2qs("Refresh index") ); - + m_pIndexListWidget = new KviTalListWidget(m_pIndexTab); QStringList docList=g_pDocIndex->titlesList(); m_pIndexListWidget->addItems(docList); connect(m_pIndexListWidget,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(indexSelected (QListWidgetItem * ))); m_pIndexListWidget->sortItems(); - + m_pSearchTab = new KviTalVBox(m_pTabWidget); m_pTabWidget->addTab(m_pSearchTab,__tr2qs("Search")); - + m_pTermsEdit = new QLineEdit(m_pSearchTab); /* connect( m_pTermsEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( searchInIndex(const QString&) ) );*/ connect( m_pTermsEdit, SIGNAL( returnPressed() ), this, SLOT( startSearch() ) ); - + m_pResultBox = new KviTalListWidget(m_pSearchTab); connect(m_pResultBox,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(searchSelected (QListWidgetItem *))); - - KviValueList<int> li; + + QList<int> li; li.append(width()-80); li.append(80); m_pSplitter->setSizes(li); @@ -130,7 +130,7 @@ void KviHelpWindow::saveProperties(KviConfig *cfg) void KviHelpWindow::loadProperties(KviConfig *cfg) { - KviValueList<int> def; + QList<int> def; int w = width(); def.append((w * 82) / 100); def.append((w * 18) / 100); @@ -201,7 +201,7 @@ void KviHelpWindow::startSearch() setCursor( Qt::WaitCursor ); m_foundDocs.clear(); m_foundDocs = g_pDocIndex->query( m_terms, termSeq, seqWords ); - + m_pResultBox->clear(); for ( it = m_foundDocs.begin(); it != m_foundDocs.end(); ++it ) m_pResultBox->addItem( g_pDocIndex->getDocumentTitle( *it ) ); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index a7648b8f5..2ab2dbe3c 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -234,7 +234,7 @@ void Index::readDict() dict.clear(); QDataStream s( &f ); QString key; - KviValueList<Document> docs; + QList<Document> docs; while ( !s.atEnd() ) { s >> key; s >> docs; @@ -268,7 +268,7 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq, for ( it = terms.begin(); it != terms.end(); ++it ) { Entry *e = 0; if ( (*it).contains( '*' ) ) { - KviValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) ); + QList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) ); termList.append( new Term( "dummy", wcts.count(), wcts ) ); } else if ( dict[ *it ] ) { e = dict[ *it ]; @@ -284,14 +284,14 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq, termList.removeFirst(); - KviValueList<Document> minDocs = minTerm->documents; - KviValueList<Document>::iterator C; - KviValueList<Document>::ConstIterator It; + QList<Document> minDocs = minTerm->documents; + QList<Document>::iterator C; + QList<Document>::ConstIterator It; Term *t = termList.first(); for ( ; t; t = termList.next() ) { - KviValueList<Document> docs = t->documents; + QList<Document> docs = t->documents; C = minDocs.begin(); @@ -425,7 +425,7 @@ QStringList Index::split( const QString &str ) return lst; } -KviValueList<Document> Index::setupDummyTerm( const QStringList &terms ) +QList<Document> Index::setupDummyTerm( const QStringList &terms ) { TermList termList; QStringList::ConstIterator it = terms.begin(); @@ -441,17 +441,17 @@ KviValueList<Document> Index::setupDummyTerm( const QStringList &terms ) termList.sort(); - KviValueList<Document> maxList; + QList<Document> maxList; if ( !termList.count() ) return maxList; maxList = termList.last()->documents; termList.removeLast(); - KviValueList<Document>::iterator docIt; + QList<Document>::iterator docIt; Term *t = termList.first(); while ( t ) { - KviValueList<Document> docs = t->documents; + QList<Document> docs = t->documents; for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) { if ( maxList.indexOf( *docIt ) == -1 ) maxList.append( *docIt ); @@ -532,8 +532,8 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo QStringList::ConstIterator patIt = patterns.begin(); QStringList wordLst; - KviValueList<uint> a, b; - KviValueList<uint>::iterator aIt; + QList<uint> a, b; + QList<uint>::iterator aIt; for ( ; patIt != patterns.end(); ++patIt ) { QString tmp=*patIt; diff --git a/src/modules/help/index.h b/src/modules/help/index.h index c2ede4756..791c11275 100755 --- a/src/modules/help/index.h +++ b/src/modules/help/index.h @@ -28,8 +28,8 @@ #include "kvi_pointerhashtable.h" #include "kvi_pointerlist.h" -#include "kvi_valuelist.h" +#include <QList> #include <QDataStream> #include <QObject> #include <QStringList> @@ -62,12 +62,12 @@ class Index : public QObject public: struct Entry { Entry( int d ) { documents.append( Document( d, 1 ) ); } - Entry( KviValueList<Document> l ) : documents( l ) {} - KviValueList<Document> documents; + Entry( QList<Document> l ) : documents( l ) {} + QList<Document> documents; }; struct PosEntry { PosEntry( int p ) { positions.append( p ); } - KviValueList<uint> positions; + QList<uint> positions; }; Index( const QString &dp, const QString &hp ); Index( const QStringList &dl, const QString &hp ); @@ -92,7 +92,7 @@ private: void insertInDict( const QString&, int ); QStringList getWildcardTerms( const QString& ); QStringList split( const QString& ); - KviValueList<Document> setupDummyTerm( const QStringList& ); + QList<Document> setupDummyTerm( const QStringList& ); bool searchForPattern( const QStringList&, const QStringList&, const QString& ); void buildMiniDict( const QString& ); QStringList docList; @@ -107,11 +107,11 @@ private: }; struct Term { - Term( const QString &t, int f, KviValueList<Document> l ) + Term( const QString &t, int f, QList<Document> l ) : term( t ), frequency( f ), documents( l ) {} QString term; int frequency; - KviValueList<Document>documents; + QList<Document>documents; }; #define TermList KviPointerList<Term> diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 7cd66cbeb..c7a93aa3e 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -33,10 +33,10 @@ #include "kvi_qcstring.h" #include "kvi_app.h" #include "kvi_fileutils.h" -#include "kvi_valuelist.h" #include "kvi_tal_listview.h" #include "kvi_tal_popupmenu.h" +#include <QList> #include <q3progressdialog.h> #include <QPixmap> #include <QSplitter> @@ -154,7 +154,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pIrcView->setFocusPolicy(Qt::ClickFocus); - KviValueList<int> li; + QList<int> li; li.append(110); li.append(width()-110); m_pSplitter->setSizes(li); diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 8d9d21c87..696a2b249 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -83,18 +83,18 @@ KviNotifierWindow::KviNotifierWindow() m_tStartedAt=0; m_pAutoHideTimer = 0; m_pProgressTimer = 0; - + m_pWndBorder = new KviNotifierWindowBorder(); reloadImages(); - KviStr buffer; + QString buffer; g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true); - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); cfg.setGroup("NotifierSkin"); - + QString szFamily = cfg.readEntry("TextFontFamily","Arial"); m_pDefaultFont = new QFont(szFamily,cfg.readIntEntry("TextFontSize",9)); szFamily = cfg.readEntry("TitleFontFamily","Arial"); @@ -109,7 +109,7 @@ KviNotifierWindow::KviNotifierWindow() szKey.sprintf("OldTextColor%d",i + 1); m_clrOldText[i] = cfg.readColorEntry(szKey.ptr(),QColor(90,90,90)); } - + m_iBlinkTimeout = cfg.readIntEntry("BlinkTimeout",650); if(m_iBlinkTimeout < 100)m_iBlinkTimeout = 100; m_iInputHeight = cfg.readIntEntry("InputHeight",20); @@ -118,7 +118,7 @@ KviNotifierWindow::KviNotifierWindow() setFocusPolicy(Qt::NoFocus); setMouseTracking(true); //setCursor(m_cursor); - + hide(); m_pLineEdit = new QLineEdit(this); m_pLineEdit->setGeometry(0,0,0,0); @@ -135,13 +135,13 @@ KviNotifierWindow::KviNotifierWindow() m_bPrevDown = false; m_bNextDown = false; m_bWriteDown = false; - + m_bKeyShiftPressed = false; - + m_bLeftButtonIsPressed = false; m_bDiagonalResizing = false; m_bResizing = false; - + m_pContextPopup = 0; m_pDisablePopup = 0; @@ -154,22 +154,22 @@ KviNotifierWindow::KviNotifierWindow() int iHeight = m_pixBackground.height(); QDesktopWidget * w = QApplication::desktop(); QRect r = w->availableGeometry(w->primaryScreen()); //w->screenGeometry(w->primaryScreen()); - + /*debug("r.x(),r.y(): %d,%d",r.x(),r.y()); debug("r.width(),r.height(): %d,%d",r.width(),r.height());*/ m_wndRect.setRect( r.x() + r.width() - (iWidth + SPACING), r.y() + r.height() - (iHeight + SPACING), iWidth, iHeight ); - + //m_pWndBorder = new KviNotifierWindowBorder(); m_pWndTabs = new KviNotifierWindowTabs(m_pWndBorder->tabsRect()); m_pWndBody = new KviNotifierWindowBody(m_pWndBorder->bodyRect()); - + m_pProgressBar = new KviNotifierWindowProgressBar(m_pWndBorder->progressRect()); - + // FIXME: Ugly global-font initialization.. QFontMetrics titleFontMetrics(*m_pTitleFont); m_pWndBorder->centerTitle(titleFontMetrics.height()); - + connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); } @@ -238,7 +238,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd,const QString &szImageId,con if(isVisible())update(); // else the line edit was hidden } - + int KviNotifierWindow::textWidth() { @@ -263,7 +263,7 @@ void KviNotifierWindow::stopAutoHideTimer() { if(m_pProgressTimer) delete m_pProgressTimer; m_pProgressTimer = 0; - + if(!m_pAutoHideTimer)return; delete m_pAutoHideTimer; m_pAutoHideTimer = 0; @@ -303,7 +303,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate) case Hidden: stopShowHideTimer(); stopBlinkTimer(); - + m_bDragging = false; m_bCloseDown = false; m_bPrevDown = false; @@ -459,7 +459,7 @@ void KviNotifierWindow::hideNow() m_eState = Hidden; m_dOpacity = 0.0; m_tAutoHideAt = 0; - + if(m_pLineEdit->isVisible())m_pLineEdit->hide(); hide();//if(isVisible())hide(); } @@ -562,7 +562,7 @@ void KviNotifierWindow::startAutoHideTimer() m_pAutoHideTimer = new QTimer(); connect(m_pAutoHideTimer,SIGNAL(timeout()),this,SLOT(autoHide())); m_pAutoHideTimer->start(nSecs * 1000); - + m_pProgressTimer= new QTimer(); connect(m_pProgressTimer,SIGNAL(timeout()),this,SLOT(progressUpdate())); m_pProgressTimer->start(60); @@ -611,7 +611,7 @@ static void blend_images(QImage &buffer,QImage &background,QImage &foreground,do QRgb * end = dst + buffer.width(); QRgb * bkg = (QRgb *)background.scanLine(y); QRgb * fgn = (QRgb *)foreground.scanLine(y); - + double dRemaining = 1.0 - dValue; while(dst < end) @@ -645,7 +645,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e) if(m_dOpacity < 1.0) { QPainter px(this); - + #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)) px.drawPixmap(0,0,m_pixForeground); #else @@ -667,12 +667,12 @@ void KviNotifierWindow::redrawText() // the current tab KviNotifierWindowTab * tab = m_pWndTabs->currentTab(); if(!tab)return; - + // it's message list KviPointerList<KviNotifierMessage> * l = tab->messageList(); if(!l)return; if(l->isEmpty())return; - + // the current message KviNotifierMessage * cur = tab->currentMessage(); if(!cur)cur = l->last(); @@ -732,7 +732,7 @@ void KviNotifierWindow::redrawText() p.setFont(*m_pTitleFont); QString title; KviQString::sprintf(title,"[%d/%d]",iIdx + 1,l->count()); - + if(tab->window()) { title += " "; @@ -747,9 +747,9 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e) //debug ("move on x,y: %d,%d", e->pos().x(), e->pos().y()); if (!m_bLeftButtonIsPressed) { - + if(checkResizing(e->pos())) goto sartelo; - + /* ### MOUSE-MOVE-EVENT -> m_pWndBorder ### */ if (m_pWndBorder->captionRect().contains(e->pos())) { if (m_pWndBorder->closeRect().contains(e->pos())) { @@ -759,15 +759,15 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e) } goto sartelo; } - + if(m_pWndTabs->currentTab()) { - /* ### MOUSE-MOVE-EVENT -> m_pWndTabs ### */ + /* ### MOUSE-MOVE-EVENT -> m_pWndTabs ### */ if (m_pWndTabs->rect().contains(e->pos())) { m_pWndTabs->mouseMoveEvent(e); goto sartelo; } - + /* ### MOUSE-MOVE-EVENT -> m_pWndBody ### */ if (m_pWndBody->rect().contains(e->pos())) { if (m_pWndBody->rctWriteIcon().contains(e->pos())) { @@ -779,26 +779,26 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e) } } /* ### END ### */ - + sartelo: update(); - + } if(m_bDragging) { setCursor(Qt::SizeAllCursor); - + int w = m_wndRect.width(); int h = m_wndRect.height(); - + m_wndRect.setX( m_pntPos.x() + cursor().pos().x() - m_pntDrag.x() ); m_wndRect.setY( m_pntPos.y() + cursor().pos().y() - m_pntDrag.y() ); - + m_wndRect.setWidth(w); m_wndRect.setHeight(h); - + setGeometry(m_wndRect); - + return; } else if (m_bResizing) { resize(e->pos()); @@ -863,15 +863,15 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e) { m_pWndBody->setWriteIcon(WDG_ICON_CLICKED); showLineEdit(!(m_pLineEdit->isVisible())); - } - + } + if(m_pWndBody->rctPrevIcon().contains(e->pos()) && m_pWndBody->prevIconState()!=WDG_ICON_OFF) { m_bPrevDown = true; m_pWndBody->setPrevIcon(WDG_ICON_CLICKED); prevButtonClicked(); } - + if(m_pWndBody->rctNextIcon().contains(e->pos()) && m_pWndBody->nextIconState()!=WDG_ICON_OFF) { m_bNextDown = true; @@ -879,14 +879,14 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e) nextButtonClicked(); } } - goto sartelo; + goto sartelo; } if(bWasBlinkOn) goto sartelo; else return; - + sartelo: update(); - + } void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e) @@ -911,23 +911,23 @@ void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e) } if(m_pWndBorder->captionRect().contains(e->pos())) { - + if(m_pWndBorder->closeRect().contains(e->pos())) { //debug ("hide now from release event"); hideNow(); } else { update(); } - + } if(m_pWndTabs->rect().contains(e->pos())) { m_pWndTabs->mouseReleaseEvent(e); } - + setCursor(-1); - + } void KviNotifierWindow::mouseDoubleClickEvent(QMouseEvent * e) @@ -937,12 +937,12 @@ void KviNotifierWindow::mouseDoubleClickEvent(QMouseEvent * e) QWidget::mouseDoubleClickEvent(e); return; } - + KviNotifierWindowTab * tab = m_pWndTabs->currentTab(); if(!tab)return; if(!tab->window())return; - + hideNow(); delayedRaise(tab->window()); } @@ -953,7 +953,7 @@ void KviNotifierWindow::keyPressEvent(QKeyEvent * e) m_bKeyShiftPressed = true; return; } - + if (e->key()==Qt::Key_Left && m_bKeyShiftPressed) { m_pWndTabs->prev(); return; @@ -962,9 +962,9 @@ void KviNotifierWindow::keyPressEvent(QKeyEvent * e) m_pWndTabs->next(); return; } - + if (e->key()==Qt::Key_Escape) { - hideNow(); + hideNow(); return; } } @@ -1007,7 +1007,7 @@ bool KviNotifierWindow::checkResizing(QPoint e) if (m_bLeftButtonIsPressed) { m_bResizing = true; m_whereResizing = WDG_UPSX; - } + } } else if (e.x() > (size().width()-WDG_BORDER_THICKNESS)) { //// UP RIGHT CORNER //// setCursor(Qt::SizeBDiagCursor); @@ -1052,7 +1052,7 @@ bool KviNotifierWindow::checkResizing(QPoint e) if (m_bLeftButtonIsPressed) { m_bResizing = true; m_whereResizing = WDG_SX; - } + } } else if (e.x() > (size().width()-WDG_BORDER_THICKNESS)) { //// RIGHT SIZE //// setCursor(Qt::SizeHorCursor); @@ -1080,7 +1080,7 @@ void KviNotifierWindow::resize(QPoint p, bool up) else m_wndRect.setLeft(cursor().pos().x()); } - + if (m_whereResizing == WDG_UPSX || m_whereResizing == WDG_UP || m_whereResizing == WDG_UPDX) { if (y()+height()-cursor().pos().y() < WDG_MIN_HEIGHT) m_wndRect.setTop(y() + height() - WDG_MIN_HEIGHT); @@ -1114,13 +1114,13 @@ void KviNotifierWindow::redrawWindow() m_pixBackground.resize(m_wndRect.size()); m_pixForeground.resize(m_wndRect.size()); m_pixBackgroundHighlighted.resize(m_wndRect.size()); - + m_pWndBorder->resize( m_wndRect.size() ); m_pWndTabs->setWidth( m_pWndBorder->tabsRect().width() ); m_pWndBody->resize( m_pWndBorder->bodyRect() ); m_pProgressBar->setHeight(m_pWndBorder->bodyRect().height() + m_pWndBorder->tabsRect().height()); } - + QPainter paint; if(m_bBlinkOn) { @@ -1146,7 +1146,7 @@ void KviNotifierWindow::redrawWindow() paint.end(); bitBlt(&m_pixForeground, 0,0, &m_pixBackground); } - + } inline void KviNotifierWindow::setCursor(int cur) diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 7a0f78b69..815fc442e 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -54,15 +54,15 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, QString label) m_pMessageList->setAutoDelete(true); m_bFocused = false; m_pCurrentMessage = 0; - - KviStr buffer; + + QString buffer; g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true); - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); cfg.setGroup("NotifierSkin"); m_clrHighlightedLabel = cfg.readColorEntry("HighlightedTabLablerColor",QColor(200,0,0)); m_clrNormalLabel = cfg.readColorEntry("NormalTabLablerColor",QColor(0,0,0)); m_clrChangedLabel = cfg.readColorEntry("ChangedTabLablerColor",QColor(0,0,100)); - + if(pWnd) { connect(pWnd,SIGNAL(windowNameChanged()),this,SLOT(labelChanged())); @@ -161,10 +161,10 @@ int KviNotifierWindowTab::width(bool b) { dx = g_pTabs->tabFocusedPixSx(); } else { sx = g_pTabs->tabUnfocusedPixSx(); - dx = g_pTabs->tabUnfocusedPixSx(); + dx = g_pTabs->tabUnfocusedPixSx(); font = g_pTabs->fontUnfocused(); } - + QFontMetrics fm(*font); width = fm.width(label())+2; if (!b) width += sx->width() + dx->width(); @@ -208,13 +208,13 @@ KviNotifierWindowTabs::~KviNotifierWindowTabs() void KviNotifierWindowTabs::initConfig() { - KviStr buffer; + QString buffer; g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true); - KviConfig cfg(buffer.ptr(),KviConfig::Read); + KviConfig cfg(buffer,KviConfig::Read); cfg.setGroup("NotifierSkin"); - + QString szFamily = cfg.readEntry("TextFontFocusedTab","Arial"); m_pFocusedFont = new QFont(szFamily,cfg.readIntEntry("TextFocusedFontSize",10)); m_pFocusedFont->setBold(true); @@ -252,7 +252,7 @@ void KviNotifierWindowTabs::loadImages() m_pixIconTabNext_clicked = *p; m_pixIconTabNext = m_pixIconTabNext_out; - + if((p = g_pIconManager->getPixmap("notifier_icon_tab_prev_out.png"))) m_pixIconTabPrev_out = *p; if((p = g_pIconManager->getPixmap("notifier_icon_tab_prev_over.png"))) @@ -292,7 +292,7 @@ void KviNotifierWindowTabs::addMessage(KviWindow * pWnd, KviNotifierMessage * me } tab->appendMessage(message); - + if((g_pNotifierWindow->state()==Hidden) || (!m_pTabFocused)) { setFocusOn(tab); @@ -307,7 +307,7 @@ void KviNotifierWindowTabs::resize(QRect r) m_rct.setY(r.y()); m_rct.setHeight(r.height()); setWidth(r.width()); - + recalculatePositions(); } @@ -334,35 +334,35 @@ void KviNotifierWindowTabs::recalculatePositions() m_rctNextIcon.setWidth(m_pixIconTabNext.width()); m_rctNextIcon.setHeight(m_pixIconTabNext.height()); } - + if (m_bIsOverLeftBound) { m_rctPrevIcon.setX(m_rct.x()); m_rctPrevIcon.setY(m_rct.y()); m_rctPrevIcon.setWidth(m_pixIconTabPrev.width()); m_rctPrevIcon.setHeight(m_pixIconTabPrev.height()); } - + int tmpX, tmpWidth; - + tmpWidth = m_rctCloseTabIcon.x() - m_rct.x(); - + if (m_bIsOverRightBound) { tmpWidth -= m_rctNextIcon.width(); } - + if (m_bIsOverLeftBound) { tmpWidth -= m_rctPrevIcon.width(); tmpX = m_rct.x() + m_rctPrevIcon.width(); } else { tmpX = m_rct.x(); } - + m_rctTabs.setX(tmpX); m_rctTabs.setY(m_rct.y()); - + m_rctTabs.setWidth(tmpWidth); m_rctTabs.setHeight(m_rct.height()); - + needToRedraw(); } @@ -374,25 +374,25 @@ void KviNotifierWindowTabs::prev() KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList); tab = m_tabMap[m_pTabFocused->wnd()]; - + tabIterator.moveFirst(); - + while ((tabIterator.current()) != tab) { ++tabIterator; } - + if (!tabIterator.moveFirst()) { --tabIterator; tab = tabIterator.current(); setFocusOn(tab); } - + } void KviNotifierWindowTabs::next() { if(!m_pTabFocused)return; - + KviNotifierWindowTab * tab; KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList); @@ -401,7 +401,7 @@ void KviNotifierWindowTabs::next() while ((tabIterator.current()) != tab) { ++tabIterator; } - + if (!tabIterator.moveLast()) { ++tabIterator; tab = tabIterator.current(); @@ -416,7 +416,7 @@ void KviNotifierWindowTabs::mousePressEvent(QMouseEvent * e) if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) { return; } - + if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) { return; } @@ -456,7 +456,7 @@ void KviNotifierWindowTabs::mouseReleaseEvent(QMouseEvent * e) scrollTabsLeft(); return; } - + if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) { scrollTabsRight(); return; @@ -470,7 +470,7 @@ void KviNotifierWindowTabs::mouseReleaseEvent(QMouseEvent * e) g_pNotifierWindow->update(); } } - + } void KviNotifierWindowTabs::scrollTabsLeft() @@ -517,7 +517,7 @@ void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab) if(m_pTabFocused)m_pTabFocused->setFocused(); m_lastVisitedTabPtrList.removeRef(tab); - + m_lastVisitedTabPtrList.insert(0, tab); needToRedraw(); @@ -539,15 +539,15 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->setFont(tmpFont); QString str; - + bool isBigger = false; int offset = 0; - + int closeIcon_X = m_rct.width() - m_rctCloseTabIcon.width(); int nextIcon_X = closeIcon_X - m_pixIconTabNext_out.width(); int prevIcon_X = m_rct.x(); - + int tmpTabsWidth = 0; m_pPainter->drawPixmap(0,0,m_pixSX); @@ -555,30 +555,30 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->drawTiledPixmap(m_pixSX.width(),0,m_rct.width()-m_pixSX.width()-m_pixDX.width(),m_rct.height(),m_pixBKG); KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList); - + //m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]); // QMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab; KviNotifierWindowTab * tab; //for (tab = m_tabMap.begin(); tab != m_tabMap.end() && !isBigger; tab++ ) tabIterator.moveFirst(); - + int i = 0; while(m_iTabToStartFrom!=i) { i++; ++tabIterator; } - + while ( ((tab = tabIterator.current()) != 0) && !isBigger) { ++tabIterator; - + if (tab->focused()) { m_pPainter->setFont(*m_pFocusedFont); tab->setRect(m_rct.x() + offset, m_rctTabs.y(), tab->width(), m_rctTabs.height()); - + m_pPainter->drawPixmap(offset,0,m_pixSXFocused); m_pPainter->drawTiledPixmap(offset+m_pixSXFocused.width(),0,tab->width(true),m_rctTabs.height(),m_pixBKGFocused); m_pPainter->drawPixmap(offset+m_pixSXFocused.width()+tab->width(true),0,m_pixDXFocused); @@ -602,7 +602,7 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->setPen(tmpP); offset += tab->width(); } - + if (offset > m_rctTabs.width()) isBigger = true; else isBigger = false; } @@ -625,7 +625,7 @@ void KviNotifierWindowTabs::draw(QPainter * p) m_pPainter->drawPixmap(closeIcon_X, 0, m_pixIconCloseTab); m_pPainter->end(); - + p->drawPixmap(m_rct.x(), m_rct.y(), *m_pPixmap, 0, 0, m_pPixmap->width(), m_pPixmap->height()); m_bNeedToRedraw = false; @@ -637,13 +637,13 @@ void KviNotifierWindowTabs::markAllMessagesAsHistoric() QMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab; // Iterating every tab for (tab = m_tabMap.begin(); tab != m_tabMap.end(); ++tab) { - + if (!tab.value()) break; - + KviPointerList<KviNotifierMessage> * tmpMessageList = tab.value()->messageList(); - + if (!tmpMessageList) break; - + for(KviNotifierMessage * m = tmpMessageList->last(); m; m = tmpMessageList->prev()) { if(m->historic()) break;; m->setHistoric(); @@ -673,7 +673,7 @@ void KviNotifierWindowTabs::closeCurrentTab() KviWindow * pWnd = pTab->wnd(); if (!m_tabMap.contains(pWnd)) return; // The current tab is not on the map??? Call 911!! // End paranoic stuff, go back to sanity... - + closeTab(pWnd, pTab); } @@ -684,20 +684,20 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT m_lastVisitedTabPtrList.removeRef(pTab); m_tabMap.remove(pWnd); delete pTab; - + if(m_tabMap.empty()) { m_pTabFocused = 0; g_pNotifierWindow->showLineEdit(false); g_pNotifierWindow->doHide(false); } else { - + if (m_lastVisitedTabPtrList.count()) { m_pTabFocused = m_lastVisitedTabPtrList.first(); } else { m_pTabFocused = m_tabPtrList.last(); } - + m_pTabFocused->setFocused(true); } } diff --git a/src/modules/objects/class_listview.h b/src/modules/objects/class_listview.h index bfccbdd78..21c693d84 100644 --- a/src/modules/objects/class_listview.h +++ b/src/modules/objects/class_listview.h @@ -27,7 +27,6 @@ //================================================================================= #include "kvi_tal_listview.h" -#include "kvi_draganddrop.h" #include "class_widget.h" #include "class_listviewitem.h" diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index c6979a095..ad338abb5 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -35,7 +35,6 @@ #include "kvi_fileutils.h" #include "kvi_filedialog.h" #include "kvi_kvs_useraction.h" -#include "kvi_draganddrop.h" #include "kvi_tal_tooltip.h" #include <QPushButton> diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index 335bb71a2..fc3be38e6 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -131,7 +131,7 @@ m_ti.clear(); - KviValueList<int> ret; + QList<int> ret; if (!qvalueListIntRetIntDCOPCall("KTorrent", "getTorrentNumbers(int)", ret, 0)) ERROR_RET_VOID |