diff options
Diffstat (limited to 'src')
70 files changed, 269 insertions, 479 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 081ce8136..e3b59fd0a 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -17,7 +17,6 @@ SET(kvilib_MOC_HDRS ext/kvi_animatedpixmap.h ext/kvi_animatedpixmapcache.h ext/kvi_crypt.h - ext/kvi_garbage.h ext/kvi_regusersdb.h ext/kvi_sharedfiles.h irc/kvi_ircuserdb.h @@ -68,7 +67,6 @@ SET(kvilib_SRCS ext/kvi_databuffer.cpp ext/kvi_dbusadaptor.cpp ext/kvi_dcophelper.cpp - ext/kvi_doublebuffer.cpp ext/kvi_garbage.cpp ext/kvi_md5.cpp ext/kvi_mediatype.cpp diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h index f9392399a..ae96aaba1 100644 --- a/src/kvilib/core/kvi_pointerhashtable.h +++ b/src/kvilib/core/kvi_pointerhashtable.h @@ -142,7 +142,7 @@ inline void kvi_hash_key_copy(const KviStr &szFrom,KviStr &szTo,bool) szTo = szFrom; } -inline void kvi_hash_key_destroy(KviStr &szKey,bool) +inline void kvi_hash_key_destroy(KviStr &,bool) { } @@ -166,7 +166,7 @@ inline void kvi_hash_key_copy(const int &iKeyFrom,int &iKeyTo,bool) iKeyTo = iKeyFrom; } -inline void kvi_hash_key_destroy(int &iKey,bool) +inline void kvi_hash_key_destroy(int &,bool) { } @@ -191,7 +191,7 @@ inline void kvi_hash_key_copy(const unsigned short &iKeyFrom,unsigned short &iKe iKeyTo = iKeyFrom; } -inline void kvi_hash_key_destroy(unsigned short &iKey,bool) +inline void kvi_hash_key_destroy(unsigned short &,bool) { } @@ -224,7 +224,7 @@ inline void kvi_hash_key_copy(void * const &pKeyFrom,void *&pKeyTo,bool) pKeyTo = pKeyFrom; } -inline void kvi_hash_key_destroy(void *iKey,bool) +inline void kvi_hash_key_destroy(void *,bool) { } diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index 9d90646f5..c51ea55bb 100644 --- a/src/kvilib/core/kvi_qstring.cpp +++ b/src/kvilib/core/kvi_qstring.cpp @@ -93,7 +93,7 @@ namespace KviQString { if(len == 0)return true; // assume equal const QChar * c1 = sz1.unicode(); - if(sz1.length() < len)return false; + if((unsigned)sz1.length() < len)return false; const QChar * c1e = c1 + len; if(!sz2)return !c1; @@ -112,7 +112,7 @@ namespace KviQString { if(len == 0)return true; // assume equal const QChar * c1 = sz1.unicode(); - if(sz1.length() < len)return false; + if((unsigned)sz1.length() < len)return false; const QChar * c1e = c1 + len; if(!sz2)return !c1; @@ -132,7 +132,7 @@ namespace KviQString { if(len == 0)return true; // assume equal const QChar * c1 = sz1.unicode(); - if(sz1.length() < len)return false; + if((unsigned)sz1.length() < len)return false; const QChar * c1e = c1 + len; if(!sz2)return !c1; @@ -339,8 +339,8 @@ namespace KviQString int cmpCIN(const QString &sz1,const QString &sz2,unsigned int len) { if(len == 0)return 0; // assume equal - unsigned int l1 = MY_MIN(len,sz1.length()); - unsigned int l = MY_MIN(l1,sz2.length()); // FIXME: THIS IS NOT OK + unsigned int l1 = MY_MIN(len,(unsigned)sz1.length()); + unsigned int l = MY_MIN(l1,(unsigned)sz2.length()); // FIXME: THIS IS NOT OK const QChar * c1 = sz1.unicode(); const QChar * c2 = sz2.unicode(); diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp index e44ed20c2..907bd7f36 100644 --- a/src/kvilib/core/kvi_string.cpp +++ b/src/kvilib/core/kvi_string.cpp @@ -42,7 +42,8 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str) return (ptr - str); } - +/* +WORKING CODE, COMMENTED OUT BECAUSE NOT USED AND GENERATES WARNINGS // %s = Latin1 char string (can't be null) // %d = signed int (short,char) // %u = unsigned int (short,char) @@ -188,6 +189,7 @@ int kvi_wvsnprintf(kvi_wchar_t *buffer,kvi_wslen_t len,const kvi_wchar_t *fmt,kv { WVSNPRINTF_BODY } +*/ bool kvi_qstringEqualCI(const QString &s1,const QString &s2) { @@ -1074,7 +1076,7 @@ KviStr::KviStr(const char *bg,const char *end) *(m_ptr + m_len)='\0'; } -KviStr::KviStr(KviFormatConstructorTag tag,const char *fmt,...) +KviStr::KviStr(KviFormatConstructorTag,const char *fmt,...) { m_ptr=(char *)kvi_malloc(256); //First try @@ -1396,7 +1398,7 @@ static unsigned char get_base64_idx(char base64) } -int KviStr::base64ToBuffer(char ** buffer,bool bNullToNewlines) +int KviStr::base64ToBuffer(char ** buffer,bool) { *buffer = 0; if((m_len == 0) || (m_len & 3))return -1; // this is an error @@ -1556,7 +1558,7 @@ void KviStr::append(const char *str,int len) *(m_ptr + m_len)='\0'; } -void KviStr::append(KviFormatConstructorTag tag,const char *fmt,...) +void KviStr::append(KviFormatConstructorTag ,const char *fmt,...) { int auxLen; m_ptr=(char *)kvi_realloc(m_ptr,m_len + 256); diff --git a/src/kvilib/ext/kvi_animatedpixmap.cpp b/src/kvilib/ext/kvi_animatedpixmap.cpp index d3bb506f5..f406601e7 100644 --- a/src/kvilib/ext/kvi_animatedpixmap.cpp +++ b/src/kvilib/ext/kvi_animatedpixmap.cpp @@ -41,9 +41,9 @@ KviAnimatedPixmap::KviAnimatedPixmap(QString fileName) KviAnimatedPixmap::KviAnimatedPixmap(KviAnimatedPixmap* source) :m_szFileName(source->m_szFileName), + m_lFrames(source->m_lFrames), m_uCurrentFrameNumber(source->m_uCurrentFrameNumber), - m_bStarted(source->m_bStarted), //keep started state - m_lFrames(source->m_lFrames) + m_bStarted(source->m_bStarted) //keep started state { m_lFrames->refs++; diff --git a/src/kvilib/ext/kvi_animatedpixmapcache.cpp b/src/kvilib/ext/kvi_animatedpixmapcache.cpp index 996f738bb..c4049630b 100644 --- a/src/kvilib/ext/kvi_animatedpixmapcache.cpp +++ b/src/kvilib/ext/kvi_animatedpixmapcache.cpp @@ -35,7 +35,7 @@ KviAnimatedPixmapCache::KviAnimatedPixmapCache() { g_pAnimatedCache = this; m_animationTimer.setSingleShot(true); - connect(&m_animationTimer,SIGNAL(timeout()),this,SLOT(timerEvent())); + connect(&m_animationTimer,SIGNAL(timeout()),this,SLOT(timeoutEvent())); } KviAnimatedPixmapCache::~KviAnimatedPixmapCache() { @@ -193,7 +193,7 @@ void KviAnimatedPixmapCache::internalSceduleFrameChange(uint delay,KviAnimatedP m_timerMutex.unlock(); } -void KviAnimatedPixmapCache::timerEvent() +void KviAnimatedPixmapCache::timeoutEvent() { /* * We are adding 15msecs to the current time. This MAY lead to the situation, @@ -232,10 +232,12 @@ void KviAnimatedPixmapCache::timerEvent() { long long nextDelay = i.key(); uint delay = (uint) (nextDelay - KviTimeUtils::getCurrentTimeMills()); +/* if (delay < 0) { delay = 0; } +*/ m_animationTimer.start(delay); } // m_timerMutex.unlock(); diff --git a/src/kvilib/ext/kvi_animatedpixmapcache.h b/src/kvilib/ext/kvi_animatedpixmapcache.h index 41b3df051..9de6c51f8 100644 --- a/src/kvilib/ext/kvi_animatedpixmapcache.h +++ b/src/kvilib/ext/kvi_animatedpixmapcache.h @@ -32,8 +32,9 @@ #include "kvi_settings.h" class KviAnimatedPixmapInterface { - public: - virtual void nextFrame() = 0; +public: + virtual void nextFrame() = 0; + virtual ~KviAnimatedPixmapInterface() {}; }; class KVILIB_API KviAnimatedPixmapCache : public QObject { @@ -83,11 +84,11 @@ public: bool resized; Data(QString szFile) : - QList<FrameInfo> (), refs(0), resized(false), file(szFile) { + QList<FrameInfo> (), refs(0), file(szFile), resized(false) { } Data(Data& other) : - QList<FrameInfo> (other), refs(0), resized(false), file(other.file) { + QList<FrameInfo> (other), refs(0), file(other.file), resized(false) { for(int i=0;i<count();i++) { this->operator [](i).detach(); @@ -116,7 +117,7 @@ protected: void internalSceduleFrameChange(uint delay,KviAnimatedPixmapInterface* receiver); void internalNotifyDelete(KviAnimatedPixmapInterface* receiver); protected slots: - void timerEvent(); + virtual void timeoutEvent(); public: virtual ~KviAnimatedPixmapCache(); diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp index 8f2533779..981b17f47 100644 --- a/src/kvilib/ext/kvi_config.cpp +++ b/src/kvilib/ext/kvi_config.cpp @@ -505,7 +505,7 @@ bool KviConfig::save() group.hexEncodeWithTable(encode_table); if(!f.putChar('['))return false; - if(f.writeBlock(group.ptr(),group.len()) < (int) group.len())return false; + if(f.writeBlock(group.ptr(),group.len()) < (unsigned int) group.len())return false; if(f.writeBlock("]\n",2) < 2)return false; KviConfigGroup * dict = (KviConfigGroup *)it.current(); @@ -519,9 +519,9 @@ bool KviConfig::save() szName.hexEncodeWithTable(encode_table); szValue.hexEncodeWhiteSpace(); - if(f.writeBlock(szName.ptr(),szName.len()) < (int) szName.len())return false; + if(f.writeBlock(szName.ptr(),szName.len()) < (unsigned int) szName.len())return false; if(!f.putChar('='))return false; - if(f.writeBlock(szValue.ptr(),szValue.len()) < (int) szValue.len())return false; + if(f.writeBlock(szValue.ptr(),szValue.len()) < (unsigned int) szValue.len())return false; if(!f.putChar('\n'))return false; ++it2; } diff --git a/src/kvilib/ext/kvi_databuffer.cpp b/src/kvilib/ext/kvi_databuffer.cpp deleted file mode 100644 index 02a74c5f0..000000000 --- a/src/kvilib/ext/kvi_databuffer.cpp +++ /dev/null @@ -1,135 +0,0 @@ -//============================================================================= -// -// File : kvi_databuffer.cpp -// Creation date : Thu Aug 23 17:04:24 2001 GMT by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2008 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. -// -//============================================================================= - - -#define _KVI_DEBUG_CHECK_RANGE_ - -#include "kvi_debug.h" - -#include "kvi_databuffer.h" -#include "kvi_malloc.h" -#include "kvi_memmove.h" - -// FIXME: this could resize in chunks!...this would be damn faster :) - -KviDataBuffer::KviDataBuffer(int uSize,const unsigned char * data) -{ - __range_valid(uSize > 0); - m_uSize = uSize; - m_pData = (unsigned char *)kvi_malloc(sizeof(unsigned char) * uSize); - if(data)kvi_memmove(m_pData,data,uSize); -} - -KviDataBuffer::KviDataBuffer() -{ - m_uSize = 0; - m_pData = 0; -} - -KviDataBuffer::~KviDataBuffer() -{ - if(m_pData) - { - __range_valid(m_uSize); - kvi_free(m_pData); - } -} - -int KviDataBuffer::find(const unsigned char * block,int uSize) -{ - if(uSize < 1)return -1; - if(uSize > m_uSize)return -1; - - int uSearchSize = (m_uSize - uSize) + 1; - - for(int i=0;i<uSearchSize;i++) - { - if(m_pData[i] == *block) - { - // good beginning - if(uSize == 1)return i; - int j; - for(j = 1;j<uSize;j++) - { - if(m_pData[i + j] != block[j]) - { - j = 0; - break; - } - } - if(j > 0)return i; - } - } - - return -1; -} - -int KviDataBuffer::find(unsigned char c) -{ - const unsigned char * p = m_pData; - const unsigned char * e = p + m_uSize; - while(p < e) - { - if(*p == c)return (p - m_pData); - p++; - } - return -1; -} - - -void KviDataBuffer::remove(int uSize) -{ - __range_valid((uSize <= m_uSize) && (uSize > 0)); - - m_uSize -= uSize; - - if(m_uSize > 0) - { - kvi_memmove(m_pData,m_pData + uSize,m_uSize); - m_pData = (unsigned char *)kvi_realloc(m_pData,m_uSize * sizeof(unsigned char)); - } else { - kvi_free(m_pData); - m_pData = 0; - } -} - -void KviDataBuffer::resize(int uSize) -{ - __range_valid(uSize >= 0); - if(uSize > 0) - { - m_pData = (unsigned char *)kvi_realloc(m_pData,uSize * sizeof(unsigned char)); - } else { - kvi_free(m_pData); - m_pData = 0; - } - m_uSize = uSize; -} - -void KviDataBuffer::append(const unsigned char * data,int uSize) -{ - m_pData = (unsigned char *)kvi_realloc(m_pData,m_uSize + uSize); - kvi_memmove(m_pData + m_uSize,data,uSize); - m_uSize += uSize; -} diff --git a/src/kvilib/ext/kvi_databuffer.h b/src/kvilib/ext/kvi_databuffer.h deleted file mode 100644 index bbeaf72ff..000000000 --- a/src/kvilib/ext/kvi_databuffer.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef _KVI_DATABUFFER_H_ -#define _KVI_DATABUFFER_H_ -//============================================================================= -// -// File : kvi_databuffer.h -// Creation date : Thu Aug 23 17:04:25 2001 GMT by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2001 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_heapobject.h" - -class KVILIB_API KviDataBuffer : public KviHeapObject -{ -public: - // uSize MUST be greater than 0 - // if data is non-zero, it MUST point to a buffer at least uSize bytes long - // and the data is COPIED from that buffer! - KviDataBuffer(int uSize,const unsigned char * data = 0); - KviDataBuffer(); - ~KviDataBuffer(); -private: - int m_uSize; - unsigned char * m_pData; -public: - int size() const { return m_uSize; }; - unsigned char * data() const { return m_pData; }; - // uSize MUST be smaller or equal to size() - // consumes data! - void remove(int uSize); - void clear(){ if(m_uSize > 0)remove(m_uSize); }; - // uSize MUST be greater than 0 - void resize(int uSize); - void addSize(int uSize){ resize(m_uSize + uSize); }; - void append(const unsigned char * data,int uSize); - void append(const KviDataBuffer &b){ append(b.data(),b.size()); }; - int find(unsigned char c); - int find(const unsigned char * block,int uSize); -}; - -#endif //_KVI_DATABUFFER_H_ diff --git a/src/kvilib/file/kvi_file.cpp b/src/kvilib/file/kvi_file.cpp index 88d521c17..867bbe599 100644 --- a/src/kvilib/file/kvi_file.cpp +++ b/src/kvilib/file/kvi_file.cpp @@ -55,7 +55,7 @@ bool KviFile::openForWriting(bool bAppend) bool KviFile::save(const QByteArray &bData) { if(!save((kvi_u32_t)(bData.size())))return false; - return (writeBlock(bData.data(),bData.size()) == ((int)(bData.size()))); + return (writeBlock(bData.data(),bData.size()) == ((unsigned int)(bData.size()))); } bool KviFile::load(QByteArray &bData) @@ -71,7 +71,7 @@ bool KviFile::save(const QString &szData) { KviQCString c = KviQString::toUtf8(szData); if(!save((kvi_u32_t)(c.length())))return false; - return (writeBlock(c.data(),c.length()) == ((int)(c.length()))); + return (writeBlock(c.data(),c.length()) == ((unsigned int)(c.length()))); } bool KviFile::load(QString &szData) @@ -89,7 +89,7 @@ bool KviFile::load(QString &szData) bool KviFile::save(const KviStr &szData) { if(!save((kvi_u32_t)(szData.len())))return false; - return (writeBlock(szData.ptr(),szData.len()) == (int) szData.len()); + return (writeBlock(szData.ptr(),szData.len()) == (unsigned int) szData.len()); } bool KviFile::load(KviStr &szData) diff --git a/src/kvilib/file/kvi_file.h b/src/kvilib/file/kvi_file.h index ccea2e13a..d8d653728 100644 --- a/src/kvilib/file/kvi_file.h +++ b/src/kvilib/file/kvi_file.h @@ -52,8 +52,8 @@ public: // Missing functions in Qt 4.x - quint64 writeBlock(const char * data,quint64 uLen){ return write(data,uLen); }; - quint64 readBlock(char * data,quint64 uLen){ return read(data,uLen); }; + qint64 writeBlock(const char * data,quint64 uLen){ return write(data,uLen); }; + qint64 readBlock(char * data,quint64 uLen){ return read(data,uLen); }; // This stuff loads and saves LITTLE ENDIAN DATA! bool save(kvi_u64_t t); diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index 9dbd33780..c8407d8d3 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -282,7 +282,7 @@ namespace KviFileUtils if(!f.openForWriting(bAppend))return false; KviQCString szTmp = KviQString::toUtf8(szData); if(!szTmp.data())return true; - if(f.writeBlock(szTmp.data(),szTmp.length()) != ((int)(szTmp.length())))return false; + if(f.writeBlock(szTmp.data(),szTmp.length()) != ((unsigned int)(szTmp.length())))return false; return true; } @@ -298,7 +298,7 @@ namespace KviFileUtils if(!f.openForWriting(bAppend))return false; KviQCString szTmp = QTextCodec::codecForLocale()->fromUnicode(szData); if(!szTmp.data())return true; - if(f.writeBlock(szTmp.data(),szTmp.length()) != ((int)(szTmp.length())))return false; + if(f.writeBlock(szTmp.data(),szTmp.length()) != ((unsigned int)(szTmp.length())))return false; return true; } diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp index 02c90ffc7..f1db1fe89 100644 --- a/src/kvilib/file/kvi_packagefile.cpp +++ b/src/kvilib/file/kvi_packagefile.cpp @@ -484,7 +484,7 @@ bool KviPackageWriter::pack(const QString &szFileName,kvi_u32_t uPackFlags) return bRet; } -bool KviPackageWriter::packInternal(const QString &szFileName,kvi_u32_t uPackFlags) +bool KviPackageWriter::packInternal(const QString &szFileName,kvi_u32_t) { KviFile f(szFileName); @@ -597,7 +597,7 @@ KviPackageReader::~KviPackageReader() { } -bool KviPackageReader::readHeaderInternal(KviFile * pFile,const QString &szLocalFileName) +bool KviPackageReader::readHeaderInternal(KviFile * pFile,const QString &) { // read the PackageHeader diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp index 2db49cb3e..0881dd871 100644 --- a/src/kvilib/irc/kvi_ircuserdb.cpp +++ b/src/kvilib/irc/kvi_ircuserdb.cpp @@ -263,7 +263,7 @@ void KviIrcUserDataBase::registeredUserChanged(const QString & user) } } -void KviIrcUserDataBase::registeredUserAdded(const QString & user) +void KviIrcUserDataBase::registeredUserAdded(const QString &) { KviPointerHashTableIterator<QString,KviIrcUserEntry> it( *m_pDict ); for( ; it.current(); ++it ) diff --git a/src/kvilib/irc/kvi_mirccntrl.cpp b/src/kvilib/irc/kvi_mirccntrl.cpp index 29b080d77..615434edb 100644 --- a/src/kvilib/irc/kvi_mirccntrl.cpp +++ b/src/kvilib/irc/kvi_mirccntrl.cpp @@ -162,7 +162,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int // and fills the color values in the two bytes // - if(charIdx >= szData.length()) + if(charIdx >= (unsigned int) szData.length()) { (*byte_1)=KVI_NOCHANGE; (*byte_2)=KVI_NOCHANGE; @@ -183,7 +183,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int //Something interesting ok. (*byte_1)=c - '0'; //store the code charIdx++; - if(charIdx >= szData.length()) + if(charIdx >= (unsigned int) szData.length()) { (*byte_2)=KVI_NOCHANGE; return charIdx; @@ -202,7 +202,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int { (*byte_1)=(((*byte_1)*10)+(c-'0'))%16; charIdx++; - if(charIdx >= szData.length()) + if(charIdx >= (unsigned int) szData.length()) { (*byte_2)=KVI_NOCHANGE; return charIdx; @@ -213,7 +213,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int if(c == ',') { charIdx++; - if(charIdx >= szData.length()) + if(charIdx >= (unsigned int) szData.length()) { (*byte_2)=KVI_NOCHANGE; return charIdx; @@ -236,7 +236,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int //Background , a color code (*byte_2)=c-'0'; charIdx++; - if(charIdx >= szData.length())return charIdx; + if(charIdx >= (unsigned int) szData.length())return charIdx; c = szData[(int)charIdx].unicode(); if((c >= '0') && (c <='9')) diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp index 90a66e3bd..5784b6a27 100644 --- a/src/kvilib/irc/kvi_useridentity.cpp +++ b/src/kvilib/irc/kvi_useridentity.cpp @@ -198,7 +198,8 @@ void KviUserIdentityManager::load(const QString &szFileName) m_szDefaultIdentity = cfg.readQStringEntry("DefaultIdentity",""); KviConfigIterator it(*(cfg.dict())); - while(KviConfigGroup * grp = it.current()) + KviConfigGroup * grp; + while( (grp = it.current()) ) { if(!KviQString::equalCI(it.currentKey(),"KVIrc")) { diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index 9578a8637..151ebc251 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -695,6 +695,8 @@ void KviHttpRequest::processData(KviDataBuffer * data) case StoreToFile: m_pFile->writeBlock((const char *)(data->data()),data->size()); break; + default: + break; } if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength))) @@ -727,13 +729,13 @@ void KviHttpRequest::processData(KviDataBuffer * data) { // process the current chunk data unsigned int uProcessSize = m_uRemainingChunkSize; - if(uProcessSize > m_pBuffer->size())uProcessSize = m_pBuffer->size(); + if(uProcessSize > (unsigned int)m_pBuffer->size())uProcessSize = m_pBuffer->size(); m_uRemainingChunkSize -= uProcessSize; switch(m_eProcessingType) { case Blocks: - if(m_pBuffer->size() == uProcessSize) + if((unsigned int)m_pBuffer->size() == uProcessSize) { // avoid copying to a new buffer emit binaryData(*m_pBuffer); @@ -745,7 +747,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) } break; case Lines: - if(m_pBuffer->size() == uProcessSize) + if((unsigned int)m_pBuffer->size() == uProcessSize) { // avoid copying to a new buffer emitLines(m_pBuffer); diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp index 0a9e42d8c..e9bc64086 100644 --- a/src/kvilib/net/kvi_netutils.cpp +++ b/src/kvilib/net/kvi_netutils.cpp @@ -569,10 +569,9 @@ namespace KviNetUtils return true; } - bool getInterfaceAddress(const QString &szInterfaceName,QString &szBuffer) - { - #ifdef COMPILE_GET_INTERFACE_ADDRESS + bool getInterfaceAddress(const QString &szInterfaceName,QString &) + { struct sockaddr *sa; struct sockaddr_in *sin; struct ifreq ifr; @@ -597,6 +596,8 @@ namespace KviNetUtils // (this seems to work for AF_INET only anyway) #else //!COMPILE_GET_INTERFACE_ADDRESS + bool getInterfaceAddress(const QString &,QString &) + { return false; #endif //!COMPILE_GET_INTERFACE_ADDRESS } @@ -695,7 +696,7 @@ KviSockaddr::KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIPv6,boo hints.ai_protocol = 0; m_pData = 0; KviStr szPort(KviStr::Format,"%u",uPort); - getaddrinfo(szIpAddress,szPort.ptr(),&hints,(struct addrinfo **)&m_pData); + getaddrinfo(szIpAddress,szPort.ptr(),&hints,&m_pData); } KviSockaddr::KviSockaddr(kvi_u32_t uPort,bool bIPv6,bool bUdp) // passive sockaddr @@ -713,14 +714,14 @@ KviSockaddr::KviSockaddr(kvi_u32_t uPort,bool bIPv6,bool bUdp) // passive sockad hints.ai_protocol = 0; m_pData = 0; KviStr szPort(KviStr::Format,"%u",uPort); - getaddrinfo(0,szPort.ptr(),&hints,(struct addrinfo **)&m_pData); + getaddrinfo(0,szPort.ptr(),&hints,&m_pData); } KviSockaddr::~KviSockaddr() { if(m_pData) { - freeaddrinfo((struct addrinfo *)m_pData); + freeaddrinfo(m_pData); m_pData = 0; } } @@ -728,19 +729,19 @@ KviSockaddr::~KviSockaddr() struct sockaddr * KviSockaddr::socketAddress() { if(!m_pData)return 0; - return ((struct addrinfo *)m_pData)->ai_addr; + return (m_pData)->ai_addr; } size_t KviSockaddr::addressLength() { if(!m_pData)return 0; - return ((struct addrinfo *)m_pData)->ai_addrlen; + return (m_pData)->ai_addrlen; } int KviSockaddr::addressFamily() { if(!m_pData)return 0; - return ((struct addrinfo *)m_pData)->ai_family; + return (m_pData)->ai_family; } bool KviSockaddr::isIPv6() @@ -757,18 +758,18 @@ kvi_u32_t KviSockaddr::port() { if(!m_pData)return 0; #ifdef COMPILE_IPV6_SUPPORT - switch(((struct addrinfo *)m_pData)->ai_family) + switch(m_pData->ai_family) { case AF_INET: - return ntohs(((struct sockaddr_in *)(((struct addrinfo *)m_pData)->ai_addr))->sin_port); + return ntohs(((struct sockaddr_in *)(m_pData->ai_addr))->sin_port); break; case AF_INET6: - return ntohs(((struct sockaddr_in6 *)(((struct addrinfo *)m_pData)->ai_addr))->sin6_port); + return ntohs(((struct sockaddr_in6 *)(m_pData->ai_addr))->sin6_port); break; } return 0; #else - return ntohs(((struct sockaddr_in *)(((struct addrinfo *)m_pData)->ai_addr))->sin_port); + return ntohs(((struct sockaddr_in *)(m_pData->ai_addr))->sin_port); #endif } @@ -779,15 +780,15 @@ bool KviSockaddr::getStringAddress(QString &szBuffer) switch(((struct addrinfo *)m_pData)->ai_family) { case AF_INET: - return kvi_binaryIpToStringIp(((struct sockaddr_in *)(((struct addrinfo *)m_pData)->ai_addr))->sin_addr,szBuffer); + return kvi_binaryIpToStringIp(((struct sockaddr_in *)(m_pData->ai_addr))->sin_addr,szBuffer); break; case AF_INET6: - return kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)(((struct addrinfo *)m_pData)->ai_addr))->sin6_addr,szBuffer); + return kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)(m_pData->ai_addr))->sin6_addr,szBuffer); break; } return false; #else - return kvi_binaryIpToStringIp(((struct sockaddr_in *)(((struct addrinfo *)m_pData)->ai_addr))->sin_addr,szBuffer); + return kvi_binaryIpToStringIp(((struct sockaddr_in *)(m_pData->ai_addr))->sin_addr,szBuffer); #endif } diff --git a/src/kvilib/net/kvi_netutils.h b/src/kvilib/net/kvi_netutils.h index 8133a252e..eaa9ab701 100644 --- a/src/kvilib/net/kvi_netutils.h +++ b/src/kvilib/net/kvi_netutils.h @@ -54,7 +54,7 @@ public: KviSockaddr(kvi_u32_t uPort,bool bIPv6,bool bUdp = false); // passive ~KviSockaddr(); private: - void * m_pData; //addrinfo + struct addrinfo * m_pData; public: struct sockaddr * socketAddress(); size_t addressLength(); diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp index 5675be2bc..83f215dac 100644 --- a/src/kvilib/net/kvi_ssl.cpp +++ b/src/kvilib/net/kvi_ssl.cpp @@ -216,7 +216,7 @@ static DH * my_get_dh(int keylength) return dh; } -DH * my_ugly_dh_callback(SSL *s, int is_export, int keylength) +DH * my_ugly_dh_callback(SSL *, int, int keylength) { my_ssl_lock(); DH *dh = my_get_dh(keylength); @@ -320,7 +320,7 @@ bool KviSSL::initSocket(kvi_socket_t fd) } -static int cb(char *buf, int size, int rwflag, void *u) +static int cb(char *buf, int size, int, void *u) { KviStr * p = (KviStr *)u; int len = p->len(); diff --git a/src/kvilib/system/kvi_env.cpp b/src/kvilib/system/kvi_env.cpp index 86e359c67..48f706daf 100644 --- a/src/kvilib/system/kvi_env.cpp +++ b/src/kvilib/system/kvi_env.cpp @@ -31,12 +31,14 @@ #if !defined(COMPILE_ON_WINDOWS) && ! defined(COMPILE_ON_MINGW) +#ifdef HAVE_SETENV bool kvi_setenv(const char * name,const char * value) { -#ifdef HAVE_SETENV return (setenv(name,value,1) == 0); #else #ifdef HAVE_PUTENV +bool kvi_setenv(const char * name,const char * value) +{ int iLen1 = kvi_strLen(name); int iLen2 = kvi_strLen(value); char * buf = (char *)kvi_malloc(iLen1 + iLen2 + 2); @@ -52,18 +54,22 @@ bool kvi_setenv(const char * name,const char * value) } return true; #else +bool kvi_setenv(const char *,const char *) +{ // no setenv , no putenv.. what the hell of system is this ? return false; #endif #endif } +#ifdef HAVE_UNSETENV void kvi_unsetenv(const char * name) { -#ifdef HAVE_UNSETENV unsetenv(name); #else #ifdef HAVE_PUTENV +void kvi_unsetenv(const char * name) +{ int iLen1 = kvi_strLen(name); char * buf = (char *)kvi_malloc(iLen1 + 1); kvi_memmove(buf,name,iLen1); @@ -81,6 +87,10 @@ void kvi_unsetenv(const char * name) kvi_free(buf); } // else this system sux } + #else +void kvi_unsetenv(const char *) +{ + // no setenv , no putenv.. what the hell of system is this ? #endif #endif } diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp index 69eed9fe4..19e0e3ff5 100644 --- a/src/kvilib/system/kvi_locale.cpp +++ b/src/kvilib/system/kvi_locale.cpp @@ -335,9 +335,11 @@ static KviPointerHashTable<const char *,KviSmartTextCodec> * g_pSmartCodecDict #include <stdio.h> +/* #if HAVE_LIMITS_H || _LIBC #include <limits.h> #endif +*/ // The magic number of the GNU message catalog format. #define KVI_LOCALE_MAGIC 0x950412de @@ -998,7 +1000,7 @@ namespace KviLocale } }; -KviTranslator::KviTranslator(QObject * par,const char * nam) +KviTranslator::KviTranslator(QObject * par,const char *) : QTranslator(par) { } @@ -1007,7 +1009,7 @@ KviTranslator::~KviTranslator() { } -QString KviTranslator::translate(const char *context,const char * message,const char * comment) const +QString KviTranslator::translate(const char *,const char * message,const char *) const { // we ignore contexts and comments for qt translations return g_pMainCatalogue->translateToQString(message); diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp index b72e55c63..b98e24883 100644 --- a/src/kvilib/tal/kvi_tal_application.cpp +++ b/src/kvilib/tal/kvi_tal_application.cpp @@ -27,7 +27,7 @@ #ifdef COMPILE_KDE_SUPPORT - KviTalApplication::KviTalApplication(int & iArgc, char ** ppcArgv) + KviTalApplication::KviTalApplication(int &, char **) : KApplication() { } diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp index 78cc641d7..d7b45eed3 100644 --- a/src/kvilib/tal/kvi_tal_filedialog.cpp +++ b/src/kvilib/tal/kvi_tal_filedialog.cpp @@ -28,7 +28,7 @@ #ifdef COMPILE_KDE_SUPPORT -KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & szFilter, QWidget * pParent, const char * pcName, bool bModal) +KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & szFilter, QWidget * pParent, const char *, bool) : KFileDialog(KUrl(szDirName),szFilter,pParent) { //clearWFlags(WDestructiveClose); @@ -36,7 +36,7 @@ KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & sz #else // COMPILE_KDE_SUPPORT -KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & szFilter, QWidget * pParent, const char * pcName, bool bModal) +KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & szFilter, QWidget * pParent, const char *, bool bModal) : QFileDialog(pParent,"",szDirName,szFilter) { setModal(bModal); diff --git a/src/kvilib/tal/kvi_tal_iconview.cpp b/src/kvilib/tal/kvi_tal_iconview.cpp index 31ece696d..e2e8115e0 100644 --- a/src/kvilib/tal/kvi_tal_iconview.cpp +++ b/src/kvilib/tal/kvi_tal_iconview.cpp @@ -33,7 +33,7 @@ #include <QAbstractTextDocumentLayout> #include <QStyle> -KviTalIconView::KviTalIconView(QWidget * pParent, Qt::WFlags f) +KviTalIconView::KviTalIconView(QWidget * pParent, Qt::WFlags) : QTableWidget(pParent) { setSelectionMode(QAbstractItemView::SingleSelection); diff --git a/src/kvilib/tal/kvi_tal_itemdelegates.cpp b/src/kvilib/tal/kvi_tal_itemdelegates.cpp index 38c5a60e4..699eae36c 100644 --- a/src/kvilib/tal/kvi_tal_itemdelegates.cpp +++ b/src/kvilib/tal/kvi_tal_itemdelegates.cpp @@ -29,7 +29,7 @@ #include <QAbstractTextDocumentLayout> KviTalIconAndRichTextItemDelegate::KviTalIconAndRichTextItemDelegate(QAbstractItemView * pWidget) -: QItemDelegate(pWidget), m_pDefaultPix(0), m_pParent(pWidget) +: QItemDelegate(pWidget), m_pParent(pWidget), m_pDefaultPix(0) { } @@ -84,7 +84,7 @@ void KviTalIconAndRichTextItemDelegate::paint(QPainter * pPainter, const QStyleO pPainter->restore(); } -QSize KviTalIconAndRichTextItemDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const +QSize KviTalIconAndRichTextItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex & index) const { QString szText = index.data(Qt::DisplayRole).toString(); QTextDocument doc; diff --git a/src/kvilib/tal/kvi_tal_popupmenu.cpp b/src/kvilib/tal/kvi_tal_popupmenu.cpp index 8a3814a36..e6b81463f 100644 --- a/src/kvilib/tal/kvi_tal_popupmenu.cpp +++ b/src/kvilib/tal/kvi_tal_popupmenu.cpp @@ -201,7 +201,7 @@ void KviTalPopupMenu::slottriggered(QAction * a) return; } -void KviTalPopupMenu::slotActionTriggered(bool toggled) +void KviTalPopupMenu::slotActionTriggered(bool) { QAction * action = (QAction *)sender(); slottriggered(action); diff --git a/src/kvilib/tal/kvi_tal_tooltip.cpp b/src/kvilib/tal/kvi_tal_tooltip.cpp index 69a85ac97..7c19ecc53 100644 --- a/src/kvilib/tal/kvi_tal_tooltip.cpp +++ b/src/kvilib/tal/kvi_tal_tooltip.cpp @@ -48,7 +48,7 @@ void KviTalToolTipHelper::toolTipDying() m_pToolTip = 0; } -bool KviTalToolTipHelper::eventFilter(QObject * pObject,QEvent * pEvent) +bool KviTalToolTipHelper::eventFilter(QObject *,QEvent * pEvent) { if((pEvent->type() == QEvent::ToolTip) && m_pToolTip) { @@ -86,7 +86,7 @@ void KviTalToolTip::add(QWidget * widget,const QString & text) widget->setToolTip(text); } -void KviTalToolTip::remove(QWidget * widget) +void KviTalToolTip::remove(QWidget *) { //QToolTip::remove(widget); @@ -98,7 +98,7 @@ void KviTalToolTip::tip(const QRect & rect,const QString & text) QToolTip::showText(m_pParent->mapToGlobal(rect.topLeft()),text); } -void KviTalToolTip::maybeTip(const QPoint & p) +void KviTalToolTip::maybeTip(const QPoint &) { // does nothing here.. and in Qt 4.x will even fail to work } diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 8c5b26eae..06047852f 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -70,7 +70,6 @@ #include "kvi_customtoolbarmanager.h" #include "kvi_fileutils.h" #include "kvi_time.h" -#include "kvi_doublebuffer.h" #include "kvi_stringconversion.h" #include "kvi_useridentity.h" #include "kvi_ircview.h" @@ -497,8 +496,6 @@ void KviApp::setup() KVI_SPLASH_SET_PROGRESS(92) - KviDoubleBuffer::init(); - QString szStylesheetFile; getGlobalKvircDirectory(szStylesheetFile,Config,"style.css"); if(KviFileUtils::fileExists(szStylesheetFile)) @@ -645,7 +642,6 @@ KviApp::~KviApp() #ifdef COMPILE_PSEUDO_TRANSPARENCY destroyPseudoTransparency(); #endif - KviDoubleBuffer::done(); if(m_pPendingAvatarChanges)delete m_pPendingAvatarChanges; // Kill the thread manager.... all the slave threads should have been already terminated ... #ifdef COMPILE_SSL_SUPPORT @@ -1942,11 +1938,6 @@ void KviApp::heartbeat(kvi_time_t tNow) KVI_OPTION_UINT(KviOption_uintTotalConnectionTime)++; } - // the line below is an approximation of (tNow / 120) == 0 - // we don't need a really great precision here, so 128 is still ok - if(!(tNow & 0x7f)) - KviDoubleBuffer::heartbeat(); - if (pTm && !pTm->tm_hour && !pTm->tm_min && !pTm->tm_sec) { KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h index 9f8abcd17..a262379f6 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h @@ -36,8 +36,8 @@ public: KviBasicIrcServerInfo(const QString & version = KviQString::empty); virtual ~KviBasicIrcServerInfo(); protected: - virtual const QString & getCustomChannelModeDescription(QChar mode) { return KviQString::empty; }; - virtual const QString & getCustomUserModeDescription(QChar mode) { return KviQString::empty; }; + virtual const QString & getCustomChannelModeDescription(QChar) { return KviQString::empty; }; + virtual const QString & getCustomUserModeDescription(QChar) { return KviQString::empty; }; private: const QString & getBasicChannelModeDescription(QChar mode); const QString & getBasicUserModeDescription(QChar mode); diff --git a/src/kvirc/kernel/kvi_ircdatastreammonitor.h b/src/kvirc/kernel/kvi_ircdatastreammonitor.h index ccae9c4f0..430f0f621 100644 --- a/src/kvirc/kernel/kvi_ircdatastreammonitor.h +++ b/src/kvirc/kernel/kvi_ircdatastreammonitor.h @@ -38,9 +38,9 @@ protected: KviIrcContext * m_pMyContext; public: // message is null terminated - virtual void incomingMessage(const char * message){}; + virtual void incomingMessage(const char *){}; // message is NOT null terminated! For proxy connections it might spit out binary data! - virtual void outgoingMessage(const char * message,int len){}; + virtual void outgoingMessage(const char *,int){}; virtual void connectionInitiated(){}; virtual void connectionTerminated(){}; virtual void die(){ delete this; }; diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index 352720146..2e7dc93ca 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -429,8 +429,6 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) // ^ +a is a weird mode: it also breaks nicknames on some networks! // not a valid first char(s) of nickname, must be a mode prefix - bool bContinue = true; - while(pServerInfo->isSupportedModePrefix((unsigned char)(*aux))) { // leading umode flag(s) @@ -817,7 +815,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) { // ops...not logged in yet... QString szNextNick; - unsigned int uNickCnt; + unsigned int uNickCnt = 0; // Check for identity profiles KviIdentityProfileSet * pSet = KviIdentityProfileSet::instance(); diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index be6f0bcd5..f520c6900 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -536,7 +536,7 @@ void KviChannel::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEntry> * szFlags.append(ed->flag()); uCount++; - if(uCount == connection()->serverInfo()->maxModeChanges()) + if(uCount == (unsigned int) connection()->serverInfo()->maxModeChanges()) { if(connection()) { @@ -565,7 +565,7 @@ QPixmap * KviChannel::myIconPtr() return g_pIconManager->getSmallIcon((m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) ? KVI_SMALLICON_DEADCHANNEL : KVI_SMALLICON_CHANNEL); } -void KviChannel::resizeEvent(QResizeEvent * e) +void KviChannel::resizeEvent(QResizeEvent *) { int iHeight = m_pInput->heightHint(); int iHeight2 = m_pTopicWidget->sizeHint().height(); @@ -1865,15 +1865,16 @@ void KviChannel::pasteLastLog() unsigned int uLines = KVI_OPTION_UINT(KviOption_uintLinesToPasteOnChannelJoin); unsigned int uStart = uCount - uLines - 1; +/* // Check if the log is smaller than the lines to print if(uStart < 0) uStart = 0; - +*/ QString szDummy = __tr2qs("Starting last log"); outputMessage(KVI_OUT_CHANPRIVMSG,szDummy); // Scan the log file - for(int i = uStart; i < uCount; i++) + for(unsigned int i = uStart; i < uCount; i++) { QString szLine = QString(list.at(i)); szLine = szLine.section(' ',1); diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index 3d9a7a5cc..d2516be1f 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -60,7 +60,7 @@ void KviColorWindow::popup(QWidget * pOwner) show(); } -void KviColorWindow::paintEvent(QPaintEvent * e) +void KviColorWindow::paintEvent(QPaintEvent *) { static int clrIdx[16] = { 1,0,0,0,0,0,0,0,1,1,1,1,0,0,0,1 }; QPainter p(this); @@ -96,8 +96,6 @@ void KviColorWindow::mousePressEvent(QMouseEvent * e) if (e->x() > 36 && e->y() > 18) iKey -= 2; - int iAscii = iKey + 48; - // FIXME: is this right? maybe it should be szStr.setNum(iAscii); szStr.setNum(iKey); @@ -122,7 +120,7 @@ void KviColorWindow::show() QWidget::show(); } -void KviColorWindow::timerEvent(QTimerEvent * e) +void KviColorWindow::timerEvent(QTimerEvent *) { if(m_iTimerId != -1) killTimer(m_iTimerId); diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 0b9d464bd..9ab683713 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -1057,7 +1057,7 @@ void KviConsole::applyOptions() resize(width() + 1,height() + 1); } -void KviConsole::resizeEvent(QResizeEvent *e) +void KviConsole::resizeEvent(QResizeEvent *) { int hght = m_pInput->heightHint(); int hght2 = m_pButtonBox->sizeHint().height(); diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 4710ac1ab..e04edce59 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -60,19 +60,13 @@ { } - - - - KviCryptController::KviCryptController(QWidget * par,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur) + KviCryptController::KviCryptController(QWidget * par,KviWindowToolPageButton* button,const char *,KviWindow * wnd,KviCryptSessionInfo * cur) : KviWindowToolWidget(par,button) { // FIXME: #warning "Load the available modules here" // Load the known encryption modules (void)g_pModuleManager->loadModulesByCaps("crypt"); -// (void)g_pModuleManager->getModule("koi2win"); -// (void)g_pModuleManager->getModule("mircstrip"); -// (void)g_pModuleManager->getModule("texturizer"); m_pWindow = wnd; diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index fb08c1df1..08446501b 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -251,7 +251,7 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent * e) } else e->ignore(); } -void KviCustomToolBar::dragMoveEvent(QDragMoveEvent * e) +void KviCustomToolBar::dragMoveEvent(QDragMoveEvent *) { if(!m_pDraggedChild) return; @@ -259,7 +259,7 @@ void KviCustomToolBar::dragMoveEvent(QDragMoveEvent * e) drag(m_pDraggedChild,mapFromGlobal(QCursor::pos())); } -void KviCustomToolBar::dragLeaveEvent(QDragLeaveEvent * e) +void KviCustomToolBar::dragLeaveEvent(QDragLeaveEvent *) { if(m_pDraggedChild) { @@ -287,7 +287,6 @@ int KviCustomToolBar::dropIndexAt(const QPoint & pnt, QWidget * pExclude, int * // treating exclude as if it was going to be removed // find also the exclude index if needed QLayout * pLayout = layout(); - QLayoutItem * i = 0; if(piExcludeIdx) *piExcludeIdx = -1; int iIdx = 0; @@ -303,8 +302,7 @@ int KviCustomToolBar::dropIndexAt(const QPoint & pnt, QWidget * pExclude, int * int iExcludeIdx = -1; QPoint pntExclude; QWidget * pWidget = 0; -// QLayoutItem *child; -// while((i = it.current())) + for (int i=0; i < pLayout->count(); i++) { if((pWidget = pLayout->itemAt(i)->widget())) @@ -346,7 +344,6 @@ int KviCustomToolBar::dropIndexAt(const QPoint & pnt, QWidget * pExclude, int * } } iIdx++; - //++it; } if(!pMinDistW) @@ -427,11 +424,11 @@ void KviCustomToolBar::drag(QWidget * pChild, const QPoint & pnt) { int iMe = -1; int iIdx = dropIndexAt(pnt,pChild,&iMe); - debug("DROP INDEX IS %d, ME IS %d",iIdx,iMe); +// debug("DROP INDEX IS %d, ME IS %d",iIdx,iMe); if(iIdx == iMe) return; // would move over itself QWidget * pWidgetToMove = widgetAt(iIdx > iMe ? iIdx-1 : iIdx); - debug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",iIdx > iMe ? iIdx-1 : iIdx,pWidgetToMove,pChild); +// debug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",iIdx > iMe ? iIdx-1 : iIdx,pWidgetToMove,pChild); if(pWidgetToMove == pChild) return; // hmmm @@ -628,7 +625,7 @@ QSize KviCustomToolBarSeparator::sizeHint() const else return QSize(0,iExtent); } -void KviCustomToolBarSeparator::paintEvent(QPaintEvent * e) +void KviCustomToolBarSeparator::paintEvent(QPaintEvent *) { QPainter p(this); QStyleOption opt; diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index b61d1900c..92f90d561 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -115,7 +115,7 @@ QPixmap * KviDebugWindow::myIconPtr() return g_pIconManager->getSmallIcon(KVI_SMALLICON_BUG); } -void KviDebugWindow::resizeEvent(QResizeEvent *e) +void KviDebugWindow::resizeEvent(QResizeEvent *) { int hght = m_pInput->heightHint(); m_pSplitter->setGeometry(0,0,width(),height() - hght); diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 9e61ef691..0a1e6b4ca 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -64,15 +64,18 @@ void KviFileDialog::goHome() } */ -bool KviFileDialog::askForOpenFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool bShowHidden, bool bShowNative, QWidget * pParent) -{ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) +bool KviFileDialog::askForOpenFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool bShowNative, QWidget * pParent) +{ if(bShowNative) { szBuffer = QFileDialog::getOpenFileName(pParent,szCaption,szInitial,szFilter); KviFileUtils::adjustFilePath(szBuffer); return !szBuffer.isEmpty(); } +#else +bool KviFileDialog::askForOpenFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool, bool , QWidget * pParent) +{ #endif KviFileDialog * pDialog = new KviFileDialog(szInitial,szFilter,pParent,"open_file_name_dialog",true); pDialog->setWindowTitle(szCaption); @@ -93,9 +96,9 @@ bool KviFileDialog::askForOpenFileName(QString & szBuffer, const QString & szCap return false; } -bool KviFileDialog::askForSaveFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool bShowHidden, bool bConfirmOverwrite, bool bShowNative, QWidget * pParent) -{ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) +bool KviFileDialog::askForSaveFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool bConfirmOverwrite, bool bShowNative, QWidget * pParent) +{ if(bShowNative) { while(1) @@ -127,6 +130,9 @@ bool KviFileDialog::askForSaveFileName(QString & szBuffer, const QString & szCap } } } +#else +bool KviFileDialog::askForSaveFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool bConfirmOverwrite, bool , QWidget * pParent) +{ #endif KviFileDialog * pDialog = new KviFileDialog(szInitial,szFilter,pParent,"save_file_name_dialog",true); @@ -183,15 +189,17 @@ bool KviFileDialog::askForSaveFileName(QString & szBuffer, const QString & szCap return false; } -bool KviFileDialog::askForDirectoryName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool bShowHidden, bool bShowNative, QWidget * pParent) -{ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) +bool KviFileDialog::askForDirectoryName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool bShowNative, QWidget * pParent) +{ if(bShowNative) { szBuffer = QFileDialog::getExistingDirectory(pParent,szCaption,szInitial); return !szBuffer.isEmpty(); } #else +bool KviFileDialog::askForDirectoryName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool , QWidget * pParent) +{ #ifdef COMPILE_KDE_SUPPORT // the KDE based dir selection dialog is now quite nice szBuffer = KFileDialog::getExistingDirectory(szInitial,pParent,szCaption); @@ -220,14 +228,17 @@ bool KviFileDialog::askForDirectoryName(QString & szBuffer, const QString & szCa return false; } -bool KviFileDialog::askForOpenFileNames(QStringList & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool bShowHidden, bool bShowNative, QWidget * pParent) -{ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) +bool KviFileDialog::askForOpenFileNames(QStringList & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool bShowNative, QWidget * pParent) +{ if(bShowNative) { szBuffer = QFileDialog::getOpenFileNames(pParent,szCaption,szInitial,szFilter); return (szBuffer.count() > 0); } +#else +bool KviFileDialog::askForOpenFileNames(QStringList & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter, bool , bool , QWidget * pParent) +{ #endif KviFileDialog * pDialog = new KviFileDialog(szInitial,szFilter,pParent,"open_file_names_dialog",true); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 444d3b7c1..a7b53b346 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -222,7 +222,7 @@ KviFrame::~KviFrame() g_pFrame = 0; } -int KviFrame::registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot) +int KviFrame::registerAccelerator(const QString &szKeySequence,QObject *,const char *) { QShortcut *sc=new QShortcut(QKeySequence(szKeySequence),this); connect(sc,SIGNAL(activated()),this,SLOT(accelActivated())); @@ -428,8 +428,7 @@ void KviFrame::accelActivated() //KviAccel * acc = (KviAccel *)sender(); int keys = (int)(((QShortcut *)sender())->key()); - KviWindowListItem *item = 0; - debug("accel"); + switch(keys) { //case (Qt::Key_Left+Qt::ALT): switchToPrevWindow(); break; @@ -1151,8 +1150,7 @@ void KviFrame::toolbarsPopupSelected(int id) const QObject * o = sender(); if(!o)return; if(!o->inherits("KviTalPopupMenu"))return; - const KviTalPopupMenu * p = (const KviTalPopupMenu *)o; - //((KviTalPopupMenu *)o) + int idext = ((KviTalPopupMenu *)o)->itemParameter(id); KviCustomToolBarDescriptor * dd = KviCustomToolBarManager::instance()->findDescriptorByInternalId(idext); diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index 4246a8cf0..e4b3455b1 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -246,7 +246,7 @@ void KviHistoryWindow::itemSelected(QListWidgetItem * pItem) m_pOwner->setText(pItem->text()); } -void KviHistoryWindow::hideEvent(QHideEvent * e) +void KviHistoryWindow::hideEvent(QHideEvent *) { if(m_iTimerId != -1) { diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 9b80ee354..e49bd23ca 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -368,7 +368,7 @@ void KviInput::setFocus() else m_pInputEditor->setFocus(); } -void KviInput::focusInEvent(QFocusEvent * e) +void KviInput::focusInEvent(QFocusEvent *) { // if we get a focus in event , redirect the focus to the children if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp index fc021bdcb..7fcd74b09 100644 --- a/src/kvirc/ui/kvi_input_editor.cpp +++ b/src/kvirc/ui/kvi_input_editor.cpp @@ -39,7 +39,6 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_kernel.h" #include "kvi_userlistview.h" -#include "kvi_doublebuffer.h" #include "kvi_texticonwin.h" #include "kvi_texticonmanager.h" #include "kvi_tal_popupmenu.h" @@ -120,7 +119,7 @@ KviInputEditor::~KviInputEditor() if(g_pLastFontMetrics) delete g_pLastFontMetrics; g_pLastFontMetrics = 0; - + if(m_pIconMenu) delete m_pIconMenu; @@ -213,7 +212,7 @@ QSize KviInputEditor::sizeHint() const expandedTo(QApplication::globalStrut()),this)); } -void KviInputEditor::paintEvent(QPaintEvent * e) +void KviInputEditor::paintEvent(QPaintEvent *) { QPainter p(this); SET_ANTI_ALIASING(p); @@ -229,18 +228,12 @@ void KviInputEditor::drawContents(QPainter * p) int iWidgetWidth = rect.width(); int iWidgetHeight = rect.height(); - KviDoubleBuffer doublebuffer(iWidgetWidth,iWidgetHeight); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - - QPainter pa(pDoubleBufferPixmap); - SET_ANTI_ALIASING(pa); + p->setFont(KVI_OPTION_FONT(KviOption_fontInput)); - pa.setFont(KVI_OPTION_FONT(KviOption_fontInput)); - - QFontMetrics fm(pa.fontMetrics()); + QFontMetrics fm(p->fontMetrics()); if(!g_pLastFontMetrics) - g_pLastFontMetrics = new QFontMetrics(pa.fontMetrics()); + g_pLastFontMetrics = new QFontMetrics(p->fontMetrics()); if(g_bInputFontMetricsDirty) recalcFontMetrics(); @@ -249,14 +242,14 @@ void KviInputEditor::drawContents(QPainter * p) if(g_pShadedChildGlobalDesktopBackground) { QPoint pnt = mapToGlobal(rect.topLeft()); - pa.drawTiledPixmap(0,0,iWidgetWidth,iWidgetHeight,*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); + p->drawTiledPixmap(0,0,iWidgetWidth,iWidgetHeight,*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif QPixmap * pPix = KVI_OPTION_PIXMAP(KviOption_pixmapInputBackground).pixmap(); - pa.fillRect(0,0,iWidgetWidth,iWidgetHeight,KVI_OPTION_COLOR(KviOption_colorInputBackground)); + p->fillRect(0,0,iWidgetWidth,iWidgetHeight,KVI_OPTION_COLOR(KviOption_colorInputBackground)); if(pPix) - KviPixmapUtils::drawPixmapWithPainter(&pa,pPix,KVI_OPTION_UINT(KviOption_uintInputPixmapAlign),rect,iWidgetWidth,iWidgetHeight); + KviPixmapUtils::drawPixmapWithPainter(p,pPix,KVI_OPTION_UINT(KviOption_uintInputPixmapAlign),rect,iWidgetWidth,iWidgetHeight); #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif @@ -276,7 +269,7 @@ void KviInputEditor::drawContents(QPainter * p) int iCharIdx = m_iFirstVisibleChar; - pa.setClipRect(0,0,iWidgetWidth,iWidgetHeight); + p->setClipRect(0,0,iWidgetWidth,iWidgetHeight); //Control the selection state if((m_iSelectionEnd < m_iSelectionBegin) || (m_iSelectionEnd == -1) || (m_iSelectionBegin == -1)) @@ -295,9 +288,9 @@ void KviInputEditor::drawContents(QPainter * p) int iXLeft = xPositionFromCharIndex(fm,iSelStart,TRUE); int iXRight = xPositionFromCharIndex(fm,m_iSelectionEnd + 1,TRUE); -// pa.setRasterOp(Qt::NotROP); - pa.fillRect(iXLeft,frameWidth(),iXRight - iXLeft,iWidgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// pa.setRasterOp(Qt::CopyROP); +// p->setRasterOp(Qt::NotROP); + p->fillRect(iXLeft,frameWidth(),iXRight - iXLeft,iWidgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); +// p->setRasterOp(Qt::CopyROP); } // When m_bIMComposing is true, the text between m_iIMStart and m_iIMStart+m_iIMLength should be highlighted to show that this is the active @@ -315,9 +308,9 @@ void KviInputEditor::drawContents(QPainter * p) int iXIMSelectionLeft = xPositionFromCharIndex(fm,iIMSelectionStart,TRUE); int iXIMSelectionRight = xPositionFromCharIndex(fm,iIMSelectionStart + m_iIMSelectionLength,TRUE); -// pa.setRasterOp(Qt::NotROP); - pa.fillRect(iXIMSelectionLeft,0,iXIMSelectionRight - iXIMSelectionLeft, iWidgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// pa.setRasterOp(Qt::CopyROP); +// p->setRasterOp(Qt::NotROP); + p->fillRect(iXIMSelectionLeft,0,iXIMSelectionRight - iXIMSelectionLeft, iWidgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); +// p->setRasterOp(Qt::CopyROP); // highlight the IM selection int iIMStart = m_iIMStart; @@ -327,10 +320,10 @@ void KviInputEditor::drawContents(QPainter * p) // underline the IM preedit // Maybe should be put in drawTextBlock, similar to drawing underlined text - pa.drawLine(xIMLeft, iBottom, xIMRight, iBottom); + p->drawLine(xIMLeft, iBottom, xIMRight, iBottom); } - pa.setClipping(false); + p->setClipping(false); while((iCharIdx < ((int)(m_szTextBuffer.length()))) && (iCurXPos < iMaxXPos)) { @@ -338,15 +331,15 @@ void KviInputEditor::drawContents(QPainter * p) if(m_bControlBlock) { - pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputControl)); + p->setPen(KVI_OPTION_COLOR(KviOption_colorInputControl)); QString s = getSubstituteChar(m_szTextBuffer[iCharIdx].unicode()); // the block width is 4 pixels more than the actual character - pa.drawText(iCurXPos + 2,iTextBaseline,s.left(1)); + p->drawText(iCurXPos + 2,iTextBaseline,s.left(1)); - pa.drawRect(iCurXPos,iTop,m_iBlockWidth-1,iBottom); + p->drawRect(iCurXPos,iTop,m_iBlockWidth-1,iBottom); } else { if(m_iSelectionBegin!=-1) { @@ -364,7 +357,7 @@ void KviInputEditor::drawContents(QPainter * p) if(iSubLen) { - drawTextBlock(&pa,fm,iCurXPos,iTextBaseline,iSubStart,iSubLen,FALSE); + drawTextBlock(p,fm,iCurXPos,iTextBaseline,iSubStart,iSubLen,FALSE); iCurXPos += m_iBlockWidth; m_iBlockWidth=0; } @@ -375,7 +368,7 @@ void KviInputEditor::drawContents(QPainter * p) if(iSubLen) { - drawTextBlock(&pa,fm,iCurXPos,iTextBaseline,iSubStart,iSubLen,TRUE); + drawTextBlock(p,fm,iCurXPos,iTextBaseline,iSubStart,iSubLen,TRUE); iCurXPos += m_iBlockWidth; m_iBlockWidth=0; } @@ -384,13 +377,13 @@ void KviInputEditor::drawContents(QPainter * p) { iSubStart += iSubLen; iSubLen = iBlockEnd-iSubStart; - drawTextBlock(&pa,fm,iCurXPos,iTextBaseline,iSubStart,iSubLen,FALSE); + drawTextBlock(p,fm,iCurXPos,iTextBaseline,iSubStart,iSubLen,FALSE); } } else { - drawTextBlock(&pa,fm,iCurXPos,iTextBaseline,iCharIdx,m_iBlockLen); + drawTextBlock(p,fm,iCurXPos,iTextBaseline,iCharIdx,m_iBlockLen); } } else { - drawTextBlock(&pa,fm,iCurXPos,iTextBaseline,iCharIdx,m_iBlockLen); + drawTextBlock(p,fm,iCurXPos,iTextBaseline,iCharIdx,m_iBlockLen); } } @@ -413,14 +406,11 @@ void KviInputEditor::drawContents(QPainter * p) if(m_bCursorOn) { - pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputCursor)); - pa.drawLine(m_iLastCursorXPosition,0,m_iLastCursorXPosition,iWidgetHeight); + p->setPen(KVI_OPTION_COLOR(KviOption_colorInputCursor)); + p->drawLine(m_iLastCursorXPosition,0,m_iLastCursorXPosition,iWidgetHeight); } else { - pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputForeground)); + p->setPen(KVI_OPTION_COLOR(KviOption_colorInputForeground)); } - - // The other version of drawPixmap seems to be buggy - p->drawPixmap(rect.x(),rect.y(),rect.width(),rect.height(),*pDoubleBufferPixmap,0,0,iWidgetWidth,iWidgetHeight); } void KviInputEditor::drawTextBlock(QPainter * pa, QFontMetrics & fm, int iCurXPos, int iTextBaseline, int iCharIdx, int iLen, bool bSelected) @@ -741,7 +731,8 @@ void KviInputEditor::mousePressEvent(QMouseEvent * e) KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); KviPointerHashTableIterator<QString,KviTextIcon> it(*d); QStringList szList; - while(KviTextIcon * i = it.current()) + + while(it.current()) { szList.append(it.currentKey()); ++it; @@ -986,7 +977,7 @@ void KviInputEditor::setText(const QString szText) end(); } -void KviInputEditor::mouseReleaseEvent(QMouseEvent * e) +void KviInputEditor::mouseReleaseEvent(QMouseEvent *) { if(m_iDragTimer) { @@ -1061,7 +1052,7 @@ void KviInputEditor::handleDragSelection() repaintWithCursorOn(); } -void KviInputEditor::returnPressed(bool bRepaint) +void KviInputEditor::returnPressed(bool) { if (!m_szTextBuffer.isEmpty() /* && (!m_pHistory->current() || m_szTextBuffer.compare(*(m_pHistory->current())))*/) { @@ -1096,7 +1087,7 @@ void KviInputEditor::returnPressed(bool bRepaint) */ } -void KviInputEditor::focusInEvent(QFocusEvent * e) +void KviInputEditor::focusInEvent(QFocusEvent *) { if(m_iCursorTimer==0) { @@ -1106,7 +1097,7 @@ void KviInputEditor::focusInEvent(QFocusEvent * e) } } -void KviInputEditor::focusOutEvent(QFocusEvent * e) +void KviInputEditor::focusOutEvent(QFocusEvent *) { if(m_iCursorTimer) killTimer(m_iCursorTimer); m_iCursorTimer = 0; @@ -1672,7 +1663,7 @@ void KviInputEditor::completion(bool bShift) int iOffset; if(KviQString::equalCI(m_szTextBuffer.left(5),"/help") || KviQString::equalCI(m_szTextBuffer.left(5),"/help.open")) iOffset=1; else iOffset=0; - + KviPointerList<QString> tmp; tmp.setAutoDelete(true); @@ -1759,7 +1750,7 @@ void KviInputEditor::completion(bool bShift) if(tmp.count() == 1) { szMatch = *(tmp.first()); - if (szMatch.left(1)=='$')szMatch.remove(0,1); + if (szMatch.left(1)=='$')szMatch.remove(0,1); if(bIsCommand && szMatch.right(1)!='.')szMatch.append(' '); else if(bIsFunction && szMatch.right(1)!='.')szMatch.append('('); else if(bIsNick) @@ -1775,7 +1766,7 @@ void KviInputEditor::completion(bool bShift) QString * szTmp = tmp.first(); szMatch = *szTmp; int iWLen = szWord.length(); - if (szMatch.left(1)=='$')szMatch.remove(0,1); + if (szMatch.left(1)=='$')szMatch.remove(0,1); for(; szTmp; szTmp = tmp.next()) { if(szTmp->length() < szMatch.length()) @@ -1998,7 +1989,7 @@ int KviInputEditor::charIndexFromXPosition(int iXPos) int iWidthCh; if (c.unicode() < 32) iWidthCh=fm.width(getSubstituteChar(c.unicode())) + 3 ; - else + else iWidthCh=fm.width(c); if(iXPos < (iCurXPos+(iWidthCh/2))) return iCurChar; diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index e0a673c85..803f7174e 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -255,7 +255,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) { case Qt::Key_Right: s = ((QLineEdit *)o)->text(); - if(((unsigned int)cursorPos) == s.length()) + if(cursorPos == s.length()) { if(edIdx < edMax) { @@ -396,7 +396,7 @@ void KviIpEditor::resizeEvent(QResizeEvent *e) if(e)QFrame::resizeEvent(e); } -QSize KviIpEditor::sizeHint() +QSize KviIpEditor::sizeHint() const { if(m_pEdit[0]) { diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index b48fa1f08..f125f22c5 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -55,7 +55,7 @@ public: protected: virtual bool eventFilter(QObject * o,QEvent *e); virtual void resizeEvent(QResizeEvent *e); - virtual QSize sizeHint(); + virtual QSize sizeHint() const; private: void recreateChildren(); }; diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index e2ee41061..bed58f0d6 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -142,7 +142,7 @@ void KviToolBarGraphicalApplet::mousePressEvent(QMouseEvent * e) } } -void KviToolBarGraphicalApplet::mouseReleaseEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mouseReleaseEvent(QMouseEvent *) { m_bResizeMode = false; } @@ -220,7 +220,7 @@ void KviToolBarGraphicalApplet::drawContents(QPainter *) // nothing here } -void KviToolBarGraphicalApplet::resizeEvent(QResizeEvent *e) +void KviToolBarGraphicalApplet::resizeEvent(QResizeEvent *) { unsigned int uBufferW = g_pIccMemBuffer->width(); unsigned int uBufferH = g_pIccMemBuffer->height(); diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 4149a4992..4a5dca2e1 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -2356,7 +2356,7 @@ void KviIrcView::findClosestPositionInText(int xCursorPos,int yCursorPos,KviIrcV */ -KviIrcViewLine * KviIrcView::getVisibleLineAt(int xPos,int yPos) +KviIrcViewLine * KviIrcView::getVisibleLineAt(int,int yPos) { KviIrcViewLine * l = m_pCurLine; int iTop = height() + m_iFontDescent - KVI_IRCVIEW_VERTICAL_BORDER; diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index a53f95746..9fd7cf1b1 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -218,11 +218,13 @@ void KviIrcViewToolWidget::filterEnableNone() } -void KviIrcViewToolWidget::hideEvent ( QHideEvent * ){ +void KviIrcViewToolWidget::hideEvent ( QHideEvent * ) +{ m_pIrcView->toggleToolWidget(); } -void KviIrcViewToolWidget::closeEvent ( QCloseEvent * e ){ +void KviIrcViewToolWidget::closeEvent ( QCloseEvent * ) +{ m_pIrcView->toggleToolWidget(); } diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 0d4ccf23a..59f2fc1df 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -50,7 +50,7 @@ KviMaskItem::~KviMaskItem() { } -int KviMaskItem::compare ( KviTalTreeWidgetItem * i, int col, bool ascending ) const +int KviMaskItem::compare ( KviTalTreeWidgetItem * i, int col, bool) const { if(col==2) { @@ -121,7 +121,7 @@ void KviMaskInputDialog::accept() QDialog::accept(); } -KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char flag,const char * nam) +KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char flag,const char *) : KviWindowToolWidget(par,button) { bool isEnabled=1; diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index 5662981cf..2bb66a2c3 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -63,7 +63,7 @@ KviMdiCaptionButton::~KviMdiCaptionButton() { } -void KviMdiCaptionButton::paintEvent(QPaintEvent *e) +void KviMdiCaptionButton::paintEvent(QPaintEvent *) { QPainter painter(this); drawButton(&painter); @@ -147,7 +147,7 @@ void KviMdiCaption::fontChange(const QFont &old) ((KviMdiChild *)parent())->resizeEvent(0); } -void KviMdiCaption::mousePressEvent(QMouseEvent *e) +void KviMdiCaption::mousePressEvent(QMouseEvent *) { m_bMouseGrabbed = true; m_lastMousePos = QCursor::pos(); @@ -193,7 +193,7 @@ void KviMdiCaption::mouseMoveEvent(QMouseEvent *) } } -void KviMdiCaption::mouseDoubleClickEvent(QMouseEvent *e) +void KviMdiCaption::mouseDoubleClickEvent(QMouseEvent *) { ((KviMdiChild *)parent())->maximize(); } @@ -230,7 +230,7 @@ void KviMdiCaption::setFocusProxy(QWidget * w) m_pCloseButton->setFocusProxy(w); } -void KviMdiCaption::resizeEvent(QResizeEvent * e) +void KviMdiCaption::resizeEvent(QResizeEvent *) { int s = height() - 2; m_pSystemButton->setGeometry(1,1,s,s); @@ -247,7 +247,7 @@ void KviMdiCaption::resizeEvent(QResizeEvent * e) KviMenuBarToolButton::KviMenuBarToolButton(QWidget * par,const QPixmap &img, const char * name) : QToolButton(par) { - setProperty("name","name"); + setProperty("name",name); setIcon(img); setAutoRaise(true); } diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 2f32d8570..d30125b2d 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -53,7 +53,7 @@ #include <math.h> -KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name) +KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char *) : KviTalScrollView(parent) { setFrameShape(NoFrame); @@ -527,7 +527,7 @@ bool KviMdiManager::isInSDIMode() } -void KviMdiManager::enterSDIMode(KviMdiChild *lpC) +void KviMdiManager::enterSDIMode(KviMdiChild *) { if(!m_pSdiCloseButton) { diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 8f4b8cd56..d51517bb3 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -93,7 +93,7 @@ KviMenuBar::~KviMenuBar() if(m_pDefaultItemId)kvi_free(m_pDefaultItemId); } -void KviMenuBar::showEvent(QShowEvent *e) +void KviMenuBar::showEvent(QShowEvent *) { // force a re-layout of the menubar in Qt4 (see the note in enterSDIMode()) // by resetting the corner widget diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 6559314bf..0ab8edead 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -47,7 +47,7 @@ // FIXME: This widget should use a KviTalScrollView! -KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const QString &mode,const QString &key,const QString &limit) +KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char *,KviConsole * c,const QString &mode,const QString &key,const QString &limit) : KviWindowToolWidget(par,button) { m_szMode = mode; diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 9f8a640d5..81b078713 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -39,7 +39,7 @@ QString KviOptionsWidget::m_szBasicTipStart; // empty decl QString KviOptionsWidget::m_szBasicTipEnd; -KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunken) +KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool) : QFrame(parent), KviSelectorInterface() { setObjectName(name); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 9aa9a341c..dd11c6663 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -558,7 +558,7 @@ QPixmap * KviQuery::myIconPtr() return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY); } -void KviQuery::resizeEvent(QResizeEvent * e) +void KviQuery::resizeEvent(QResizeEvent *) { int iHeight = m_pInput->heightHint(); int iHeight2 = m_pButtonBox->sizeHint().height(); @@ -860,16 +860,16 @@ void KviQuery::pasteLastLog() unsigned int uCount = list.size(); unsigned int uLines = KVI_OPTION_UINT(KviOption_uintLinesToPasteOnQueryJoin); unsigned int uStart = uCount - uLines - 1; - +/* // Check if the log is smaller than the lines to print if(uStart < 0) uStart = 0; - +*/ QString szDummy = __tr2qs("Starting last log"); output(KVI_OUT_QUERYPRIVMSG,szDummy); // Scan the log file - for(int i = uStart; i < uCount; i++) + for(unsigned int i = uStart; i < uCount; i++) { QString szLine = QString(list.at(i)); szLine = szLine.section(' ',1); diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp index 3c01001c5..3d3b2a7e6 100644 --- a/src/kvirc/ui/kvi_scripteditor.cpp +++ b/src/kvirc/ui/kvi_scripteditor.cpp @@ -44,7 +44,7 @@ void KviScriptEditor::setText(const char * txt) setText(KviQCString(txt)); } -void KviScriptEditor::setText(const KviQCString &txt) +void KviScriptEditor::setText(const KviQCString &) { } @@ -53,18 +53,18 @@ void KviScriptEditor::setText(const QString &txt) setText(KviQCString(txt.toUtf8())); } -void KviScriptEditor::setFindText(const QString &text) +void KviScriptEditor::setFindText(const QString &) { } -void KviScriptEditor::setInfoText(const QString &text) +void KviScriptEditor::setInfoText(const QString &) { } -void KviScriptEditor::setFindLineeditReadOnly(bool b) +void KviScriptEditor::setFindLineeditReadOnly(bool) { } -void KviScriptEditor::getText(KviQCString &txt) +void KviScriptEditor::getText(KviQCString &) { } diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 9fe382b2d..6bca94cba 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -237,7 +237,7 @@ KviPixmapSelector::~KviPixmapSelector() } -void KviPixmapSelector::checkBoxToggled(bool bEnabled) +void KviPixmapSelector::checkBoxToggled(bool) { setEnabled(isEnabled()); } @@ -774,7 +774,7 @@ void KviChannelListSelector::setEnabled(bool bEnabled) m_pRemoveButton->setEnabled(bEnabled); } -void KviChannelListSelector::textChanged(const QString &str) +void KviChannelListSelector::textChanged(const QString &) { m_pAddButton->setEnabled(!m_pChanLineEdit->text().isEmpty()); } diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index 872119a8f..821d6af0a 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -125,7 +125,7 @@ KviSplashScreen::~KviSplashScreen() delete m_pOverlay; } -void KviSplashScreen::showEvent(QShowEvent * e) +void KviSplashScreen::showEvent(QShowEvent *) { QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); move((rect.width() - width())/2,(rect.height() - height())/2); @@ -133,7 +133,7 @@ void KviSplashScreen::showEvent(QShowEvent * e) m_creationTime = QTime::currentTime(); } -void KviSplashScreen::hideEvent(QHideEvent * e) +void KviSplashScreen::hideEvent(QHideEvent *) { suicide(); } diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index c1ba8c24e..e0274a212 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -545,7 +545,7 @@ void KviStatusBar::mouseReleaseEvent(QMouseEvent * e) } } -void KviStatusBar::mouseDoubleClickEvent(QMouseEvent * e) +void KviStatusBar::mouseDoubleClickEvent(QMouseEvent *) { const QString szTitle = __tr2qs("Network informations"); QString szText, szUserModes, szAway; diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 902022fc6..2e353fd82 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -559,7 +559,7 @@ KviStatusBarConnectionTimer::~KviStatusBarConnectionTimer() { } //g_pApp->topmostConnectedConsole() -void KviStatusBarConnectionTimer::timerEvent(QTimerEvent * e) +void KviStatusBarConnectionTimer::timerEvent(QTimerEvent *) { if(m_bTotal) { @@ -786,7 +786,7 @@ void KviStatusBarUpdateIndicator::binaryDataReceived(const KviDataBuffer &buffer } } -void KviStatusBarUpdateIndicator::requestCompleted(bool status) +void KviStatusBarUpdateIndicator::requestCompleted(bool) { //qDebug("Data transfer terminated"); delete m_pHttpRequest; @@ -816,7 +816,7 @@ void KviStatusBarUpdateIndicator::getNewVersion() //qDebug("Command: %s",command.toUtf8().data()); // Open the download page for the platform we're using - int test = KviKvsScript::run(command,g_pActiveWindow); + KviKvsScript::run(command,g_pActiveWindow); //qDebug("KviKvsScript returned: %d",test); } diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h index ecf873c20..949efb957 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.h +++ b/src/kvirc/ui/kvi_statusbarapplet.h @@ -104,9 +104,9 @@ public: protected: virtual void paintEvent(QPaintEvent *e); - virtual void fillContextPopup(KviTalPopupMenu *p){}; - virtual void loadState(const char * prefix,KviConfig *cfg){}; - virtual void saveState(const char * prefix,KviConfig *cfg){}; + virtual void fillContextPopup(KviTalPopupMenu *){}; + virtual void loadState(const char *,KviConfig *){}; + virtual void saveState(const char *,KviConfig *){}; virtual QString tipText(const QPoint &); }; diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 5cdf11108..2e030906c 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -99,7 +99,7 @@ void KviWindowToolWidget::unregisterSelf() m_bHidden=0; }*/ -KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn, const char * name ) +KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int, const QString & text, QWidget * parent,bool bOn, const char *) :QToolButton(parent) { // setFlat(true); diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 2b087fc08..fcb3b9f88 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -54,11 +54,8 @@ extern KviTextIconWindowWidget * g_pTextIconWindow; extern KviColorWindow * g_pColorWindow; -static int g_iInputFontCharWidth[256]; -// FIXME: #warning "The combo should disappear when it looses focus!...(how to do it ?)" - #ifdef COMPILE_PSEUDO_TRANSPARENCY extern QPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -75,7 +72,7 @@ KviTopicListBoxItemDelegate::~KviTopicListBoxItemDelegate() { } -QSize KviTopicListBoxItemDelegate::sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const +QSize KviTopicListBoxItemDelegate::sizeHint(const QStyleOptionViewItem &,const QModelIndex &index) const { KviTalListWidget* listWidget = (KviTalListWidget*)parent(); KviTopicListBoxItem* item = (KviTopicListBoxItem*) listWidget->item(index.row()); @@ -176,7 +173,7 @@ QString convertToHtml(const QString &text) unsigned int idx = 0; - while(idx < text.length()) + while(idx < (unsigned int)text.length()) { unsigned short c = text[(int)idx].unicode(); @@ -192,7 +189,7 @@ QString convertToHtml(const QString &text) ) { idx++; - if(idx >= text.length())break; + if(idx >= (unsigned int)text.length())break; else c = text[(int)idx].unicode(); } @@ -276,7 +273,7 @@ QString convertToHtml(const QString &text) ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; + while((idx < (unsigned int)text.length()) && (text[(int)idx].unicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -320,13 +317,13 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette& unsigned int idx = 0; - while((idx < text.length()) && (curX < rect.width())) + while((idx < (unsigned int)text.length()) && (curX < rect.width())) { unsigned short c = text[(int)idx].unicode(); unsigned int start = idx; - while((idx < text.length()) && + while((idx < (unsigned int)text.length()) && (c != KVI_TEXT_COLOR) && (c != KVI_TEXT_BOLD) && (c != KVI_TEXT_UNDERLINE) && @@ -423,7 +420,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette& ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; + while((idx < (unsigned int)text.length()) && (text[(int)idx].unicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -442,7 +439,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette& } } -void KviTopicWidget::paintEvent(QPaintEvent * e) +void KviTopicWidget::paintEvent(QPaintEvent *) { QPainter pa(this); drawFrame(&pa); @@ -716,7 +713,7 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e) return QFrame::eventFilter(object,e); } -bool KviTopicWidget::handleKeyPressEvent(QKeyEvent * e) +bool KviTopicWidget::handleKeyPressEvent(QKeyEvent *) { return 1; } @@ -790,8 +787,10 @@ void KviTopicWidget::historyClicked() { m_pCompletionBox->installEventFilter( this ); m_pCompletionBox->clear(); - for ( QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) { - KviTopicListBoxItem* item=new KviTopicListBoxItem(m_pCompletionBox,*it); + KviTopicListBoxItem* item; + for ( QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) + { + item = new KviTopicListBoxItem(m_pCompletionBox,*it); } m_pCompletionBox->resize(m_pInput->width(),6*m_pCompletionBox->fontMetrics().height()+20); QPoint point=m_pInput->mapToGlobal(QPoint(0,0)); @@ -822,7 +821,7 @@ void KviTopicWidget::insertText(const QString &c) m_pInput->insertText(c); } -int KviTopicWidget::xCursorPostionCalculation(int xInd) +int KviTopicWidget::xCursorPostionCalculation(int) { return 0; } diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index d3ef0e89d..69a6751f6 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -43,7 +43,6 @@ #include "kvi_mdimanager.h" #include "kvi_kvs_eventtriggers.h" #include "kvi_toolwindows_container.h" -#include "kvi_doublebuffer.h" #include "kvi_stringconversion.h" #include "kvi_ircconnection.h" #include "kvi_ircconnectionserverinfo.h" @@ -133,8 +132,8 @@ void KviUserListEntry::updateAvatarData() if(KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (pAv->size().width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (pAv->size().height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + ((unsigned int)pAv->size().width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + ((unsigned int)pAv->size().height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) { @@ -230,8 +229,8 @@ void KviUserListEntry::recalcSize() if(KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (pAv->size().width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (pAv->size().height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + ((unsigned int)pAv->size().width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + ((unsigned int)pAv->size().height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) { @@ -1376,7 +1375,7 @@ void KviUserListView::partAll() triggerUpdate(); } -void KviUserListView::resizeEvent(QResizeEvent * e) +void KviUserListView::resizeEvent(QResizeEvent *) { int iHeight; if(KVI_OPTION_BOOL(KviOption_boolShowUserListStatisticLabel))//G&N 2005 @@ -1662,10 +1661,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) //debug("PAINT EVENT %d,%d,%d,%d",r.left(),r.top(),r.width(),r.height()); - KviDoubleBuffer db(width(),height()); - QPixmap * pMemBuffer = db.pixmap(); - - QPainter p(pMemBuffer); + QPainter p(this); SET_ANTI_ALIASING(p); p.setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); @@ -1820,19 +1816,19 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (pAv->size().width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (pAv->size().height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + ((unsigned int)pAv->size().width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + ((unsigned int)pAv->size().height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) { pPix = pAv->forSize( KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight) )->pixmap(); - + } else { pPix = pAv->pixmap(); } - + p.drawPixmap(iAvatarAndTextX,iTheY,*pPix); iTheY += pPix->height() + 1; } @@ -1970,21 +1966,9 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) pEntry = pEntry->m_pNext; } - //we really do not need any self-draw borders. - //if we will need it, we will draw a better one with system style - - //p.setPen(colorGroup().dark()); - //p.drawLine(0,0,wdth,0); - //p.drawLine(0,0,0,height()); - //p.setPen(colorGroup().light()); - //p.drawLine(1,height()-1,wdth,height()-1); - //p.drawLine(wdth - 1,1,wdth - 1,height()); - - QPainter qt4SuxBecauseOfThisAdditionalPainter(this); - qt4SuxBecauseOfThisAdditionalPainter.drawPixmap(r.left(),r.top(),r.width(),r.height(),*pMemBuffer,r.left(),r.top(),r.width(),r.height()); } -void KviUserListViewArea::resizeEvent(QResizeEvent * e) +void KviUserListViewArea::resizeEvent(QResizeEvent *) { int iScr = m_pScrollBar->sizeHint().width(); m_pScrollBar->setGeometry(width() - iScr,0,iScr,height()); @@ -2131,7 +2115,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e) } } -void KviUserListViewArea::mouseDoubleClickEvent(QMouseEvent * e) +void KviUserListViewArea::mouseDoubleClickEvent(QMouseEvent *) { m_pListView->emitDoubleClick(); } @@ -2247,7 +2231,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent * e) } } -void KviUserListViewArea::mouseReleaseEvent(QMouseEvent * e) +void KviUserListViewArea::mouseReleaseEvent(QMouseEvent *) { m_pLastEntryUnderMouse = 0; } diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index d04a2a266..bb987d9b7 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -326,7 +326,7 @@ bool KviWindow::highlightMeter(unsigned int *v) bool KviWindow::highlightMe(unsigned int v) { - if(v<0) v=0; +// if(v<0) v=0; if(v>5) v=5; if(m_pWindowListItem) m_pWindowListItem->highlight(v); @@ -390,7 +390,7 @@ void KviWindow::destroyWindowListItem() // m_pWindowListItem = 0; // actually the WindowListItem destructor sets it } -QPushButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn) +QPushButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int,const QString & tooltip,bool bOn) { QPushButton * b = new QPushButton(par); b->setObjectName(nam); @@ -403,7 +403,7 @@ QPushButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pix } // This is always defined... -void KviWindow::createCryptControllerButton(QWidget * par) +void KviWindow::createCryptControllerButton(QWidget *) { #ifdef COMPILE_CRYPT_SUPPORT m_pCryptControllerButton = new KviWindowToolPageButton(KVI_SMALLICON_UNLOCKEDOFF,KVI_SMALLICON_UNLOCKED,__tr2qs("Crypting"),buttonContainer(),false,"crypt_controller_button"); @@ -1092,12 +1092,12 @@ void KviWindow::childEvent(QChildEvent *e) QWidget::childEvent(e); } -void KviWindow::wheelEvent(QWheelEvent *e) +void KviWindow::wheelEvent(QWheelEvent *) { /* NOTHING HERE FOR NOW (FIXME) */ } -void KviWindow::childrenTreeChanged(QWidget * widgetAdded) +void KviWindow::childrenTreeChanged(QWidget *) { // if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded); // FIXME: This might be useless diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index d4414b768..ace129bce 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -264,8 +264,8 @@ public: virtual void updateCaption(); virtual void applyOptions(); virtual void updateIcon(); - virtual void ownMessage(const QString &text){}; - virtual void ownAction(const QString &text){}; + virtual void ownMessage(const QString &){}; + virtual void ownAction(const QString &){}; virtual const QString & plainTextCaption(){ return m_szPlainTextCaption; }; virtual const QString & htmlActiveCaption(){ return m_szHtmlActiveCaption; }; virtual const QString & htmlInactiveCaption(){ return m_szHtmlInactiveCaption; }; diff --git a/src/kvirc/ui/kvi_windowlist.cpp b/src/kvirc/ui/kvi_windowlist.cpp index b27a65d19..7cd64b851 100644 --- a/src/kvirc/ui/kvi_windowlist.cpp +++ b/src/kvirc/ui/kvi_windowlist.cpp @@ -192,7 +192,7 @@ KviWindowListButton::~KviWindowListButton() delete m_pTip; //not necessary ? } -void KviWindowListButton::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviWindowListButton::tipRequest(KviDynamicToolTip *,const QPoint &) { if(KVI_OPTION_BOOL(KviOption_boolShowWindowListToolTips)) { @@ -240,7 +240,7 @@ void KviWindowListButton::setActive(bool bActive) update(); } -void KviWindowListButton::paintEvent(QPaintEvent * e) +void KviWindowListButton::paintEvent(QPaintEvent *) { QPainter p(this); QStyleOption opt; @@ -438,7 +438,7 @@ KviClassicWindowList::~KviClassicWindowList() m_pButtonList = 0; } -void KviClassicWindowList::orientationChangedSlot(Qt::Orientation o) +void KviClassicWindowList::orientationChangedSlot(Qt::Orientation) { doLayout(); } @@ -591,7 +591,7 @@ void KviClassicWindowList::doLayout() } if ((width() > height()) && - (((unsigned int)rows) > m_pBase->height() / m_iButtonHeight )) + (rows > m_pBase->height() / m_iButtonHeight )) { rows = m_pBase->height() / m_iButtonHeight; } @@ -620,7 +620,7 @@ void KviClassicWindowList::doLayout() if((btnInRow == btnsInRow) || (totCount == 1))theWidth = baseWidth - theX; } - if( KVI_OPTION_BOOL(KviOption_boolClassicWindowListSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicWindowListMaximumButtonWidth)) && (width() > height()) + if( KVI_OPTION_BOOL(KviOption_boolClassicWindowListSetMaximumButtonWidth) && ((unsigned int)theWidth > KVI_OPTION_UINT(KviOption_uintClassicWindowListMaximumButtonWidth)) && (width() > height()) ) theWidth = KVI_OPTION_UINT(KviOption_uintClassicWindowListMaximumButtonWidth); diff --git a/src/kvirc/ui/kvi_windowlist.h b/src/kvirc/ui/kvi_windowlist.h index b2d5eb9ab..8b111bf8e 100644 --- a/src/kvirc/ui/kvi_windowlist.h +++ b/src/kvirc/ui/kvi_windowlist.h @@ -57,8 +57,8 @@ protected: public: KviWindow * kviWindow(){ return m_pWindow; }; virtual void captionChanged(){}; - virtual void highlight(int iLevel = 1){}; - virtual void setProgress(int progress){}; + virtual void highlight(int){}; + virtual void setProgress(int){}; virtual bool active(){ return false; }; virtual void unhighlight(){}; int progress(){ return m_iProgress; }; @@ -90,7 +90,7 @@ public: virtual KviWindowListItem * nextItem(){ return 0; }; virtual KviWindowListItem * prevItem(void) { return 0; } virtual KviWindowListItem * item(int number); - virtual bool setIterationPointer(KviWindowListItem * it){ return false; }; + virtual bool setIterationPointer(KviWindowListItem *){ return false; }; virtual void switchWindow(bool bNext,bool bInContextOnly); virtual void updatePseudoTransparency(){}; virtual void applyOptions(){}; diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp index d3b43e618..3b0f269b9 100644 --- a/src/kvirc/ui/kvi_windowlist_tree.cpp +++ b/src/kvirc/ui/kvi_windowlist_tree.cpp @@ -172,7 +172,7 @@ QString KviTreeWindowListItem::key() const QString ret; if(m_pWindow->type()==KVI_WINDOW_TYPE_CONSOLE) { - ret.sprintf("%d%d",m_pWindow->type(),m_pWindow->numericId()); + ret.sprintf("%d%lu",m_pWindow->type(),m_pWindow->numericId()); } else { ret.sprintf("%d%s",m_pWindow->type(),m_pWindow->windowName().toLower().toUtf8().data()); } @@ -385,7 +385,7 @@ KviTreeWindowList::KviTreeWindowList() iMin = KVI_OPTION_UINT(KviOption_uintTreeWindowListMinimumWidth); setMinimumWidth(iMin); - if(KVI_OPTION_UINT(KviOption_uintTreeWindowListMaximumWidth) < iMin) + if(KVI_OPTION_UINT(KviOption_uintTreeWindowListMaximumWidth) < (unsigned int)iMin) KVI_OPTION_UINT(KviOption_uintTreeWindowListMaximumWidth) = iMin; int iMax = 600; if(((unsigned int)iMax) > KVI_OPTION_UINT(KviOption_uintTreeWindowListMaximumWidth)) @@ -707,7 +707,7 @@ void KviTreeWindowListItemDelegate::paint(QPainter * p, const QStyleOptionViewIt p->drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,szText); } -QSize KviTreeWindowListItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const +QSize KviTreeWindowListItemDelegate::sizeHint( const QStyleOptionViewItem &, const QModelIndex &) const { KviTreeWindowListTreeWidget* treeWidget = (KviTreeWindowListTreeWidget*)parent(); |