diff options
Diffstat (limited to 'src')
228 files changed, 1254 insertions, 1254 deletions
diff --git a/src/kvilib/config/kvi_debug.h b/src/kvilib/config/kvi_debug.h index 9422df0cd..650c138c1 100644 --- a/src/kvilib/config/kvi_debug.h +++ b/src/kvilib/config/kvi_debug.h @@ -41,7 +41,7 @@ #define kvi_debug(fmt,arg...) qDebug(fmt,##arg) #define kvi_warning(fmt,arg...) qWarning(fmt,##arg) - #define kvi_fatal(fmt,arg...) do { qFatal(fmt,##arg); abort(); } while(0) + #define kvi_fatal(fmt,arg...) do { qFatal(fmt,##arg); abort(); } while(0) #define KVI_PRETTY_FUNCTION __PRETTY_FUNCTION__ #else //!__GNUC__ @@ -50,7 +50,7 @@ #define kvi_debug(fmt,...) qDebug(fmt,__VA_ARGS__) #define kvi_warning(fmt,...) qWarning(fmt,__VA_ARGS__) - #define kvi_fatal(fmt,...) do { qFatal(fmt,__VA_ARGS__); abort(); } while(0) + #define kvi_fatal(fmt,...) do { qFatal(fmt,__VA_ARGS__); abort(); } while(0) #define KVI_PRETTY_FUNCTION __FUNCTION__ #endif //!__GNUC__ @@ -89,7 +89,7 @@ // But this doesn't work since the specification of the token pasting operator is // // "If a formal parameter in a macro definition is preceded or followed by the token-pasting operator, - // the formal parameter is immediately replaced by the __unexpanded__ actual argument. Macro expansion + // the formal parameter is immediately replaced by the __unexpanded__ actual argument. Macro expansion // is __not performed__ on the argument prior to replacement." // // So to actually have __LINE__ expanded we need another level of indirection @@ -107,7 +107,7 @@ #define KVI_TRACE_BLOCK(_szBlockDescription) \ KviDebugContext KVI_TRACE_HACK_TOKENPASTE_1(ctx,__LINE__)("%s - %s",__PRETTY_FUNCTION__,_szBlockDescription) - + #define KVI_TRACE(_szFmt,arg...) KviDebugContext::trace(_szFmt,##arg) #else @@ -136,8 +136,8 @@ #define KVI_TRACE(_szFmt,arg...) do { } while(0) #else #define KVI_TRACE(_szFmt,...) do { } while(0) - #endif - + #endif + #endif //!COMPILE_DEBUG_MODE diff --git a/src/kvilib/config/kvi_fileextensions.h b/src/kvilib/config/kvi_fileextensions.h index 3443f6bd9..a2b4dccb8 100644 --- a/src/kvilib/config/kvi_fileextensions.h +++ b/src/kvilib/config/kvi_fileextensions.h @@ -64,7 +64,7 @@ #define KVI_FILTER_INI "*.ini|INI File (*.ini)" #define KVI_FILTER_IMAGE "*.png *.jpg *.jpeg *.bmp *.gif *.xpm|Image File (*.png *.jpg *.jpeg *.bmp *.gif *.xpm)" //#define KVI_FILTER_UI "*.ui|User Interface File (*.ui)" -#else +#else #define KVI_FILTER_CONFIG "KVIrc Config (*.kvc)" #define KVI_FILTER_SCRIPT "KVIrc Script (*.kvs)" #define KVI_FILTER_THEME "KVIrc Theme (*.kvt)" diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index 324e5b216..83a010944 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -71,7 +71,7 @@ #define KVIRC_API __declspec(dllimport) __attribute__((visibility("default"))) #define KVIRC_API_TYPEDEF __declspec(dllimport) #endif - + // note: unofficial cmake ports defines OS2 #elif defined(OS2) @@ -124,7 +124,7 @@ // we failback on unix/linux variants #define KVILIB_API __attribute__((visibility("default"))) #define KVILIB_API_TYPEDEF - + #define KVIRC_API __attribute__((visibility("default"))) #define KVIRC_API_TYPEDEF diff --git a/src/kvilib/core/KviCString.h b/src/kvilib/core/KviCString.h index 9ec060938..5c6570c25 100644 --- a/src/kvilib/core/KviCString.h +++ b/src/kvilib/core/KviCString.h @@ -223,7 +223,7 @@ public: // Safe sprintf. This one will never write past the end of the string // It can handle only %s %d %u and %c format flags. KviCString & sprintf(const char *fmt,...); - + KviCString & vsprintf(const char *fmt,kvi_va_list list); // append functions diff --git a/src/kvilib/core/KviHeapObject.h b/src/kvilib/core/KviHeapObject.h index 0d8b28547..fca302a55 100644 --- a/src/kvilib/core/KviHeapObject.h +++ b/src/kvilib/core/KviHeapObject.h @@ -73,7 +73,7 @@ { public: /** - * \brief Overloading of the new operator + * \brief Overloading of the new operator * * \param size_t size in bytes of the memory that has to be allocated * \return void * diff --git a/src/kvilib/core/KviMemory.cpp b/src/kvilib/core/KviMemory.cpp index bfdc840c5..a7de65f44 100644 --- a/src/kvilib/core/KviMemory.cpp +++ b/src/kvilib/core/KviMemory.cpp @@ -420,7 +420,7 @@ namespace KviMemory // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // //============================================================================= - + //============================================================================= // // Inline assembly implementations of the commonly used string functions @@ -428,7 +428,7 @@ namespace KviMemory // only by gcc // //============================================================================= - + inline bool kvi_strEqualCS(const char * pcStr1, const char * pcStr2) { // An instruction pattern is really useful in this case. @@ -454,7 +454,7 @@ namespace KviMemory ); return bEax; } - + inline bool kvi_strEqualCSN(const char * pcStr1, const char * pcStr2, int iLen) { register bool bEax; @@ -480,7 +480,7 @@ namespace KviMemory ); return bEax; } - + // OPTIMIZATION // The following two functions are used to compare a variable string with one in that // only A-Z<->a-z case insensivity is significant. @@ -489,7 +489,7 @@ namespace KviMemory // will always give the correct result // These will NOT work with localizable characters: // 'a' with umlaut will be not equal to 'A' with umlaut - + inline bool kvi_strEqualNoLocaleCI(const char * pcStr1, const char * pcStr2) { // Trivial implementation @@ -529,10 +529,10 @@ namespace KviMemory ); return bEax; } - + inline bool kvi_strEqualNoLocaleCIN(const char * pcStr1, const char * pcStr2, int iLen) { - + register int iReg; register bool bEax; __asm__ __volatile__ ( @@ -585,7 +585,7 @@ namespace KviMemory ); return iEcx; } - + #endif //0 diff --git a/src/kvilib/core/KviMemory.h b/src/kvilib/core/KviMemory.h index 52baf99a6..bb87a635e 100644 --- a/src/kvilib/core/KviMemory.h +++ b/src/kvilib/core/KviMemory.h @@ -142,7 +142,7 @@ namespace KviMemory { memmove(dst_ptr,src_ptr,len); } - + /** * \brief Initializes len bytes of memory starting from dst_ptr to c * diff --git a/src/kvilib/core/KviQString.cpp b/src/kvilib/core/KviQString.cpp index 1da945784..e30f3bb3b 100644 --- a/src/kvilib/core/KviQString.cpp +++ b/src/kvilib/core/KviQString.cpp @@ -52,7 +52,7 @@ namespace KviQString { // The global empty (and null) string const QString Empty; - + static char cHexDigits[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' }; bool equalCSN(const QString & sz1, const QString & sz2, unsigned int uLen) @@ -565,7 +565,7 @@ namespace KviQString szSrc.remove(szSrc.length() - iRemove,iRemove); } } - + void stripLeft(QString & szSrc, const QChar & c) { int iRemove = 0; @@ -951,7 +951,7 @@ namespace KviQString { return false; } - + const QChar * pSavePos1 = 0; const QChar * pSavePos2 = pM2; while(pM1->unicode()) @@ -1093,7 +1093,7 @@ namespace KviQString if(iIdx == -1) return; szSrc.truncate(bIncluded ? iIdx : iIdx + 1); } - + void cutFromFirst(QString & szSrc, const QString & szFind, bool bIncluded) { int iIdx = szSrc.indexOf(szFind); @@ -1108,7 +1108,7 @@ namespace KviQString if(iIdx == -1) return; szSrc.truncate(bIncluded ? iIdx : iIdx + 1); } - + void cutFromLast(QString & szSrc, const QString & szFind, bool bIncluded) { int iIdx = szSrc.lastIndexOf(szFind); @@ -1126,7 +1126,7 @@ namespace KviQString } szSrc.remove(0,bIncluded ? iIdx + 1 : iIdx); } - + void cutToFirst(QString & szSrc, const QString & szFind, bool bIncluded, bool bClearIfNotFound) { int iIdx = szSrc.indexOf(szFind); @@ -1148,7 +1148,7 @@ namespace KviQString } szSrc.remove(0,bIncluded ? iIdx + 1 : iIdx); } - + void cutToLast(QString & szSrc, const QString & szFind, bool bIncluded, bool bClearIfNotFound) { int iIdx = szSrc.lastIndexOf(szFind); @@ -1167,7 +1167,7 @@ namespace KviQString return bReturnFullStringIfNotFound ? szSrc : QString(); return szSrc.left(bIncluded ? iIdx + 1 : iIdx); } - + QString leftToFirst(QString & szSrc, const QString & szFind, bool bIncluded, bool bReturnFullStringIfNotFound) { int iIdx = szSrc.indexOf(szFind); @@ -1183,7 +1183,7 @@ namespace KviQString return bReturnFullStringIfNotFound ? szSrc : QString(); return szSrc.left(bIncluded ? iIdx + 1 : iIdx); } - + QString leftToLast(QString & szSrc, const QString & szFind, bool bIncluded, bool bReturnFullStringIfNotFound) { int iIdx = szSrc.lastIndexOf(szFind); diff --git a/src/kvilib/core/KviQString.h b/src/kvilib/core/KviQString.h index 7e62ce0dd..e3057a493 100644 --- a/src/kvilib/core/KviQString.h +++ b/src/kvilib/core/KviQString.h @@ -63,7 +63,7 @@ namespace KviQString * \brief A global empty string (note that this is ALSO NULL under Qt 3.x) */ extern KVILIB_API const QString Empty; - + /** * \brief Returns a readable size in byte's multiples * @@ -72,7 +72,7 @@ namespace KviQString * \return QString */ extern KVILIB_API QString makeSizeReadable(quint64 size); - + /** * \brief Compares two strings with case sensitive * @@ -82,7 +82,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCS(const QString & sz1, const QString & sz2); - + /** * \brief Compares two strings with case sensitive * @@ -92,7 +92,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCS(const QString & sz1, const char * pc2); - + /** * \brief Compares two strings with case insensitive * @@ -102,7 +102,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCI(const QString & sz1, const QString & sz2); - + /** * \brief Compares two strings with case insensitive * @@ -112,7 +112,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCI(const QString & sz1, const char * pc2); - + /** * \brief Compares two strings with case insensitive * @@ -156,7 +156,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCIN(const QString & sz1, const QString & sz2, unsigned int uLen); - + /** * \brief Compares two strings with case insensitive up to N chars * @@ -167,7 +167,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCIN(const QString & sz1, const char * pc2, unsigned int uLen); - + /** * \brief Compares two strings with case insensitive up to N chars * @@ -179,7 +179,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool equalCIN(const QString & sz1, const QChar * pC2, unsigned int uLen); - + /** * \brief Compares two strings with case insensitive * @@ -194,7 +194,7 @@ namespace KviQString */ extern KVILIB_API int cmpCI(const QString & sz1, const QString & sz2, bool bNonAlphaGreater = false); // sz1.compare(sz2,Qt::CaseInsensitive) - + /** * \brief Compares two strings with case insensitive up to N chars * @@ -208,7 +208,7 @@ namespace KviQString * \return int */ extern KVILIB_API int cmpCIN(const QString & sz1, const QString & sz2, unsigned int uLen); - + /** * \brief Ensures the last char of a string is the given char * @@ -226,7 +226,7 @@ namespace KviQString * \return bool */ extern KVILIB_API bool matchWildExpressions(const QString & szM1, const QString & szM2); - + /** * \brief Matches two string containging wildcards (* and ?) or regular expressions * \param szExp The regular expression to match @@ -246,14 +246,14 @@ namespace KviQString * \return void */ extern KVILIB_API void vsprintf(QString & szSrc, const QString & szFmt, kvi_va_list list); - + /** * \brief Trims all the whitespaces at the end of the given string * \param szSrc The source string * \return void */ extern KVILIB_API void stripRightWhiteSpace(QString & szSrc); - + /** * \brief Trims all c chars at the start of the given string * \param szSrc The source string @@ -261,7 +261,7 @@ namespace KviQString * \return void */ extern KVILIB_API void stripLeft(QString & szSrc, const QChar & c); - + /** * \brief Trims all c chars at the end of the given string * \param szSrc The source string @@ -269,7 +269,7 @@ namespace KviQString * \return void */ extern KVILIB_API void stripRight(QString & szSrc, const QChar & c); - + /** * \brief Appends a formatted string * \param szSrc The source string @@ -278,7 +278,7 @@ namespace KviQString * \return void */ extern KVILIB_API void appendFormatted(QString & szSrc, const QString & szFmt, ...); - + /** * \brief Appends the given number to the source string * \param szSrc The source string @@ -286,7 +286,7 @@ namespace KviQString * \return void */ extern KVILIB_API void appendNumber(QString & szSrc, double dReal); - + /** * \brief Appends the given number to the source string * \param szSrc The source string @@ -294,7 +294,7 @@ namespace KviQString * \return void */ extern KVILIB_API void appendNumber(QString & szSrc, kvi_i64_t iInteger); - + /** * \brief Appends the given number to the source string * \param szSrc The source string @@ -302,7 +302,7 @@ namespace KviQString * \return void */ extern KVILIB_API void appendNumber(QString & szSrc, int iInteger); - + /** * \brief Appends the given number to the source string * \param szSrc The source string @@ -310,7 +310,7 @@ namespace KviQString * \return void */ extern KVILIB_API void appendNumber(QString & szSrc, unsigned int uInteger); - + /** * \brief Appends the given number to the source string * \param szSrc The source string @@ -329,7 +329,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutFromFirst(QString & szSrc, const QChar & c, bool bIncluded = true); - + /** * \brief Cuts the string after the first occurrence of the given char * @@ -340,7 +340,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutFromFirst(QString & szSrc, const QString & szFind, bool bIncluded = true); - + /** * \brief Cuts the string after the last occurrence of the given char * @@ -351,7 +351,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutFromLast(QString & szSrc, const QChar & c, bool bIncluded = true); - + /** * \brief Cuts the string after the last occurrence of the given char * @@ -362,7 +362,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutFromLast(QString & szSrc, const QString & szFind, bool bIncluded = true); - + /** * \brief Cuts the string until the first occurrence of the given char is found * @@ -374,7 +374,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutToFirst(QString & szSrc, const QChar & c, bool bIncluded = true, bool bClearIfNotFound = false); - + /** * \brief Cuts the string until the first occurrence of the given char is found * @@ -386,7 +386,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutToFirst(QString & szSrc, const QString & szFind, bool bIncluded = true, bool bClearIfNotFound = false); - + /** * \brief Cuts the string until the last occurrence of the given char is found * @@ -398,7 +398,7 @@ namespace KviQString * \return void */ extern KVILIB_API void cutToLast(QString & szSrc, const QChar & c, bool bIncluded = true, bool bClearIfNotFound = false); - + /** * \brief Cuts the string until the last occurrence of the given char is found * @@ -424,7 +424,7 @@ namespace KviQString * \return void */ extern KVILIB_API QString leftToFirst(QString & szSrc, const QChar & c, bool bIncluded = true, bool bReturnFullStringIfNotFound = true); - + /** * \brief Returns the string up to the first occurrence of the given string * @@ -438,7 +438,7 @@ namespace KviQString * \return void */ extern KVILIB_API QString leftToFirst(QString & szSrc, const QString & szFind, bool bIncluded = true, bool bReturnFullStringIfNotFound = true); - + /** * \brief Returns the string up to the last occurrence of the given char * @@ -452,7 +452,7 @@ namespace KviQString * \return void */ extern KVILIB_API QString leftToLast(QString & szSrc, const QChar & c, bool bIncluded = true, bool bReturnFullStringIfNotFound = true); - + /** * \brief Returns the string up to the last occurrence of the given string * @@ -473,14 +473,14 @@ namespace KviQString * \return QString */ extern KVILIB_API QString upperISO88591(const QString & szSrc); - + /** * \brief Returns an ISO-8859-1 lower case string * \param szSrc The source string * \return QString */ extern KVILIB_API QString lowerISO88591(const QString & szSrc); - + /** * \brief Returns a token from a string * \param szSrc The source string diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.h b/src/kvilib/ext/KviAnimatedPixmapCache.h index 60cc9eb17..9a35069d7 100644 --- a/src/kvilib/ext/KviAnimatedPixmapCache.h +++ b/src/kvilib/ext/KviAnimatedPixmapCache.h @@ -148,9 +148,9 @@ public: { m_pInstance->internalFree(data); } - + static QPixmap* dummyPixmap(); - + static void notifyDelete(KviAnimatedPixmapInterface* receiver) { m_pInstance->internalNotifyDelete(receiver); diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp index dc7b2816b..31377928a 100644 --- a/src/kvilib/ext/KviCommandFormatter.cpp +++ b/src/kvilib/ext/KviCommandFormatter.cpp @@ -32,7 +32,7 @@ namespace KviCommandFormatter { if(!(*pszArray)) return false; // can't have more leading chars - + bool bGotIt = false; while(*pszArray) { diff --git a/src/kvilib/ext/KviCryptEngine.h b/src/kvilib/ext/KviCryptEngine.h index 5b01b4de5..cef18bd51 100644 --- a/src/kvilib/ext/KviCryptEngine.h +++ b/src/kvilib/ext/KviCryptEngine.h @@ -64,13 +64,13 @@ class KviCString; WantEncryptKey = 4, WantDecryptKey = 8 }; - + enum EncryptResult { Encrypted, Encoded, EncryptError }; - + enum DecryptResult { DecryptOkWasEncrypted, DecryptOkWasEncoded, diff --git a/src/kvilib/ext/KviDebugContext.cpp b/src/kvilib/ext/KviDebugContext.cpp index 00a8be75e..571c36dca 100644 --- a/src/kvilib/ext/KviDebugContext.cpp +++ b/src/kvilib/ext/KviDebugContext.cpp @@ -22,14 +22,14 @@ KviDebugContext::KviDebugContext(const char * pcContext, ...) m_szContext.vsprintf(pcContext,list); kvi_va_end(list); - + static KviCString szEnterMark = ">> %s"; - + KviCString szPrefix = g_szIndentPrefix; szPrefix.append(szEnterMark); - + qDebug(szPrefix.ptr(),m_szContext.ptr()); - + g_szIndentPrefix.append(" "); } @@ -56,11 +56,11 @@ void KviDebugContext::trace(const char * pcFmt, ...) szOut.vsprintf(pcFmt,list); kvi_va_end(list); - + static KviCString szEnterMark = "-- %s"; - + KviCString szPrefix = g_szIndentPrefix; szPrefix.append(szEnterMark); - + qDebug(szPrefix.ptr(),szOut.ptr()); } diff --git a/src/kvilib/ext/KviDebugContext.h b/src/kvilib/ext/KviDebugContext.h index ecf1e6ade..feccc1af7 100644 --- a/src/kvilib/ext/KviDebugContext.h +++ b/src/kvilib/ext/KviDebugContext.h @@ -59,7 +59,7 @@ private: KviCString m_szContext; public: /** - * \brief + * \brief * \param pcFmt The format list argument * \param ... The succeding arguments * \return void diff --git a/src/kvilib/ext/KviOggTheoraDecoder.cpp b/src/kvilib/ext/KviOggTheoraDecoder.cpp index 83da7e571..914c5f060 100644 --- a/src/kvilib/ext/KviOggTheoraDecoder.cpp +++ b/src/kvilib/ext/KviOggTheoraDecoder.cpp @@ -112,7 +112,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream) // qDebug("adddata signal %p stream size %d",m_pVideoSignal, stream->size() ); if(stream->size()==0)return; /* Ogg file open; parse the headers */ - + if(!stateflag) { @@ -209,7 +209,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream) geometry.frame_h = ti.frame_height; geometry.pic_x = ti.pic_x; geometry.pic_y = ti.pic_y; - + px_fmt=ti.pixel_fmt; switch(ti.pixel_fmt) { @@ -326,7 +326,7 @@ void KviOggTheoraDecoder::video_write(void) out[j*4+2] = OC_CLAMP255(r); out[j*4+3] = 255; //alpha } - + } int size = sizeof(char) * geometry.pic_w * geometry.pic_h * ARGB32_BPP; diff --git a/src/kvilib/ext/KviOggTheoraEncoder.cpp b/src/kvilib/ext/KviOggTheoraEncoder.cpp index e508de56c..df2bcafca 100644 --- a/src/kvilib/ext/KviOggTheoraEncoder.cpp +++ b/src/kvilib/ext/KviOggTheoraEncoder.cpp @@ -142,7 +142,7 @@ KviOggTheoraEncoder::KviOggTheoraEncoder(KviDataBuffer * stream, int iWidth, int } // write the bitstream header packets with proper page interleave th_comment_init(&tc); - + // Repeatedly call th_encode_flushheader() to retrieve all the header packets. // first packet will get its own page automatically if(th_encode_flushheader(td,&tc,&op)<=0){ @@ -223,7 +223,7 @@ void KviOggTheoraEncoder::addVideoFrame(QRgb * rgb32, int) rgb32toyuv444(rgb32, videoYuv, geometry.pic_w, geometry.pic_h); // qDebug("addFrame p%p size%d yuv%p",rgb32,videoSize,videoYuv); - + ogg_page videopage; // is there a video page flushed? If not, fetch one if possible diff --git a/src/kvilib/ext/KviOggTheoraEncoder.h b/src/kvilib/ext/KviOggTheoraEncoder.h index f28ea8bff..a0310f3fe 100644 --- a/src/kvilib/ext/KviOggTheoraEncoder.h +++ b/src/kvilib/ext/KviOggTheoraEncoder.h @@ -103,7 +103,7 @@ private: public: /** * \brief Appends a video frame to the stream - * \param rgb32 video frame as a matrix of rgb32 pixels + * \param rgb32 video frame as a matrix of rgb32 pixels * \param videoSize size of the video frame * \return void */ diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp index 83d6e4b4c..9c4e085d5 100644 --- a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp +++ b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp @@ -80,7 +80,7 @@ void KviRegisteredChannelDataBase::save(const QString &filename) QHash<QString,QString> * pPropertyDict = c->propertyDict(); KVI_ASSERT(pPropertyDict); - + for(QHash<QString,QString>::Iterator it2 = pPropertyDict->begin();it2 != pPropertyDict->end();++it2) cfg.writeEntry(it2.key(),it2.value()); } @@ -150,7 +150,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c) // merge properties QHash<QString,QString> * pPropertyDict = old->propertyDict(); KVI_ASSERT(pPropertyDict); - + for(QHash<QString,QString>::Iterator it = pPropertyDict->begin();it != pPropertyDict->end();++it) { if(!c->property(it.key()).isEmpty()) @@ -182,6 +182,6 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c) } idx++; } - + l->append(c); } diff --git a/src/kvilib/file/KviFile.h b/src/kvilib/file/KviFile.h index cddeee7e5..a60c1aeb1 100644 --- a/src/kvilib/file/KviFile.h +++ b/src/kvilib/file/KviFile.h @@ -57,14 +57,14 @@ public: * \return KviFile */ KviFile(); - + /** * \brief Constructs file object * \param szName The name of the file * \return KviFile */ KviFile(const QString & szName); - + /** * \brief Destroys file object */ @@ -165,7 +165,7 @@ public: * \return bool */ bool save(KviPointerList<KviCString> * pData); - + /** * \brief Loads a file * \param file The file to load diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp index 690a31e50..3d0f762c6 100644 --- a/src/kvilib/file/KviFileUtils.cpp +++ b/src/kvilib/file/KviFileUtils.cpp @@ -39,7 +39,7 @@ namespace KviFileUtils { static char cHexChars[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; - + /* WORKING CODE BUT UNUSED FOR NOW bool readLine(QFile * f,QString &szBuffer,bool bClearBuffer) @@ -260,14 +260,14 @@ namespace KviFileUtils // just to be sure check that we're not deleting .. if(KviQString::equalCS(inf.fileName(),"..") || KviQString::equalCS(inf.fileName(),".")) continue; - + if(inf.isDir()) { if(!deleteDir(inf.absoluteFilePath())) return false; continue; } - + if(!KviFileUtils::removeFile(inf.absoluteFilePath())) { qDebug("Failed to remove file %s",inf.absoluteFilePath().toUtf8().data()); diff --git a/src/kvilib/irc/KviAvatarCache.h b/src/kvilib/irc/KviAvatarCache.h index 0b0c50d02..9b04b60d1 100644 --- a/src/kvilib/irc/KviAvatarCache.h +++ b/src/kvilib/irc/KviAvatarCache.h @@ -80,7 +80,7 @@ public: * \return void */ static void done(); - + /** * \brief Returns the instance of the avatar cache * \return KviAvatarCache * @@ -111,13 +111,13 @@ public: * \return const QString & */ const QString & lookup(const KviIrcMask & mask, const QString & szNetwork); - + /** * \brief Deletes the cache * \return void */ void cleanup(); - + /** * \brief Loads the cache * \param szFileName The cache filename diff --git a/src/kvilib/irc/KviControlCodes.cpp b/src/kvilib/irc/KviControlCodes.cpp index b28a5a1cb..aea98782f 100644 --- a/src/kvilib/irc/KviControlCodes.cpp +++ b/src/kvilib/irc/KviControlCodes.cpp @@ -82,7 +82,7 @@ namespace KviControlCodes szRet += szData.mid(iBegin,i - iBegin); return szRet; } - + const kvi_wchar_t * getColorBytesW(const kvi_wchar_t * pwData, unsigned char * pcByte1, unsigned char * pcByte2) { // diff --git a/src/kvilib/irc/KviControlCodes.h b/src/kvilib/irc/KviControlCodes.h index 818bf5680..07542a4cc 100644 --- a/src/kvilib/irc/KviControlCodes.h +++ b/src/kvilib/irc/KviControlCodes.h @@ -36,7 +36,7 @@ * \file KviControlCodes.h * \author Szymon Stefanek * \brief This file holds the text control codes -* +* * It was originally named KviMircCntrl */ @@ -55,7 +55,7 @@ // created when looking for a good placement for the CRYPT escape char in KVirc. // I guess that the best chars to be used were FS,GS,RS,US,DC1,DC2,DC3,DC4...they have the "less defined" // meaning as ASCII control chars. -// mmmh... :) +// mmmh... :) // ASCII IRC Meaning // 000 NUL Null (Cannot be assigned) @@ -172,7 +172,7 @@ namespace KviControlCodes */ KVILIB_API QString stripControlBytes(const QString & szData); - + KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t * pwData, unsigned char * pcByte1, unsigned char * pcByte2); KVILIB_API unsigned int getUnicodeColorBytes(const QString & szData, unsigned int iChar, unsigned char * pcByte1, unsigned char * pcByte2); diff --git a/src/kvilib/irc/KviIdentityProfile.cpp b/src/kvilib/irc/KviIdentityProfile.cpp index 467cfa3b0..2f5d1d949 100644 --- a/src/kvilib/irc/KviIdentityProfile.cpp +++ b/src/kvilib/irc/KviIdentityProfile.cpp @@ -89,6 +89,6 @@ bool KviIdentityProfile::load(KviConfigurationFile * pCfg, const QString & szPre szTmp = QString("%1RealName").arg(szPrefix); m_szRealName = pCfg->readEntry(szTmp); - + return true; } diff --git a/src/kvilib/irc/KviIrcMask.cpp b/src/kvilib/irc/KviIrcMask.cpp index 454434871..5ef127f67 100644 --- a/src/kvilib/irc/KviIrcMask.cpp +++ b/src/kvilib/irc/KviIrcMask.cpp @@ -354,7 +354,7 @@ bool KviIrcMask::matchWildString(const QString & szExp, const QString & szStr) c if(!pPtr) return 0; - + while(pPtr->unicode()) { if((pPtr->unicode() == '[') || (pPtr->unicode() == ']')) @@ -371,7 +371,7 @@ bool KviIrcMask::matchWildString(const QString & szExp, const QString & szStr) c return re.exactMatch(szStr); } - + int KviIrcMask::getIpDomainMaskLen() const { int iLen = m_szHost.length(); diff --git a/src/kvilib/irc/KviIrcMask.h b/src/kvilib/irc/KviIrcMask.h index 4498bd909..c4ed69920 100644 --- a/src/kvilib/irc/KviIrcMask.h +++ b/src/kvilib/irc/KviIrcMask.h @@ -202,7 +202,7 @@ public: * * If the host or username are not known, the mask may contain less * information than requested. - * + * * Mask types: * 0: nick!user@\machine.host.top (nick!user@\XXX.XXX.XXX.XXX) (default) * 1: nick!user@*.host.top (nick!user@\XXX.XXX.XXX.*) @@ -226,7 +226,7 @@ public: * 19: *!~user@*.host.top (*!~user@\XXX.XXX.*) * 20: nick!*user@*.host.top (nick!*user@\XXX.XXX.*) * 21: *!*user@*.host.top (*!user@*XXX.XXX.*) - * + * * Smart versions of the masks 17-21 that try take care of masked ip addresses * in the form xxx.xxx.INVALID-TOP-MASK * 22: nick!~user@*.host.top (nick!~user@\XXX.XXX.*) @@ -234,10 +234,10 @@ public: * 24: *!~user@*.host.top (*!~user@\XXX.XXX.*) * 25: nick!*user@*.host.top (nick!*user@\XXX.XXX.*) * 26: *!*user@*.host.top (*!user@*XXX.XXX.*) - * + * * If some data is missing, these types may change: * For example, if hostname is missing, the mask type 3 or 4 may be reduced to type 5 - * + * * ident is fun.. ahem * prefixes used: * none I line with ident diff --git a/src/kvilib/irc/KviIrcNetwork.h b/src/kvilib/irc/KviIrcNetwork.h index 82fdba182..6252faad8 100644 --- a/src/kvilib/irc/KviIrcNetwork.h +++ b/src/kvilib/irc/KviIrcNetwork.h @@ -186,7 +186,7 @@ public: * \return KviNickServRuleSet * */ inline KviNickServRuleSet * nickServRuleSet(){ return m_pNickServRuleSet; }; - + /** * \brief Sets the rules for NickServ * \param pSet The rule set where to add rules @@ -282,7 +282,7 @@ public: * \return void */ inline void setPassword(const QString & szPass){ m_szPass = szPass; }; - + /** * \brief Sets the list of channels to mark for autojoin * \param pNewChannelList The channel list diff --git a/src/kvilib/irc/KviIrcServer.h b/src/kvilib/irc/KviIrcServer.h index 6f38c080b..497838ed7 100644 --- a/src/kvilib/irc/KviIrcServer.h +++ b/src/kvilib/irc/KviIrcServer.h @@ -437,7 +437,7 @@ public: /** * \brief Applies the filter to the server - * + * * A link filter resides between the low-level socket, which send/receive blocks * of bytes, and the connection which talk using IRC messages. * The filter can remap blocks of bytes in any direction diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp index 1ca4cecae..73296f731 100644 --- a/src/kvilib/irc/KviIrcUserEntry.cpp +++ b/src/kvilib/irc/KviIrcUserEntry.cpp @@ -75,7 +75,7 @@ void KviIrcUserEntry::setRealName(const QString & szReal) m_szRealName.remove(0,3); } } - + /* * smart nick color code: min length=5, max length=7 * 1 - ^K, 2 - digit, 3 - coma, 4 - digit, 5 - KVI_TEXT_RESET, 6 - start of realname. diff --git a/src/kvilib/irc/KviIrcUserEntry.h b/src/kvilib/irc/KviIrcUserEntry.h index c5983727d..40207a0f1 100644 --- a/src/kvilib/irc/KviIrcUserEntry.h +++ b/src/kvilib/irc/KviIrcUserEntry.h @@ -89,7 +89,7 @@ protected: int m_iHops; Gender m_eGender; QString m_szUserFlags; - + bool m_bAway; bool m_bIrcOp; @@ -204,7 +204,7 @@ public: * \return void */ void setUserFlags(const QString & szFlags){ m_szUserFlags = szFlags; }; - + /** * \brief Returns true if the user is marked as a bot * \return bool diff --git a/src/kvilib/irc/KviNickServRuleSet.cpp b/src/kvilib/irc/KviNickServRuleSet.cpp index aaaa4c92c..c0a42cffe 100644 --- a/src/kvilib/irc/KviNickServRuleSet.cpp +++ b/src/kvilib/irc/KviNickServRuleSet.cpp @@ -200,12 +200,12 @@ KviNickServRuleSet * KviNickServRuleSet::createInstance() KviNickServRule * KviNickServRuleSet::matchRule(const QString & szNick, const KviIrcMask * pNickServ, const QString & szMsg, const QString & szServer) { if(!m_pRules) return 0; - + for(KviNickServRule *r = m_pRules->first();r;r = m_pRules->next()) { if(!KviQString::matchString(r->registeredNick(),szNick,false,true)) continue; - + if(!szServer.isEmpty()) { QRegExp res(r->serverMask(),Qt::CaseInsensitive,QRegExp::Wildcard); diff --git a/src/kvilib/irc/KviUserIdentity.h b/src/kvilib/irc/KviUserIdentity.h index e5562d92b..5b5a727a2 100644 --- a/src/kvilib/irc/KviUserIdentity.h +++ b/src/kvilib/irc/KviUserIdentity.h @@ -57,28 +57,28 @@ protected: QString m_szId; // the identity set name QString m_szNickName; - + QString m_szAltNickName1; QString m_szAltNickName2; QString m_szAltNickName3; - + QString m_szUserName; QString m_szRealName; QString m_szPassword; - + KviPixmap m_pixAvatar; - + QString m_szPartMessage; QString m_szQuitMessage; - + QString m_szAge; QString m_szGender; QString m_szLocation; QString m_szLanguages; QString m_szOtherInfo; - + QString m_szUserMode; - + QString m_szOnConnectCommand; QString m_szOnLoginCommand; public: diff --git a/src/kvilib/irc/KviUserIdentityManager.h b/src/kvilib/irc/KviUserIdentityManager.h index f6beb9620..8f59c3818 100644 --- a/src/kvilib/irc/KviUserIdentityManager.h +++ b/src/kvilib/irc/KviUserIdentityManager.h @@ -104,7 +104,7 @@ public: * \return void */ void setDefaultIdentity(const QString & szIdentityId){ m_szDefaultIdentity = szIdentityId; }; - + /** * \brief Creates a new working copy * \return KviUserIdentityManager * diff --git a/src/kvilib/locale/KviLocale.cpp b/src/kvilib/locale/KviLocale.cpp index f30c2c7ef..5f52f43e3 100644 --- a/src/kvilib/locale/KviLocale.cpp +++ b/src/kvilib/locale/KviLocale.cpp @@ -298,7 +298,7 @@ protected: static KviPointerHashTable<const char *,KviSmartTextCodec> * g_pSmartCodecDict = 0; -static const char * encoding_groups[] = +static const char * encoding_groups[] = { "Unicode", "West European", @@ -364,7 +364,7 @@ static KviLocale::EncodingDescription supported_encodings[] = { "TSCII" , 0 , 0 , 7, "Tamil" }, { "CP-949" , 0 , 0 , 7, "Korean Codepage" }, #endif - + // smart codecs that send in the local charset // West European { "ISO-8859-1 [UTF-8]" , 1 , 0 , 1, "Western, Latin-1 - Unicode" }, @@ -516,7 +516,7 @@ KviLocale::KviLocale(QApplication * pApp, const QString & szLocaleDir, const QSt { // ensure Qt will use the right locale when formatting dates, numbers, .. // Note: Qt will use the system() locale anyway, we need to construct an empty QLocale() - // to get it use our specified locale. + // to get it use our specified locale. QLocale::setDefault(QLocale(QString::fromLatin1(g_szLang.ptr(), g_szLang.len()))); QString szBuffer; @@ -752,7 +752,7 @@ const QString & KviLocale::translateToQString(const char * pcText, const char * { if(!pcContext) return g_pMainCatalogue->translateToQString(pcText); - + KviMessageCatalogue * pCatalogue = g_pCatalogueDict->find(pcContext); if(!pCatalogue) { diff --git a/src/kvilib/locale/KviLocale.h b/src/kvilib/locale/KviLocale.h index 6117709bb..44ba804c1 100644 --- a/src/kvilib/locale/KviLocale.h +++ b/src/kvilib/locale/KviLocale.h @@ -157,7 +157,7 @@ public: /** * \brief Finds the catalogue - * + * * This function attempts to determine the current locale and then load the * corresponding translation file from the KVIrc locale directory. * Returns true if the locale was correctly set; i.e. the locale is C or POSIX diff --git a/src/kvilib/locale/KviMessageCatalogue.h b/src/kvilib/locale/KviMessageCatalogue.h index 6c0f4ac73..2d237b442 100644 --- a/src/kvilib/locale/KviMessageCatalogue.h +++ b/src/kvilib/locale/KviMessageCatalogue.h @@ -61,8 +61,8 @@ protected: QTextCodec * m_pTextCodec; public: /** - * \brief - * \param szName + * \brief + * \param szName * \return bool */ bool load(const QString & szName); diff --git a/src/kvilib/locale/KviTranslationEntry.h b/src/kvilib/locale/KviTranslationEntry.h index fb0b9754d..a2ead8f9d 100644 --- a/src/kvilib/locale/KviTranslationEntry.h +++ b/src/kvilib/locale/KviTranslationEntry.h @@ -30,7 +30,7 @@ * \file KviTranslationEntry.h * \author Szymon Stefanek * \brief Holds the translation strings -* +* * This file was originally part of KviLocale.h */ diff --git a/src/kvilib/locale/KviTranslator.h b/src/kvilib/locale/KviTranslator.h index 8187b1b92..572106be9 100644 --- a/src/kvilib/locale/KviTranslator.h +++ b/src/kvilib/locale/KviTranslator.h @@ -30,7 +30,7 @@ * \file KviTranslator.h * \author Szymon Stefanek * \brief KVIrc translator class -* +* * This file was originally part of KviLocale.h */ diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp index c4faad049..a6b53b6f2 100644 --- a/src/kvilib/net/KviDnsResolver.cpp +++ b/src/kvilib/net/KviDnsResolver.cpp @@ -373,9 +373,9 @@ KviDnsResolver::~KviDnsResolver() qDebug("Failed to wait for the slave dns thread: we're probably going to crash!"); delete m_pSlaveThread; // will eventually terminate it (but it will also block us!!!) } - + //QApplication::removePostedEvents(this); // the Qt doc says that we shouldn't need this - + if(m_pDnsResult) delete m_pDnsResult; if(m_pAuxData) diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h index d9a753ea4..57efee557 100644 --- a/src/kvilib/net/KviDnsResolver.h +++ b/src/kvilib/net/KviDnsResolver.h @@ -59,7 +59,7 @@ public: { return m_pHostnameList; } - + KviPointerList<QString> * ipAddressList() { return m_pIpAddressList; @@ -164,7 +164,7 @@ public: { KVI_ASSERT(pResult); } - + virtual ~KviDnsResolverThreadEvent() { if(m_pResult) diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp index 98bf7b91a..d85e4d7f6 100644 --- a/src/kvilib/net/KviHttpRequest.cpp +++ b/src/kvilib/net/KviHttpRequest.cpp @@ -77,7 +77,7 @@ KviHttpRequest::KviHttpRequest() KviHttpRequest::~KviHttpRequest() { resetInternalStatus(); - + KVI_ASSERT(!(m_p->pSocket)); KVI_ASSERT(!(m_p->pFile)); @@ -212,12 +212,12 @@ void KviHttpRequest::closeSocket() m_p->pSocket->abort(); m_p->pSocket->close(); - + // This can be called from a socket handler slot m_p->pSocket->deleteLater(); - + //delete m_p->pSocket; - + m_p->pSocket = NULL; } @@ -272,9 +272,9 @@ void KviHttpRequest::slotSocketConnected() ); KviCString szMethod; - + bool bIsPost = false; - + if(m_eProcessingType == HeadersOnly) szMethod = "HEAD"; else if(m_szPostData.isEmpty()) @@ -349,7 +349,7 @@ void KviHttpRequest::slotSocketReadDataReady() } // FIXME: Avoid double-buffering here! - + KviDataBuffer oBuffer(iBytes); int iRead = m_p->pSocket->read((char *)(oBuffer.data()),iBytes); @@ -361,7 +361,7 @@ void KviHttpRequest::slotSocketReadDataReady() slotSocketDisconnected(); return; } - + // FIXME // well... otherwise just wait. // FIXME ? @@ -438,7 +438,7 @@ bool KviHttpRequest::doConnect() delete m_p->pConnectTimeoutTimer; m_p->pConnectTimeoutTimer = NULL; } - + m_p->pConnectTimeoutTimer = new QTimer(); m_p->pConnectTimeoutTimer->setSingleShot(true); QObject::connect(m_p->pConnectTimeoutTimer,SIGNAL(timeout()),this,SLOT(slotConnectionTimedOut())); @@ -459,7 +459,7 @@ bool KviHttpRequest::doConnect() ); */ - + return true; } @@ -727,9 +727,9 @@ bool KviHttpRequest::processHeader(KviCString &szHeader) { // this is not "OK" and not "Partial content" // Error, redirect or something confusing - + // FIXME: Handle 30x codes by re-issuing the request with the new URI ? - + if(m_eProcessingType != HeadersOnly) { // this is an error then diff --git a/src/kvilib/net/KviNetUtils.h b/src/kvilib/net/KviNetUtils.h index 13f62b84e..111edfc1c 100644 --- a/src/kvilib/net/KviNetUtils.h +++ b/src/kvilib/net/KviNetUtils.h @@ -37,12 +37,12 @@ //#include <tpipv6.h> #define in6_addr in_addr6 #endif - #else + #else #ifdef WIN2K #include <wspiapi.h> #else #include <ws2tcpip.h> - #endif + #endif #endif #else #include <sys/types.h> diff --git a/src/kvilib/net/KviSASL.cpp b/src/kvilib/net/KviSASL.cpp index e346d2df3..407ab5122 100644 --- a/src/kvilib/net/KviSASL.cpp +++ b/src/kvilib/net/KviSASL.cpp @@ -165,7 +165,7 @@ namespace KviSASL * 4) our password, crypted using blowfish in ecb mode and the dh secret as the blowfish key * Then, the answer is to be base64 encoded. */ - + int answerLen = 2 + pKlen + baNick.size() + 1 + passLen; char * answer = (char *) malloc(answerLen); char * answer2 = answer; diff --git a/src/kvilib/net/KviSASL.h b/src/kvilib/net/KviSASL.h index 861709280..f21b22df2 100644 --- a/src/kvilib/net/KviSASL.h +++ b/src/kvilib/net/KviSASL.h @@ -42,7 +42,7 @@ namespace KviSASL * \param szOut A KviCString that will be filled with the authentication message * \param baNick The username * \param baPass The password - * \return bool + * \return bool */ extern KVILIB_API bool plainMethod(KviCString & szIn, KviCString & szOut, QByteArray & baNick, QByteArray & baPass); diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp index 9d9b91dd9..0a370e7bc 100644 --- a/src/kvilib/net/KviSSL.cpp +++ b/src/kvilib/net/KviSSL.cpp @@ -355,8 +355,8 @@ bool KviSSL::initContext(Method m) { // we have to request the peer certificate, else only the client can see the peer identity, not the server SSL_CTX_set_verify(m_pSSLCtx, SSL_VERIFY_PEER, verify_clientCallback); - } - + } + // we want all ciphers to be available here, except insecure ones, orderer by strength; // ADH are moved to the end since they are less secure, but they don't need a certificate // (so we can use secure dcc without a cert) @@ -547,7 +547,7 @@ KviSSLCipherInfo * KviSSL::getCurrentCipherInfo() SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL); #endif if(!c)return 0; - return new KviSSLCipherInfo(c); + return new KviSSLCipherInfo(c, m_pSSL); } @@ -621,7 +621,7 @@ bool KviSSLCertificate::fingerprintIsValid() EVP_PKEY * pkey = X509_get_pubkey(m_pX509); int rv = X509_verify(m_pX509, pkey); - + // careful: https://support.ntp.org/bugs/show_bug.cgi?id=1127 // quote: X509_verify is a call to ASN1_item_verify which can return both 0 and -1 for error cases. // In particular it can return -1 when the message digest type is not known, or memory allocation failed. @@ -632,33 +632,33 @@ int KviSSLCertificate::fingerprintDigestId() { if(!m_pX509) return -1; - + int NID = OBJ_obj2nid(m_pX509->sig_alg->algorithm); - if (NID == NID_undef) + if (NID == NID_undef) { // unknow digest function: it means the signature can't be verified: the certificate can't be trusted return 0; } - + const EVP_MD * mdType = NULL; mdType = EVP_get_digestbyname(OBJ_nid2sn(NID)); - - if (mdType == NULL) + + if (mdType == NULL) { // Unknown digest return 0; } - + return mdType->type; } const char * KviSSLCertificate::fingerprintDigestStr() { int iDigestType = fingerprintDigestId(); - + if(iDigestType == 0) return ""; - + return OBJ_nid2ln(iDigestType); } @@ -674,10 +674,10 @@ const char * KviSSLCertificate::fingerprintContents(QString digestName) } else { pDigestName = digestName.toUtf8().data(); } - + if(getFingerprint(bufferData, &bufferLen, pDigestName) != 0) return ""; - + QByteArray digestByteArray = QByteArray::fromRawData((char *) bufferData, bufferLen); return digestByteArray.toHex().data(); } @@ -688,21 +688,21 @@ int KviSSLCertificate::getFingerprint(unsigned char * bufferData, unsigned int * // doesn't collide with the one from openssl if(!m_pX509) return -99; - + const EVP_MD * mdType = NULL; mdType = EVP_get_digestbyname(digestName); - - if (mdType == NULL) + + if (mdType == NULL) { // Unknown digest return -98; } - + if (!X509_digest(m_pX509, mdType, bufferData, bufferLen)) { return -97; } - + return 0; } @@ -829,12 +829,12 @@ const char * KviSSLCertificate::verify() */ #if OPENSSL_VERSION_NUMBER >= 0x10000000L -KviSSLCipherInfo::KviSSLCipherInfo(const SSL_CIPHER * c) +KviSSLCipherInfo::KviSSLCipherInfo(const SSL_CIPHER * c, const SSL * s) #else -KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c) +KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c, SSL * s) #endif { - m_szVersion = SSL_CIPHER_get_version(c); + m_szVersion = SSL_get_version(s); m_iNumBitsUsed = SSL_CIPHER_get_bits(c,&m_iNumBits); m_szName = SSL_CIPHER_get_name(c); char buf[1024]; diff --git a/src/kvilib/net/KviSSL.h b/src/kvilib/net/KviSSL.h index 93b347bdb..07ae94e15 100644 --- a/src/kvilib/net/KviSSL.h +++ b/src/kvilib/net/KviSSL.h @@ -33,13 +33,13 @@ #include "KviPointerHashTable.h" -// Apple deprecated openssl since osx 10.7: +// Apple deprecated openssl since osx 10.7: #ifdef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #endif - + #include <openssl/ssl.h> @@ -94,7 +94,7 @@ public: int serialNumber(){ return m_iSerialNumber; }; int version(){ return m_iVersion; }; - + bool fingerprintIsValid(); int fingerprintDigestId(); const char * fingerprintDigestStr(); @@ -115,9 +115,9 @@ class KVILIB_API KviSSLCipherInfo { public: #if OPENSSL_VERSION_NUMBER >= 0x10000000L - KviSSLCipherInfo(const SSL_CIPHER * c); + KviSSLCipherInfo(const SSL_CIPHER * c, const SSL * s); #else - KviSSLCipherInfo(SSL_CIPHER * c); + KviSSLCipherInfo(SSL_CIPHER * c, SSL * s); #endif ~KviSSLCipherInfo(); protected: diff --git a/src/kvilib/net/kvi_socket.h b/src/kvilib/net/kvi_socket.h index 0c68bbe9e..55205f25d 100644 --- a/src/kvilib/net/kvi_socket.h +++ b/src/kvilib/net/kvi_socket.h @@ -63,7 +63,7 @@ #define KVI_PROTECTION_LEVEL_DEFAULT PROTECTION_LEVEL_DEFAULT #define KVI_PROTECTION_LEVEL_UNRESTRICTED PROTECTION_LEVEL_UNRESTRICTED #define KVI_IPPROTO_IPV6 IPPROTO_IPV6 - + #else //!(defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_ON_MINGW) && !defined(OS2)) #include <sys/time.h> diff --git a/src/kvilib/system/KviByteOrder.h b/src/kvilib/system/KviByteOrder.h index 53d6df8d9..54ebb2c9a 100644 --- a/src/kvilib/system/KviByteOrder.h +++ b/src/kvilib/system/KviByteOrder.h @@ -50,7 +50,7 @@ namespace KviByteOrder ((i >> 40) & 0xff00) | /* b to g */ (i >> 56)); /* a to h */ } - + /** * \brief Swaps the endianess of a kvi_u32_t * @@ -62,7 +62,7 @@ namespace KviByteOrder // abcd to dcba return ((i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24)); } - + /** * \brief Swaps the endianess of a kvi_u16_t * @@ -74,7 +74,7 @@ namespace KviByteOrder // ab to ba return ((i << 8) | (i >> 8)); } - + // // Byte Orders Reminder @@ -94,7 +94,7 @@ namespace KviByteOrder { return swap16(u); } - + inline kvi_u32_t localCpuToLittleEndian32(kvi_u32_t u) { return swap32(u); @@ -124,7 +124,7 @@ namespace KviByteOrder { return u; } - + inline kvi_u32_t localCpuToBigEndian32(kvi_u32_t u) { return u; @@ -154,7 +154,7 @@ namespace KviByteOrder { return u; } - + inline kvi_u32_t localCpuToNetworkByteOrder32(kvi_u32_t u) { return u; @@ -191,7 +191,7 @@ namespace KviByteOrder { return u; } - + inline kvi_u32_t localCpuToLittleEndian32(kvi_u32_t u) { return u; @@ -221,7 +221,7 @@ namespace KviByteOrder { return swap16(u); } - + inline kvi_u32_t localCpuToBigEndian32(kvi_u32_t u) { return swap32(u); @@ -253,7 +253,7 @@ namespace KviByteOrder { return swap16(u); } - + inline kvi_u32_t localCpuToNetworkByteOrder32(kvi_u32_t u) { return swap32(u); diff --git a/src/kvilib/system/KviEnvironment.h b/src/kvilib/system/KviEnvironment.h index 4e70b0238..1d9e36459 100644 --- a/src/kvilib/system/KviEnvironment.h +++ b/src/kvilib/system/KviEnvironment.h @@ -58,7 +58,7 @@ namespace KviEnvironment { SetEnvironmentVariable(szName,szValue); } - + inline void unsetVariable(const char * name) { SetEnvironmentVariable(name,NULL); diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 89426ab15..2d13913d7 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -306,7 +306,7 @@ if(APPLE) # note: phonon_backend => mediaservice # note: needs platform on osx # note: check if printsupport is needed, too - + if(WANT_DEBUG) install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms|sqldrivers)/.*_debug\\.dylib") diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp index 7d7388975..1869c0c7d 100644 --- a/src/kvirc/kernel/KviAction.cpp +++ b/src/kvirc/kernel/KviAction.cpp @@ -63,7 +63,7 @@ KviAction::~KviAction() m_pActionList->setAutoDelete(true); delete m_pActionList; } - + if(m_pAccel) unregisterAccelerator(); } @@ -91,7 +91,7 @@ void KviAction::registerAccelerator() if(!m_szKeySequence.isEmpty()) { g_pMainWindow->freeAccelleratorKeySequence(m_szKeySequence); - + m_pAccel = new QShortcut(m_szKeySequence,g_pMainWindow,0,0,Qt::ApplicationShortcut); connect(m_pAccel,SIGNAL(activated()),this,SLOT(activate())); //no way to have Ctrl+Alt+Key events fired as no-ambiguous, probably qt bug @@ -496,9 +496,9 @@ QAction * KviAction::addToCustomToolBar(KviCustomToolBar * pParentToolBar) { if(!setupDone()) setup(); - + QPixmap * pPix = bigIcon(); - + QAction * pAction = new QAction(pPix ? *pPix : QPixmap(), visibleName(), pParentToolBar); // important: when customizing the toolbar, we'll get the action name from QAction::objectName(); pAction->setObjectName(m_szName); diff --git a/src/kvirc/kernel/KviAction.h b/src/kvirc/kernel/KviAction.h index bc14ba9b7..7a22c87d5 100644 --- a/src/kvirc/kernel/KviAction.h +++ b/src/kvirc/kernel/KviAction.h @@ -48,7 +48,7 @@ class KviCustomToolBar; /** * \class KviActionCategory * \brief Holds the categories of an action -* +* * Known categories are: general (or empty), irc, script */ class KVIRC_API KviActionCategory @@ -128,7 +128,7 @@ public: /** * \brief Constructs the action object * \param pParent The parent object - * + * * It can be 0, but using a QObject will help in deleting this action :) * \param szName Internal name of this action, in form [module.]name * \param szVisibleName Permanent visible name, visible at least in the action drawer @@ -148,7 +148,7 @@ public: /** * \brief Constructs the action object * \param pParent The parent object - * + * * It can be 0, but using a QObject will help in deleting this action :) * \param szName Internal name of this action, in form [module.]name * \param szVisibleName Permanent visible name, visible at least in the action drawer @@ -330,7 +330,7 @@ protected: public slots: /** * \brief Activates the action - * + * * It's called when the user activates the action clicking on the toolbar, the menu or by * hitting its shortcut. * \return void @@ -339,7 +339,7 @@ public slots: protected slots: /** * \brief Removes the action from the list - * + * * Called when the action is being destroyed * \return void */ @@ -347,7 +347,7 @@ protected slots: /** * \brief Reloads the images - * + * * Called when the application wants to refresh the images in the toolbar * \return void */ @@ -355,9 +355,9 @@ protected slots: /** * \brief Enables or disables the action upon checking the active context - * + * * If the context doesn't exist, the action is disabled - * + * * Called when the frame changes the active context. * \note It works only if NeedsContext is specified * \return void @@ -366,7 +366,7 @@ protected slots: /** * \brief Enables or disables the action upon checking the active context - * + * * Called when the frame changes the state of the context * \return void */ @@ -374,7 +374,7 @@ protected slots: /** * \brief Enables or disables the action upon checking the active window - * + * * Called when the frame changes the active window. * \return void */ @@ -382,7 +382,7 @@ protected slots: /** * \brief Enables or disables the action upon checking the active window - * + * * Called when the frame changes the active window. * \note We jump here ONLY if m_uFlags & WindowOnlyIfUsersSelected and thus also * m_uFlags & InternalWindowMask diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index 354f26961..11b3f2660 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -112,10 +112,10 @@ #include <QCommonStyle> #endif -#ifdef COMPILE_ON_WINDOWS +#ifdef COMPILE_ON_WINDOWS || defined(COMPILE_ON_MINGW) #include <QPluginLoader> - #if (QT_VERSION >= 0x050000) - #include <QtWinExtras> + #if (QT_VERSION >= 0x050000) + #include <QtWin> #endif #endif @@ -831,7 +831,7 @@ Let's see the scheme to understand which is choosen: KviFileUtils::writeFile(szFileName,szKNotifyConfig); } - + bKNotifyConfigFileChecked = true; } @@ -889,7 +889,7 @@ Let's see the scheme to understand which is choosen: if(!pIcon) pIcon = g_pIconManager->getSmallIcon(eIcon); - + KNotification * pNotify = 0; #if KDE_IS_VERSION(4,4,0) pNotify = new KNotification("incomingMessage",KNotification::CloseWhenWidgetActivated,this); @@ -901,7 +901,7 @@ Let's see the scheme to understand which is choosen: pNotify->setText(szText); pNotify->setActions(actions); pNotify->setPixmap(*pIcon); - pNotify->setComponentData(KComponentData(aboutData())); + pNotify->setComponentData(KComponentData(aboutData())); connect(pNotify,SIGNAL(activated()),this,SLOT(showParentFrame())); connect(pNotify,SIGNAL(action1Activated()),this,SLOT(showParentFrame())); @@ -1798,7 +1798,7 @@ void KviApplication::createFrame() Q_ASSERT(g_pMainWindow == 0); new KviMainWindow(); - + Q_ASSERT(g_pMainWindow != 0); g_pMainWindow->createNewConsole(true); diff --git a/src/kvirc/kernel/KviHtmlGenerator.cpp b/src/kvirc/kernel/KviHtmlGenerator.cpp index 7e2e26f1d..d5ec427c0 100644 --- a/src/kvirc/kernel/KviHtmlGenerator.cpp +++ b/src/kvirc/kernel/KviHtmlGenerator.cpp @@ -84,7 +84,7 @@ namespace KviHtmlGenerator uIdx++; if(uIdx >= (unsigned int)szTxt.length()) break; - + c = szTxt[(int)uIdx].unicode(); } diff --git a/src/kvirc/kernel/KviHtmlGenerator.h b/src/kvirc/kernel/KviHtmlGenerator.h index 82a0c1493..4ebde0c03 100644 --- a/src/kvirc/kernel/KviHtmlGenerator.h +++ b/src/kvirc/kernel/KviHtmlGenerator.h @@ -47,7 +47,7 @@ namespace KviHtmlGenerator Background = 100, Foreground = 101 }; - + /** * \brief Converts a raw irc message to its html equivalent text * \param szText Const reference to a message text diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index 4000693e2..cbd1959ac 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -424,7 +424,7 @@ void KviIconWidget::init() int iRows = KviIconManager::IconCount / 20; if((iRows * 20) < KviIconManager::IconCount) iRows++; - + QGridLayout * pLayout = new QGridLayout(this); int i; for(i = 0; i < 20; i++) @@ -553,7 +553,7 @@ KviIconManager::~KviIconManager() if(m_pIconWidget) delete m_pIconWidget; - + int i; for(i=0; i < KviIconManager::IconCount; i++) @@ -1087,7 +1087,7 @@ QPixmap * KviIconManager::getImage(const QString & szId, bool bCanBeNumber, QStr iIdx = getSmallIconIdFromName(szTmp.trimmed()); if(iIdx >= 0) return getSmallIcon(iIdx % KviIconManager::IconCount); - + } } } diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h index 1bdedfeda..fb9f3fdd7 100644 --- a/src/kvirc/kernel/KviIconManager.h +++ b/src/kvirc/kernel/KviIconManager.h @@ -143,7 +143,7 @@ public: /** * \class KviIconManager * \brief This class manages the images used by KVIrc. -* +* * We handle three types of images: builtin small icons, builtin big icons and generic images. * The builtin small icons are in the pics/coresmall directory (this is to optimize the directory * size since it's a linear search...), are 16x16 in size and are indexed by numbers in a way that @@ -511,7 +511,7 @@ public: * scripts or popups * \param pRetPath Holds the path of the image * \warning Don't store this pointer! - * + * * \return QPixmap * */ QPixmap * getImage(const QString & szId, bool bCanBeNumber = true, QString * pRetPath = 0); diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp index 9d471ede7..5faa32592 100644 --- a/src/kvirc/kernel/KviIrcConnection.cpp +++ b/src/kvirc/kernel/KviIrcConnection.cpp @@ -202,7 +202,7 @@ void KviIrcConnection::setEncoding(const QString & szEncoding) q->output(KVI_OUT_VERBOSE,__tr2qs("Changed text encoding to %Q"),&szTmp); } } - + m_pSrvCodec = c; m_pTextCodec = c; m_pConsole->setTextEncoding(szEncoding); @@ -1458,7 +1458,7 @@ void KviIrcConnection::loginToIrcServer() } m_pUserInfo->setUserName(szTmpUser); - + // Nick if(pServer->reconnectInfo()) szTmpNick=pServer->reconnectInfo()->m_szNick; @@ -1467,7 +1467,7 @@ void KviIrcConnection::loginToIrcServer() m_pStateData->setLoginNickNameState(KviIrcConnectionStateData::UsedConnectionSpecificNickName); QString szChoiceDescription; - + if(!szTmpNick.isEmpty()) { szChoiceDescription = __tr2qs("connection specific"); @@ -1481,10 +1481,10 @@ void KviIrcConnection::loginToIrcServer() QString szOut = __tr2qs("Using '%1' as nickname").arg(szTmpNick); if(_OUTPUT_VERBOSE) szOut += QString::fromLatin1(" (%1)").arg(szChoiceDescription); - + m_pConsole->outputNoFmt(KVI_OUT_VERBOSE,szOut); } - + m_pUserInfo->setNickName(szTmpNick); // Real name @@ -1511,7 +1511,7 @@ void KviIrcConnection::loginToIrcServer() { szTmpPass=pServer->reconnectInfo()->m_szPass; } - + if(!szTmpPass.isEmpty()) { if(!_OUTPUT_MUTE) @@ -1540,7 +1540,7 @@ void KviIrcConnection::loginToIrcServer() } } } - + m_pUserInfo->setPassword(szTmpPass); // Check for identity profiles @@ -1556,7 +1556,7 @@ void KviIrcConnection::loginToIrcServer() QByteArray szUser = encodeText(m_pUserInfo->userName()); // never empty QByteArray szReal = encodeText(m_pUserInfo->realName()); // may be empty QByteArray szPass = encodeText(m_pUserInfo->password()); // may be empty - + if(!szReal.data())szReal = ""; if(!szPass.data())szReal = ""; @@ -1794,7 +1794,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) // join saved channels - + // FIXME: It should be possible to delay the channel join process after identification // (or maybe just delay by a fixed amount ?) // (or maybe retry joining after a while ?) @@ -1803,7 +1803,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) // There is no standard for this purpose. We might look at a special NOTICE by NickServ // but the format is not well defined and we would need to make it user configurable. // Not very reliable, actually :/ - + QString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; if(!(m_pStateData->commandToExecAfterConnect().isEmpty())) @@ -1813,7 +1813,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) } bool bJoinStdChannels=true; - + if(target()->server()->reconnectInfo()) { if(!target()->server()->reconnectInfo()->m_szJoinChannels.isEmpty()) @@ -1850,7 +1850,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) } target()->server()->clearReconnectInfo(); } - + if(bJoinStdChannels) { if(target()->network()->autoJoinChannelList()) diff --git a/src/kvirc/kernel/KviIrcConnectionRequestQueue.h b/src/kvirc/kernel/KviIrcConnectionRequestQueue.h index 53102c3cb..afed73e1e 100644 --- a/src/kvirc/kernel/KviIrcConnectionRequestQueue.h +++ b/src/kvirc/kernel/KviIrcConnectionRequestQueue.h @@ -53,7 +53,7 @@ public: * \return KviIrcConnectionRequestQueue */ KviIrcConnectionRequestQueue(); - + /** * \brief Destroys the request queue objects */ @@ -73,7 +73,7 @@ protected: QuietBan = 4, /**< Quiet ban request */ Ban = 5 /**< Ban request */ }; - + QQueue<KviChannelWindow *> m_channels; QTimer m_timer; RequestTypes m_curType; @@ -84,7 +84,7 @@ public: * \return void */ void enqueueChannel(KviChannelWindow * pChan); - + /** * \brief Removes the channel from the queue stack * \param pChan The channel to dequeue diff --git a/src/kvirc/kernel/KviIrcConnectionStateData.h b/src/kvirc/kernel/KviIrcConnectionStateData.h index 284159c72..4b9f6e9d9 100644 --- a/src/kvirc/kernel/KviIrcConnectionStateData.h +++ b/src/kvirc/kernel/KviIrcConnectionStateData.h @@ -85,7 +85,7 @@ protected: /// Note that in this case the STARTTLS support wasn't detected by a previous CAP LS /// (which wasn't sent at all). /// - bool m_bInsideInitialStartTls; + bool m_bInsideInitialStartTls; bool m_bIgnoreOneYouHaveNotRegisteredError; // true if we have sent a CAP LS request followed by a PING which will generate an error (and we need to ignore it) bool m_bInsideInitialCapReq; // true if there's a CAP REQ request pending bool m_bInsideAuthenticate; // true if there's a AUTHENTICATE request pending diff --git a/src/kvirc/kernel/KviIrcConnectionTarget.h b/src/kvirc/kernel/KviIrcConnectionTarget.h index d4d0699bb..5549e862e 100644 --- a/src/kvirc/kernel/KviIrcConnectionTarget.h +++ b/src/kvirc/kernel/KviIrcConnectionTarget.h @@ -57,22 +57,22 @@ public: { return m_pServer; } - + KviIrcNetwork * network() { return m_pNetwork; } - + KviProxy * proxy() { return m_pProxy; } - + const QString & bindAddress() { return m_szBindAddress; } - + bool hasBindAddress() { return (!m_szBindAddress.isEmpty()); diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp index b2cd6c495..7f25d4379 100644 --- a/src/kvirc/kernel/KviIrcContext.cpp +++ b/src/kvirc/kernel/KviIrcContext.cpp @@ -456,7 +456,7 @@ void KviIrcContext::connectToCurrentServer() m_pConsole->outputNoFmt(KVI_OUT_SYSTEMWARNING,__tr2qs("This is the first connection in this IRC context: using the global server setting")); } } - + if(!m_pAsynchronousConnectionData->szServer.isEmpty()) { // !m_pAsynchronousConnectionData->szServer.isEmpty() diff --git a/src/kvirc/kernel/KviIrcLink.cpp b/src/kvirc/kernel/KviIrcLink.cpp index 75eee7df6..7e0707746 100644 --- a/src/kvirc/kernel/KviIrcLink.cpp +++ b/src/kvirc/kernel/KviIrcLink.cpp @@ -329,13 +329,13 @@ void KviIrcLink::clearOutputQueue(bool bPrivateMessagesOnly) { if(!m_pSocket) return; // we have no queue at all - + if(m_pLinkFilter) { m_pLinkFilter->clearOutputQueue(bPrivateMessagesOnly); return; } - + m_pSocket->clearOutputQueue(bPrivateMessagesOnly); } diff --git a/src/kvirc/kernel/KviIrcSocket.h b/src/kvirc/kernel/KviIrcSocket.h index 454ace0e9..bb6e29940 100644 --- a/src/kvirc/kernel/KviIrcSocket.h +++ b/src/kvirc/kernel/KviIrcSocket.h @@ -235,7 +235,7 @@ public: * \return bool */ bool getLocalHostIp(QString & szIp, bool bIPv6); - + /** * \brief Clears the output queue * \param bPrivateMessagesOnly Whether to clear only private messages diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp index 4315641b1..60f6758e6 100644 --- a/src/kvirc/kernel/KviIrcUrl.cpp +++ b/src/kvirc/kernel/KviIrcUrl.cpp @@ -241,7 +241,7 @@ int KviIrcUrl::run(const QString& text, int contextSpec, KviConsoleWindow* pCons contextSpec = FirstFreeContext; } } - + if(contextSpec & TryEveryContext) { KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict); @@ -253,7 +253,7 @@ int KviIrcUrl::run(const QString& text, int contextSpec, KviConsoleWindow* pCons if(wnd->type() == KviWindow::Console) { pTmpConsole = (KviConsoleWindow *) wnd; - + if(pTmpConsole->connection()) { KviIrcServer* server = pTmpConsole->connection()->target()->server(); @@ -269,14 +269,14 @@ int KviIrcUrl::run(const QString& text, int contextSpec, KviConsoleWindow* pCons } } } - + ++it; } - + if(!pConsole) contextSpec = FirstFreeContext; } - + if(contextSpec & FirstFreeContext) { if(pConsole) diff --git a/src/kvirc/kernel/KviLagMeter.cpp b/src/kvirc/kernel/KviLagMeter.cpp index ca1797687..b0fdfef60 100644 --- a/src/kvirc/kernel/KviLagMeter.cpp +++ b/src/kvirc/kernel/KviLagMeter.cpp @@ -53,14 +53,14 @@ KviLagMeter::KviLagMeter(KviIrcConnection * c) m_tFirstOwnCheck = 0; m_bOnAlarm = false; m_pDeletionSignal = 0; - + // FIXME: We could use the KviIrcConnection::heartbeat() here! if(KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat) < 2000) KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat) = 2000; // kinda absurd if(KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat) > 10000) KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat) = 10000; // kinda absurd - + startTimer(KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat)); // 5 seconds by default } @@ -88,7 +88,7 @@ void KviLagMeter::timerEvent(QTimerEvent *) g_pMainWindow->childConnectionLagChange(m_pConnection); KviCString szLag(KviCString::Format,"%u",m_uLag); - + bool bDeletionSignal = false; m_pDeletionSignal = &bDeletionSignal; @@ -98,7 +98,7 @@ void KviLagMeter::timerEvent(QTimerEvent *) m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); if(bDeletionSignal)return; // killed, probably by a quit -f -u m_bOnAlarm = true; - } else if(m_bOnAlarm) + } else if(m_bOnAlarm) { KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagAlarmTimeDown, m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); @@ -223,7 +223,7 @@ bool KviLagMeter::lagCheckComplete(const char * key) unsigned int uLag = ((tv.tv_sec - c->lSecs) * 1000); if(tv.tv_usec < c->lUSecs)uLag -= ((c->lUSecs - tv.tv_usec) / 1000); else uLag += ((tv.tv_usec - c->lUSecs) / 1000); - + // now check the reliability if(m_uLastReliability > c->uReliability) @@ -243,7 +243,7 @@ bool KviLagMeter::lagCheckComplete(const char * key) m_uLastReliability = c->uReliability; m_pCheckList->removeFirst(); - + return true; } diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 015d277a6..81648dab7 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -188,7 +188,7 @@ void KviNotifyListManager::notifyOnLine(const QString & szNick, const QString & } ++it; } - + QString szFmt = __tr2qs("%1 is on IRC"); if(szMsg.isEmpty()) diff --git a/src/kvirc/kernel/KviSSLMaster.cpp b/src/kvirc/kernel/KviSSLMaster.cpp index 8891151c2..99d4fdc9a 100644 --- a/src/kvirc/kernel/KviSSLMaster.cpp +++ b/src/kvirc/kernel/KviSSLMaster.cpp @@ -187,7 +187,7 @@ KVIRC_API void freeSSL(KviSSL * s) KVIRC_API bool getSSLCertInfo(KviSSLCertificate * pCert, QString szQuery, QString szOptionalParam, KviKvsVariant * pRetBuffer) { pRetBuffer->setString(""); - + if(szQuery.compare("signatureType")==0) { pRetBuffer->setString(pCert->signatureType()); @@ -306,7 +306,7 @@ KVIRC_API bool getSSLCertInfo(KviSSLCertificate * pCert, QString szQuery, QStrin pRetBuffer->setString(pCert->fingerprintContents(szOptionalParam)); return true; } - + // the warning is displayed in the caller return false; } diff --git a/src/kvirc/kernel/KviSSLMaster.h b/src/kvirc/kernel/KviSSLMaster.h index 357f90313..0d51e2aa3 100644 --- a/src/kvirc/kernel/KviSSLMaster.h +++ b/src/kvirc/kernel/KviSSLMaster.h @@ -43,7 +43,7 @@ namespace KviSSLMaster extern KVIRC_API KviSSL * allocSSL(KviWindow * wnd,kvi_socket_t sock,KviSSL::Method m,const char * contextString = 0); extern KVIRC_API void freeSSL(KviSSL * s); - + extern KVIRC_API bool getSSLCertInfo(KviSSLCertificate * pCert, QString szQuery, QString szOptionalParam, KviKvsVariant * pRetBuffer); } diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp index eb412a9b1..c228e9108 100644 --- a/src/kvirc/kernel/KviTheme.cpp +++ b/src/kvirc/kernel/KviTheme.cpp @@ -58,7 +58,7 @@ bool KviThemeInfo::load(const QString &szThemeFileName,bool bBuiltin) { m_bBuiltin = bBuiltin; m_szSubdirectory = szThemeFileName; - + QString szThemePath; getCompleteDirPath(szThemePath); diff --git a/src/kvirc/kvs/KviKvsAliasManager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp index 0745ce70a..9f8d51cc1 100644 --- a/src/kvirc/kvs/KviKvsAliasManager.cpp +++ b/src/kvirc/kvs/KviKvsAliasManager.cpp @@ -66,7 +66,7 @@ void KviKvsAliasManager::add(const QString &szName,KviKvsScript * pAlias) { // This piece of code, when inlined by gcc (i.e, placed in a header), // shows an interesting problem. - + // KviKvsPointerHashTable<>::replace() is a template and is likely to be inlined too. // The internals of replace() use another template called KviKvsPointerHashTableEntry<>. // When this function is called from a dynamically loaded shared library @@ -82,17 +82,17 @@ void KviKvsAliasManager::add(const QString &szName,KviKvsScript * pAlias) // of /usr/local/lib/kvirc/4.0/modules/libkvialiaseditor.so <-- inside the module // // while the correct vtable (the one that appears when the add() function is called from somewhere else) is - // + // //(gdb) info symbol 0x6bc210 // vtable for KviPointerList<KviPointerHashTableEntry<QString, KviKvsScript> > + 16 in section .rodata // of /usr/local/bin/kvirc <-- inside the executable - // + // // This is a linkage problem. Either caused by gcc itself, or maybe wrong flags // passed by the cmake generated Makefiles. Gcc should notice that the symbol is already defined // inside the executable and use that one instead. - // + // // So finally, we can't inline this. - + // The bad news is that this problem may pop up also in other pieces of code... m_pAliasDict->replace(szName,pAlias); emit aliasRefresh(szName); diff --git a/src/kvirc/kvs/KviKvsArray.h b/src/kvirc/kvs/KviKvsArray.h index 2172b4e39..09cfe1813 100644 --- a/src/kvirc/kvs/KviKvsArray.h +++ b/src/kvirc/kvs/KviKvsArray.h @@ -51,7 +51,7 @@ public: /** * \brief Constructs the array data - * + * * This is a carbon copy * \param array The array to copy from * \return KviKvsArray @@ -91,7 +91,7 @@ public: /** * \brief Returns the element at the given index - * + * * If the element doesn't exists, it returns an empty element. If the index is out of * array bounds, it increases the array size, fillin the array in with zeros. * \param uIdx The index of the element to retrieve diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp index cee01f919..64ce97943 100644 --- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp @@ -191,7 +191,7 @@ namespace KviKvsCoreCallbackCommands Any alias without the "<name>::" prefix is created in the root namespace. Namespaces are useful to avoid collisions in alias names between scripts. Only really common aliases should be created - in the root namespace - all of the internal functionality of your + in the root namespace - all of the internal functionality of your scripts should be hidden in your own namespace. @examples: [example] diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index 4f4783eb8..ba45d8357 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -514,7 +514,7 @@ namespace KviKvsCoreFunctions { QString szQuery; QString szParam1; - + KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("query",KVS_PT_STRING,0,szQuery) KVSCF_PARAMETER("param1",KVS_PT_STRING,KVS_PF_OPTIONAL,szParam1) @@ -533,7 +533,7 @@ namespace KviKvsCoreFunctions KVSCF_pRetBuffer->setString(""); return true; } - + FILE * f = fopen(KVI_OPTION_STRING(KviOption_stringSSLCertificatePath).toUtf8().data(),"r"); if(!f) { @@ -544,7 +544,7 @@ namespace KviKvsCoreFunctions QString szPass = KVI_OPTION_STRING(KviOption_stringSSLCertificatePass).toUtf8(); PEM_read_X509(f, &cert, NULL, szPass.data()); - + fclose(f); if(!cert) @@ -556,7 +556,7 @@ namespace KviKvsCoreFunctions // KviSSLCertificate takes ownership of the X509 structure, no need to free it KviSSLCertificate * pCert = new KviSSLCertificate(cert); - + if(!pCert) { KVSCF_pContext->warning(__tr2qs_ctx("Error retrieving information from the local certificate","dcc")); @@ -767,7 +767,7 @@ namespace KviKvsCoreFunctions If no context matches the server and nickname, and invalid [b]IRC context ID[/b] is returned (0).[br] If <server> is an empty string, the first context that matches - the specified nickname is returned. If <nickname> is an empty string, + the specified nickname is returned. If <nickname> is an empty string, the first context that uses the specified server is returned. If both parameters are missing this function returns the id of the current IRC context, or '0' if the @@ -1132,7 +1132,7 @@ namespace KviKvsCoreFunctions // as I don't want to reimplement KTimeZone, but can't // use KTimeZone. I'll need to do some research on this. //case 'Z': // TZ abbrev. - // szFmtTime += + // szFmtTime += default: szFmtTime += szFormat.at(i); } @@ -1147,7 +1147,7 @@ namespace KviKvsCoreFunctions szFmtTime += QString("%1").arg(iVal, iLength, 10, cDiv); } } - + KVSCF_pRetBuffer->setString(szFmtTime); leavenow: @@ -1520,7 +1520,7 @@ namespace KviKvsCoreFunctions if(!szToolTip.isEmpty()) KviQString::appendFormatted(szPart,"[!txt]%Q",&szToolTip); QString szLink = QString("\r!%1\r%2\r").arg(szPart,szLinkText); - + KVSCF_pRetBuffer->setString(szLink); return true; } diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp index 08b467f0b..624eeb047 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp @@ -1075,7 +1075,7 @@ namespace KviKvsCoreFunctions static QString full_version_helper() { QString szVersion; - + szVersion = "KVIrc"; szVersion += " " KVI_RELEASE_NAME " " KVI_VERSION; szVersion += ", revision: "; @@ -1084,7 +1084,7 @@ namespace KviKvsCoreFunctions szVersion += KviBuildInfo::buildSourcesDate(); szVersion += ", built on: "; szVersion += KviBuildInfo::buildDate(); - + return szVersion; } diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp index 73b4f5cdd..97012eb60 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp @@ -179,14 +179,14 @@ namespace KviKvsCoreSimpleCommands } int iCurModeChangesPerLine = iMaxModeChangesPerLine; - + // Calculate the max number of available characters in a MODE command // 512 (max) - 2 (cr, lf) - 4 (MODE) - 3 (spaces) - 1 (plus/minus) // since we already know the channel name, take it in account, too const int iMaxCharsPerLine = 502 - szTarget.size(); int iCurCharsPerLine = iMaxCharsPerLine; - + for(QStringList::Iterator it = sl.begin();it != sl.end();++it) { QByteArray szTxt = KVSCSC_pConnection->encodeText(*it); @@ -200,7 +200,7 @@ namespace KviKvsCoreSimpleCommands szMessage += " "; iCurCharsPerLine--; } - + szMessage += szTxt; iCurCharsPerLine-=szTxt.size(); @@ -209,7 +209,7 @@ namespace KviKvsCoreSimpleCommands { if(!KVSCSC_pConnection->sendFmtData("MODE %s %c%s %s",szTarget.data(),plusminus,szFlags.data(),szMessage.data())) return KVSCSC_pContext->warningNoIrcConnection(); - + // move back the iterator by one position // WARNING: this could lead to an infinite loop if a single specified mode // change is longer than iMaxCharsPerLine diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp index 2a8509076..ef9dfe7d0 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp @@ -386,7 +386,7 @@ namespace KviKvsCoreSimpleCommands ctl.bell_pitch = st.bell_pitch; ctl.bell_duration = st.bell_duration; ctl.bell_percent = st.bell_percent; - + XChangeKeyboardControl(get_xdisplay(),mask,&ctl); #endif //COMPILE_X11_SUPPORT diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp index dc3fecd49..944400784 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp @@ -407,7 +407,7 @@ namespace KviKvsCoreSimpleCommands { // FIXME: Write a better error message /* - The ShellExecute() function returns the value 31 if there is no association for the specified file + The ShellExecute() function returns the value 31 if there is no association for the specified file type or if there is no association for the specified action within the file type. The other possible error values are as follows: @@ -998,7 +998,7 @@ namespace KviKvsCoreSimpleCommands it is simply focused and the [text] is sent to the target.[br] This command is [doc:connection_dependant_commands]connection dependant[/doc].[br] Normally the new query windows opened with this command are created and immediately shown. - If the -i switch is specified then the windows are created either as minimized or as visible + If the -i switch is specified then the windows are created either as minimized or as visible depending on the global visibility setting specified by the boolCreateIncomingQueriesAsMinimized option. This switch should be used when automatically opening a query from a script without user intervention (as happens when the query is opened due to an incoming private message). @@ -1162,7 +1162,7 @@ namespace KviKvsCoreSimpleCommands Q_UNUSED(__pSwitches); Q_UNUSED(__pParams); Q_UNUSED(__pContext); - + if(!g_pMainWindow->isVisible()) g_pMainWindow->show(); g_pMainWindow->raise(); diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp index c9250df0d..dd7b3fbc1 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp @@ -286,7 +286,7 @@ namespace KviKvsCoreSimpleCommands d->m_pReconnectInfo = new KviIrcServerReconnectInfo(); d->m_pReconnectInfo->m_szNick = szNick; d->m_pReconnectInfo->m_szPass = szPassword; - + console->context()->setAsynchronousConnectionData(d); console->context()->connectToCurrentServer(); @@ -308,7 +308,7 @@ namespace KviKvsCoreSimpleCommands d->szBindAddress = szBindAddress; d->szPass = szPassword; d->szNick = szNick; - + d->m_pReconnectInfo = new KviIrcServerReconnectInfo(); d->m_pReconnectInfo->m_szNick = szNick; d->m_pReconnectInfo->m_szPass = szPassword; @@ -864,7 +864,7 @@ namespace KviKvsCoreSimpleCommands { return multipleModeCommand(__pContext,__pParams,__pSwitches,'-','b'); } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* @@ -1032,7 +1032,7 @@ namespace KviKvsCoreSimpleCommands QByteArray szC = KVSCSC_pConnection->encodeText(szChannel); QByteArray szO = KVSCSC_pConnection->encodeText(szOther); - + if(!KVSCSC_pConnection->sendFmtData("WHO %s %s",szC.data(),szO.data())) return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/KviKvsHash.h b/src/kvirc/kvs/KviKvsHash.h index db3d3785e..ff9b545e3 100644 --- a/src/kvirc/kvs/KviKvsHash.h +++ b/src/kvirc/kvs/KviKvsHash.h @@ -55,7 +55,7 @@ public: /** * \brief Constructs the hash data - * + * * This is a carbon copy * \param hash The hash to copy from * \return KviKvsHash @@ -93,7 +93,7 @@ public: /** * \brief Returns the element associated to the given key - * + * * If the element doesn't exists, it returns an empty element. If the index is out of * hash bounds, it increases the hash size, fillin the hash in with empty strings. * \param szKey The key of the element to retrieve diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp index ffafbb4b9..6d34ac4c0 100644 --- a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp +++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp @@ -389,13 +389,13 @@ bool KviKvsScriptAddonManager::unregisterAddon(const QString &szName,KviWindow * { QString szPath; g_pApp->getLocalKvircDirectory(szPath,KviApplication::None,szFileName); - + //qDebug("Uninstalling %s",szPath.toUtf8().data()); - + QFileInfo inf(szPath); if(!inf.exists()) continue; - + KviFileUtils::removeFile(szPath); } // FIXME: remove empty directories!! diff --git a/src/kvirc/kvs/KviKvsUserAction.cpp b/src/kvirc/kvs/KviKvsUserAction.cpp index 7f149262e..17e27a411 100644 --- a/src/kvirc/kvs/KviKvsUserAction.cpp +++ b/src/kvirc/kvs/KviKvsUserAction.cpp @@ -190,7 +190,7 @@ void KviKvsUserAction::exportToKvs( szBuffer += " (\""; szBuffer += szName; szBuffer += "\","; - + QString szTmp; if(szVisibleName.contains('$')) { diff --git a/src/kvirc/kvs/KviKvsVariant.cpp b/src/kvirc/kvs/KviKvsVariant.cpp index 3debe5b0f..5b6a03910 100644 --- a/src/kvirc/kvs/KviKvsVariant.cpp +++ b/src/kvirc/kvs/KviKvsVariant.cpp @@ -503,7 +503,7 @@ bool KviKvsVariant::asBoolean() const { if(m_pData->m_u.pString->isEmpty()) return false; - + // check integer or real values bool bOk; kvs_int_t iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); @@ -984,7 +984,7 @@ void KviKvsVariant::getTypeName(QString & szBuffer) const szBuffer = "array"; break; case KviKvsVariantData::Real: - szBuffer = "real"; + szBuffer = "real"; break; case KviKvsVariantData::Integer: szBuffer = "integer"; diff --git a/src/kvirc/kvs/KviKvsVariant.h b/src/kvirc/kvs/KviKvsVariant.h index f77d617b8..54e20c7ca 100644 --- a/src/kvirc/kvs/KviKvsVariant.h +++ b/src/kvirc/kvs/KviKvsVariant.h @@ -332,7 +332,7 @@ public: /** * \class KviKvsVariant * \brief This class defines a new data type which contains variant data -* +* * A variant data is a data which can assume different data types. This is very useful when you * don't know in advance which data type you have to manage. * \warning This class must NOT have virtual functions nor destructor otherwise it will happily @@ -350,7 +350,7 @@ public: /** * \brief Constructs the variant data - * + * * This is a carbon copy * \param variant The variant data to use as a copy * \return KviKvsVariant @@ -644,7 +644,7 @@ public: /** * \brief Casts the variant data to a number - * + * * Always evaluates to some number * \param number The string buffer to save * \return void @@ -653,7 +653,7 @@ public: /** * \brief Casts the variant data to an integer - * + * * Always evaluates to an integer * \param iVal The integer buffer to save * \return void @@ -662,7 +662,7 @@ public: /** * \brief Casts the variant data to an array - * + * * Always evaluates to an array * \param pCast The array buffer to save * \return void @@ -754,7 +754,7 @@ public: /** * \brief Compares two variants - * + * * Returns -1 if this variant is greater than the other, 0 if they are equal, 1 if the * other is greater. * If bPreferNumeric is true then a conversion to a numeric format is first attempted diff --git a/src/kvirc/kvs/KviKvsVariantList.cpp b/src/kvirc/kvs/KviKvsVariantList.cpp index 69398c17e..18c0a6729 100644 --- a/src/kvirc/kvs/KviKvsVariantList.cpp +++ b/src/kvirc/kvs/KviKvsVariantList.cpp @@ -178,7 +178,7 @@ KviKvsVariantList::KviKvsVariantList(QStringList * pSL) m_pList->setAutoDelete(true); if(!pSL) return; - + foreach(QString pS, *pSL) m_pList->append(new KviKvsVariant(new QString(pS))); } diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp index 103c7296a..ac2d11d26 100644 --- a/src/kvirc/kvs/object/KviKvsObject.cpp +++ b/src/kvirc/kvs/object/KviKvsObject.cpp @@ -582,7 +582,7 @@ Starts a builtin timer for this object and returns its timer id as a string or '-1' if <timeout> was invalid. The [classfnc]$timerEvent[/classfnc]() handler function - will be called every <timeout> milliseconds until the timer is stopped by $killTimer(). + will be called every <timeout> milliseconds until the timer is stopped by $killTimer(). !fn: $killTimer(<timer id>) Stops the timer specified by <timer id>. !fn: $className() @@ -607,7 +607,7 @@ triggered directly or from a signal emission. !fn: $signalName() Returns the name of the last signal that has triggered one of this object's slots. - When called in a slot handler, the triggering signal name is returned. + When called in a slot handler, the triggering signal name is returned. !fn: $property(<Qt property name>[,bNowarning:boolean]) This is for really advanced scripting.[br] All KVIrc widgets are based on the Qt library ones.[br] diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.cpp b/src/kvirc/kvs/object/KviKvsObjectClass.cpp index 6b35674a3..d29d045b8 100644 --- a/src/kvirc/kvs/object/KviKvsObjectClass.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectClass.cpp @@ -160,7 +160,7 @@ KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const pObject->dieNow(); return 0; } - + if(!ret.isEmpty()) pContext->warning(__tr2qs_ctx("It's not allowed to return values in the constructor","kvs")); diff --git a/src/kvirc/kvs/object/KviKvsObjectController.cpp b/src/kvirc/kvs/object/KviKvsObjectController.cpp index 4d9105021..d3ba6621d 100644 --- a/src/kvirc/kvs/object/KviKvsObjectController.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectController.cpp @@ -95,9 +95,9 @@ void KviKvsObjectController::killAllObjectsWithClass(KviKvsObjectClass * pClass) KviPointerList< QPointer<KviKvsObject> > lDying; lDying.setAutoDelete(true); - + KviKvsObject * pObject; - + for(pObject = m_pTopLevelObjectList->first();pObject;pObject = m_pTopLevelObjectList->next()) { if(pObject->getClass() == pClass) @@ -107,7 +107,7 @@ void KviKvsObjectController::killAllObjectsWithClass(KviKvsObjectClass * pClass) pObject->killAllChildrenWithClass(pClass); } } - + for(QPointer<KviKvsObject> * pObject = lDying.first();pObject;pObject = lDying.next()) { if(pObject->isNull()) @@ -128,7 +128,7 @@ void KviKvsObjectController::clearUserClasses() lDying.append(it.current()); ++it; } - + for(KviKvsObjectClass * pDyingClass = lDying.first();pDyingClass;pDyingClass = lDying.next()) { if(!m_pClassDict->findRef(pDyingClass)) diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp index b519a71cc..824130415 100644 --- a/src/kvirc/kvs/parser/KviKvsParser.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser.cpp @@ -771,7 +771,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer kb spammer You're not welcome here! [/example] This will first execute "ban spammer" and then "kick spammer You're not welcome here". - Our kb is a really simple example... it doesn't check for the validity of the parameters - + Our kb is a really simple example... it doesn't check for the validity of the parameters - the server will warn us if the parameters passed to kb were empty. [/p] [p] @@ -792,9 +792,9 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [cmd]kick[/cmd] $0 %reason } [/example] - The example above will first check the validity of the <nickname> passed to kb - + The example above will first check the validity of the <nickname> passed to kb - if no nickname was passed, it will warn the user and stop. - The next step will be the "ban <nickname>" call. Another enchancement is the "default reason" - + The next step will be the "ban <nickname>" call. Another enchancement is the "default reason" - we first assign the remaining parameters ($1- means "from $1 to the end") to a temporary variable, and if the variable is empty, a default kick reason is assigned. Finally the "kick <nickname> <reason>" will be executed. @@ -803,11 +803,11 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/p] [p] Aliases can be used as a means for structured programming. - In large scripts you will SURELY have "common tasks" to perform (like having + In large scripts you will SURELY have "common tasks" to perform (like having specially-colored output or calculating a value from a set of other values)... Aliases are the way of writing the common tasks - they are equivalent to the "procedures" or "functions" in many high-level programming languages. - The alias as a procedure (subroutine or sub-task) has been shown in the "kb" example above - + The alias as a procedure (subroutine or sub-task) has been shown in the "kb" example above - it might be commonly called from more complex scripts or other aliases in the case that a kick & ban action is needed. [/p] @@ -838,7 +838,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] The above is a perfectly valid call.... however there will be no visible results (because a command call implies ignoring the return value. - In fact there is no difference at all between function-aliases and normal-aliases - + In fact there is no difference at all between function-aliases and normal-aliases - the caller makes the difference. By calling an alias as a command, the return value just disappears into hyperspace, however if you call an alias as a function, the return value is propagated (and in fact "used"). @@ -1314,26 +1314,26 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer be expressed in the classic format [major].[minor].[pathlevel] or something really similar (in fact KVIrc just expects the version to be a string composed of numbers separated by dots). The version is compared when an addon is - installed and KVIrc complains if the user tries to downgrade an addon (that is + installed and KVIrc complains if the user tries to downgrade an addon (that is to install a less recent version over a more recent one). The third parameter is the visible name of your addon: it will be displayed to the user in the addon management dialog. It can contain the [fnc]$tr[/fnc] function so you can have it translated to several languages. The fourth parameter - is a short description of the feature that the addon implements; it can + is a short description of the feature that the addon implements; it can contain the $tr() function too. The fifth parameter is the minimal KVIrc version required to run the addon. The sixth parameter is the icon to show in - the manager: it has to be 32x32 pixel big. There are also some switches that + the manager: it has to be 32x32 pixel big. There are also some switches that can be used to fiddle a little bit more :) [/p] [p] The callback instruction that follows the registration command is the uninstallation code. KVIrc will invoke it when the user will ask for your addon to be uninstalled. Don't assume that your addon will be never - uninstalled: sooner or later it will be. For example, when upgrading an addon + uninstalled: sooner or later it will be. For example, when upgrading an addon KVIrc will first uninstall the existing version and after that install the new one. The uninstallation process is a very important requisite for any program (in any programming language). In the example above there is nothing to - uninstall (yet) so the callback code is empty, but if you continue reading we + uninstall (yet) so the callback code is empty, but if you continue reading we will soon fill it. To uninstall all files which are not automatically spotted by the installation process, you need to write an alias which handles them. @@ -1410,13 +1410,13 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [example] [comment]# Register classes[/comment] MyAddon::classes::register - + [comment]# Initialize events[/comment] MyAddon::events::init - + [comment]# Load configuration[/comment] MyAddon::config::load - + [comment]# Setup popups[/comment] defpopup("MyAddon") { @@ -1425,7 +1425,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer ... } } - + [comment]# Set options[/comment] option boolAutoAcceptDccSend 1 option boolShowMinimizedDebugWindow 1 @@ -1439,10 +1439,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [example] [comment]# A class which handles a database[/comment] MyAddon_classes_database.kvs - + [comment]# A class which handles the options of our addon in a GUI[/comment] MyAddon_classes_gui_options.kvs - + [comment]# A script containing some logging functions[/comment] MyAddon_functions_logging.kvs [/example] @@ -1458,7 +1458,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer extension. [/p] [p] - The "[b]pics[/b]" and "[b]sound[/b]" (if relevant) directories should contain + The "[b]pics[/b]" and "[b]sound[/b]" (if relevant) directories should contain your multimedia files. I's a good idea to have your pics file in PNG format and sound files in WAV format. [/p] @@ -1486,7 +1486,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer MyAddon::classes::gui::options, \ ... ) - + [comment]# Scan the array and register the classes[/comment] for(%i=0; %i < [fnc]$length[/fnc](%classes[]); %i++) { @@ -1497,7 +1497,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [cmd]eval[/cmd] %classes[%i] } } - + [comment]# Initialize events[/comment] alias(MyAddon::events::init) { @@ -1514,7 +1514,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer ... } } - + [comment]# Load configuration[/comment] alias(MyAddon::config::load) { @@ -1523,15 +1523,15 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer { MyAddon::classes::register } - + [comment]# Sets some variables[/comment] %MyAddonConfig = [fnc]$new[/fnc](MyAddon::classes::ConfHandler) %MyAddonConfigPath = [fnc]$file.localdir[/fnc](config/scripts/MyAddon) - + [comment]# Open the configuration file and sets the section "general"[/comment] %c = [fnc]$config.open[/fnc](%MyAddonConfigPath/MyAddon.kvc,"r") [cmd]config.setsection[/cmd] %c general - + [comment]# Store the value of the key "Key" in the global variable %Key[/comment] %Key = [fnc]$config.read[/fnc](%c,"Key",2) ... @@ -2513,7 +2513,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) if(!r)return 0; } else { // this is @ - + static QString szStrayAtRoutineName("@"); static QString szMightBeStrayAtOrThisRoutineName("@?"); diff --git a/src/kvirc/kvs/parser/KviKvsParser_lside.cpp b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp index 73dc307cf..413c773df 100644 --- a/src/kvirc/kvs/parser/KviKvsParser_lside.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp @@ -426,7 +426,7 @@ end_of_the_param: [b]<target> <+ <right_operand>[/b][br] [br] If <right_operand> is a scalar then it is appended to <target>, - otherwise the constituent items of the array or values of the hash are appended. + otherwise the constituent items of the array or values of the hash are appended. @seealso: [doc:operators]Operators[/doc] */ @@ -471,7 +471,7 @@ end_of_the_param: <search pattern> may contain parentheses to capture parts of the matched text. <replacement string> can contain the escape sequences \\N where N is a number between 1 and 9 to be replaced by the captured text.[br] - Please note that you need to double the backslashes in the search pattern + Please note that you need to double the backslashes in the search pattern since the KVS parser will first unquote the string and then pass it to the regexp engine. That's also why we use \\N and not \N.[br] \\0 is a special escape that will be replaced by the entire match (is always valid!).[br] diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp index 94db8d7b2..bb7a66b08 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp @@ -341,7 +341,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c) if(!bWasAlreadyThere)KviKvsPopupManager::instance()->remove(szName); return false; } - + KviKvsPopupManager::instance()->emitRefresh(szName); return true; } diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp index b021e715f..08550887b 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp @@ -115,7 +115,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) idx++; continue; } - + } delete v; // we're done with it for this iteration @@ -156,7 +156,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) KviKvsRWEvaluationResult * v = m_pIterationVariable->evaluateReadWrite(c); if(!v) return false; - + if(bIncludeEmptyScalars || (!pOne->isEmpty())) { v->result()->copyFrom(*pOne); diff --git a/src/kvirc/module/KviModule.h b/src/kvirc/module/KviModule.h index fdb979d55..2f04a850e 100644 --- a/src/kvirc/module/KviModule.h +++ b/src/kvirc/module/KviModule.h @@ -44,7 +44,7 @@ template<typename Key,typename T> class KviPointerHashTable; #define KVIMODULEEXPORT extern "C" __declspec(dllexport) __attribute__((visibility("default"))) #else #define KVIMODULEEXPORT extern "C" __declspec(dllexport) - #endif + #endif #define KVIMODULEEXPORTDATA KVIMODULEEXPORT #define KVIMODULEEXPORTFUNC KVIMODULEEXPORT #else diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp index 83115667e..b7173e394 100644 --- a/src/kvirc/module/KviModuleManager.cpp +++ b/src/kvirc/module/KviModuleManager.cpp @@ -215,7 +215,7 @@ bool KviModuleManager::loadModule(const QString &modName) KviModule * module = new KviModule(pLibrary,info,modName,szName.toUtf8().data()); // the module is probably up.. the only thing can fail is the init_routine now - + // load the message catalogue if any if(info->szModuleContext) { @@ -231,7 +231,7 @@ bool KviModuleManager::loadModule(const QString &modName) KviLocale::instance()->loadCatalogue(info->szModuleContext,szDir); } } - + if(info->init_routine) { if(!((info->init_routine)(module))) diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp index 9252b2e35..1d3890166 100644 --- a/src/kvirc/sparser/KviAntiSpam.cpp +++ b/src/kvirc/sparser/KviAntiSpam.cpp @@ -28,10 +28,10 @@ #include "KviOptions.h" //[05:10:48] <Nataly19> :2http://www.extrababes.com5Go ahead punk, make my day ! -//[05:11:04] <treeman> :-`` -= for mp3's go to http://members.xoom.com/treemansmp3/start.htm -// =- ```- +//[05:11:04] <treeman> :-`` -= for mp3's go to http://members.xoom.com/treemansmp3/start.htm +// =- ```- //[05:10:51] <Suzi48498>:P*** **** squirms like CRAZY when **** licks between her ... -//[05:12:11] <dea_> :Hi my name is **** and I just posted pics of myself and +//[05:12:11] <dea_> :Hi my name is **** and I just posted pics of myself and // other hot girls on my website at http://133.16.114.32/~guest/ // tell me what you think! //[15:18:37] <JuL|aN^bZ> Join #Teens4eva...Have Fun PPl!!! diff --git a/src/kvirc/sparser/KviIrcNumericCodes.h b/src/kvirc/sparser/KviIrcNumericCodes.h index 433ea19b5..71afea010 100644 --- a/src/kvirc/sparser/KviIrcNumericCodes.h +++ b/src/kvirc/sparser/KviIrcNumericCodes.h @@ -381,7 +381,7 @@ #define RPL_ENDOFSPAMFILTERLIST 940 // <nick> <channel> :End of channel spamfilter list #define RPL_SPAMFILTERLIST 941 // <nick> <channel> <spamfilter> - + ///* 303 */ RPL_ISON, ":", ///* 304 */ RPL_TEXT, (char *)NULL, ///* 305 */ RPL_UNAWAY, ":You are no longer marked as being away", diff --git a/src/kvirc/sparser/KviIrcServerParser.h b/src/kvirc/sparser/KviIrcServerParser.h index 6740fce75..847559ed5 100644 --- a/src/kvirc/sparser/KviIrcServerParser.h +++ b/src/kvirc/sparser/KviIrcServerParser.h @@ -232,7 +232,7 @@ private: void parseUserMode(KviIrcMessage *msg,const char * modeflptr); void parseLiteralCap(KviIrcMessage * msg); void parseLiteralAuthenticate(KviIrcMessage * msg); - + void parseCtcpRequest(KviCtcpMessage *msg); void parseCtcpReply(KviCtcpMessage *msg); void echoCtcpRequest(KviCtcpMessage *msg); @@ -263,7 +263,7 @@ private: void parseNumericSaslSuccess(KviIrcMessage * msg); void parseNumericSaslLogin(KviIrcMessage * msg); void parseNumericSaslFail(KviIrcMessage * msg); - + public: static void encodeCtcpParameter(const char * param,KviCString &buffer,bool bSpaceBreaks = true); static void encodeCtcpParameter(const char * param,QString &buffer,bool bSpaceBreaks = true); diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index bb24e87b0..af9db2f9e 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -1595,7 +1595,7 @@ void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg) { if(!msg->haltOutput()) console->output(KVI_OUT_NICK,__tr2qs("You have changed your nickname to %Q"),&szNewNick); - + // just update all the captions : we have changed OUR nick for( KviQueryWindow * q = console->connection()->queryList()->first(); diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp index 3f7628479..dcc819815 100644 --- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp @@ -226,12 +226,12 @@ void KviIrcServerParser::parseNumeric005(KviIrcMessage *msg) * EXCEPTS -> supports channels mode e (ban exception): we already use CHANMODES to handle that * INVEX -> supports channels mode I (invite exception): we already use CHANMODES to handle that * MAXCHANNELS -> Maximum number of channels allowed to join. (deprecated by CHANLIMIT, eg: MAXCHANNELS=10) - * CHANLIMIT -> Maximum number of channels allowed to join by channel prefix (eg: CHANLIMIT=#&!+:10) + * CHANLIMIT -> Maximum number of channels allowed to join by channel prefix (eg: CHANLIMIT=#&!+:10) * NICKLEN -> Maximum nickname length * MAXBANS -> Maximum number of bans per channel (deprecated by MAXLIST, eg: MAXBANS=30) * MAXLIST -> Maximum number entries in the list per mode (eg: MAXLIST=beI:30) - * WALLCHOPS -> The server supports messaging channel operators (deprecated by STATUSMSG, eg usage: notice @#channel) - * WALLVOICES -> The server supports messaging channel voiced users (deprecated by STATUSMSG, eg usage: notice +#channel) + * WALLCHOPS -> The server supports messaging channel operators (deprecated by STATUSMSG, eg usage: notice @#channel) + * WALLVOICES -> The server supports messaging channel voiced users (deprecated by STATUSMSG, eg usage: notice +#channel) * STATUSMSG -> The server supports messaging a particular class of channel users (eg: STATUSMSG=+@) * CASEMAPPING -> Case mapping used for nick- and channel name comparing (eg: CASEMAPPING=rfc1459) * ELIST -> search extensions to list modes, like mask search, topic search, creation time search (eg: ELIST=MNUCT) @@ -240,7 +240,7 @@ void KviIrcServerParser::parseNumeric005(KviIrcMessage *msg) * CHIDLEN -> Channel ID length for !channels (deprecated by IDCHAN, 5 by default, eg: CHIDLEN=5) * IDCHAN -> The ID length for channels with an ID (eg: IDCHAN=!:5) * SILENCE -> Max entires for the SILENCE command (eg: SILENCE=15) - * PENALTY -> Server gives extra penalty to some commands instead of the normal 2 seconds per message and 1 second for every 120 bytes in a message. + * PENALTY -> Server gives extra penalty to some commands instead of the normal 2 seconds per message and 1 second for every 120 bytes in a message. * FNC -> Forced nick change: the server could change the client nickname * SAFELIST -> The LIST reaply won't killl the client for excess flood. * AWAYLEN -> Maximum away message length (eg: AWAYLEN=160) @@ -251,8 +251,8 @@ void KviIrcServerParser::parseNumeric005(KviIrcMessage *msg) * MAXNICKLEN -> Max length of nick for other users (like NICKLEN, but ensures the server won't overflow it for other users) * MAXTARGETS -> Maximum targets allowed for PRIVMSG and NOTICE commands (eg: MAXTARGETS=4) * KNOCK -> KNOCK command supported - * VCHANS -> Virtual channels support - * WHOX -> The WHO command uses WHOX protocol. + * VCHANS -> Virtual channels support + * WHOX -> The WHO command uses WHOX protocol. * CALLERID -> The server supports server side ignores via the +g user mode * ACCEPT -> The server supports server side ignore (deprecated by CALLERID) * LANGUAGE -> The server supports the LANGUAGE command (experimental, eg: LANGUAGE=2,en,i-klingon) @@ -582,7 +582,7 @@ void KviIrcServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg) QString szDate; QDateTime date; date.setTime_t(t); - + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: @@ -665,7 +665,7 @@ void getDateTimeStringFromCharTimeT(QString & szBuffer, const char * time_t_stri { QDateTime date; date.setTime_t(uTime); - + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: @@ -869,7 +869,7 @@ void KviIrcServerParser::parseNumericWhoReply(KviIrcMessage *msg) } } } - + //this has to be done after the avatar part e->setRealName(szReal); } @@ -963,9 +963,9 @@ void KviIrcServerParser::parseNumericEndOfWho(KviIrcMessage *msg) void KviIrcServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) { // ops...not logged in yet... - + QString szChoiceDescriptionBuffer; - + QString szNextNick = msg->connection()->pickNextLoginNickName( false, // false = fallback to random choices, then give up with an empty string msg->connection()->decodeText(msg->safeParam(1)), @@ -997,7 +997,7 @@ void KviIrcServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) QString szOut = __tr2qs("Trying to use '%1' as nickname").arg(szNextNick); if(_OUTPUT_VERBOSE) szOut += QString::fromLatin1(" (%1)").arg(szChoiceDescriptionBuffer); - + msg->console()->outputNoFmt(KVI_OUT_NICKNAMEPROBLEM,szOut); } @@ -1381,7 +1381,7 @@ void KviIrcServerParser::parseNumericWhoisIdle(KviIrcMessage *msg) QString szTmp; QDateTime date; date.setTime_t((time_t)uTime); - + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: @@ -1485,7 +1485,7 @@ void KviIrcServerParser::parseNumericWhoisActually(KviIrcMessage *msg) QString szUserHost = msg->connection()->decodeText(msg->safeParam(2)); QString szIpAddr = msg->connection()->decodeText(msg->safeParam(3)); QString szOth = msg->connection()->decodeText(msg->safeTrailing()); - + KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(szNick); if(i) { @@ -1666,12 +1666,12 @@ void KviIrcServerParser::parseNumericChanUrl(KviIrcMessage *msg) { // 328: RPL_CHANURL // :prefix 328 target <channel> :<url> - + QString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannelWindow * chan = msg->connection()->findChannel(szChan); - + QString szUrl; - + if(chan) { szUrl = chan->decodeText(msg->safeTrailing()); @@ -1702,7 +1702,7 @@ void KviIrcServerParser::parseNumericCreationTime(KviIrcMessage *msg) UNRECOGNIZED_MESSAGE(msg,__tr2qs("Can't evaluate creation time")); return; } - + QString szDate; switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { @@ -1718,7 +1718,7 @@ void KviIrcServerParser::parseNumericCreationTime(KviIrcMessage *msg) szDate = date.toString(Qt::SystemLocaleShortDate); break; } - + if(chan) { if(!msg->haltOutput()) @@ -2122,7 +2122,7 @@ void KviIrcServerParser::parseNumericNoSuchServer(KviIrcMessage * msg) //this can be an "awhois -i" reply for a nickname that's not connected QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - + KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(szNick); if(i) { @@ -2386,7 +2386,7 @@ void KviIrcServerParser::parseNumericSaslSuccess(KviIrcMessage * msg) { // 903: RPL_SASLSUCCESS // :prefix 903 <nickname> :SASL authentication successful - + if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); diff --git a/src/kvirc/sparser/KviIrcServerParser_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp index fe8617dcb..1ec19c629 100644 --- a/src/kvirc/sparser/KviIrcServerParser_tables.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp @@ -375,7 +375,7 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]= 0, // 284 RPL_ENDOFALIST, RPL_FEATURE 0, // 285 RPL_FEATURE, RPL_CHANINFO_HANDLE 0, // 286 RPL_CHANINFO_USERS, RPL_CHKHEAD - 0, // 287 RPL_CHANINFO_CHOPS, RPL_CHANUSER + 0, // 287 RPL_CHANINFO_CHOPS, RPL_CHANUSER 0, // 288 RPL_CHANINFO_VOICES, RPL_PATCHHEAD 0, // 289 RPL_CHANINFO_AWAY, RPL_PATCHCON 0, // 290 RPL_CHANINFO_OPERS, RPL_HELPHDR, RPL_DATASTR @@ -500,7 +500,7 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]= 0, // 409 ERR_NOORIGIN 0, // 410 ERR_INVALIDCAPSUBCOMMAND 0, // 411 ERR_NORECIPIENT - 0, // 412 ERR_NOTEXTTOSEND + 0, // 412 ERR_NOTEXTTOSEND 0, // 413 ERR_NOTOPLEVEL 0, // 414 ERR_WILDTOPLEVEL 0, // 415 ERR_BADMASK @@ -806,7 +806,7 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]= 0, // 715 ERR_KNOCKDISABLED 0, // 716 RPL_TARGUMODEG 0, // 717 RPL_TARGNOTIFY - 0, // 718 RPL_UMODEGMSG + 0, // 718 RPL_UMODEGMSG 0, // 719 0, // 720 RPL_OMOTDSTART 0, // 721 RPL_OMOTD @@ -1063,7 +1063,7 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]= 0, // 972 ERR_CANNOTDOCOMMAND, ERR_CANTUNLOADMODULE 0, // 973 ERR_CANNOTCHANGEUMODE, RPL_UNLOADEDMODULE 0, // 974 ERR_CANNOTCHANGECHANMODE, ERR_CANTLOADMODULE - 0, // 975 ERR_CANNOTCHANGESERVERMODE, RPL_LOADEDMODULE + 0, // 975 ERR_CANNOTCHANGESERVERMODE, RPL_LOADEDMODULE 0, // 976 ERR_CANNOTSENDTONICK 0, // 977 ERR_UNKNOWNSERVERMODE 0, // 978 diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp index 4f266bb69..fbd8a36f8 100644 --- a/src/kvirc/ui/KviChannelWindow.cpp +++ b/src/kvirc/ui/KviChannelWindow.cpp @@ -341,8 +341,8 @@ void KviChannelWindow::getConfigGroupName(QString & szBuffer) // save per-network channel settings, so that the settings of two channels // with the same name but of different networks gets different config entries. - if(connection() && connection()->target() && - connection()->target() && + if(connection() && connection()->target() && + connection()->target() && connection()->target()->network()) { szBuffer.append("@"); @@ -375,7 +375,7 @@ void KviChannelWindow::loadProperties(KviConfigurationFile * pCfg) def.append((iWidth * 82) / 100); def.append((iWidth * 18) / 100); m_pTopSplitter->setSizes(pCfg->readIntListEntry("TopSplitter",def)); - + //this is an hack to simulate qt3's ResizeMode = Stretch for(int iWidget=0; iWidget<m_pTopSplitter->count(); iWidget++) m_pTopSplitter->setStretchFactor(iWidget,1); @@ -601,7 +601,7 @@ void KviChannelWindow::removeMasks(KviMaskEditor * pEditor, KviPointerList<KviMa } int iCurModeChangesPerLine = iMaxModeChangesPerLine; - + // Calculate the max number of available characters in a MODE command // 512 (max) - 2 (cr, lf) - 4 (MODE) - 3 (spaces) - 1 (plus/minus) // since we already know the channel name, take it in account, too @@ -619,7 +619,7 @@ void KviChannelWindow::removeMasks(KviMaskEditor * pEditor, KviPointerList<KviMa szMasks += " "; iCurCharsPerLine--; } - + szMasks += pEntry->szMask; iCurCharsPerLine-=pEntry->szMask.size(); @@ -627,7 +627,7 @@ void KviChannelWindow::removeMasks(KviMaskEditor * pEditor, KviPointerList<KviMa if(iCurModeChangesPerLine < 0 || iCurCharsPerLine < 0) { connection()->sendFmtData("MODE %s -%s %s",szTarget.data(),szFlags.data(),connection()->encodeText(szMasks).data()); - + // move back the iterator by one position // WARNING: this could lead to an infinite loop if a single specified mode // change is longer than iMaxCharsPerLine diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index c6e261812..752001e13 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -389,7 +389,7 @@ void KviConsoleWindow::showNotifyList(bool bShow, bool bIgnoreSizeChange) m_pNotifyListView->hide(); if(m_pNotifyViewButton->isChecked()) m_pNotifyViewButton->setChecked(false); - + } } diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp index d99ea8b05..62148180e 100644 --- a/src/kvirc/ui/KviCryptController.cpp +++ b/src/kvirc/ui/KviCryptController.cpp @@ -357,7 +357,7 @@ else if(bOld) szDecKey.prepend("old:"); } - + bool bRet = pEngine->init(szEncKey.ptr(),szEncKey.len(),szDecKey.ptr(),szDecKey.len()); return bRet; diff --git a/src/kvirc/ui/KviCustomToolBar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp index dc3008fb5..9f9af4a89 100644 --- a/src/kvirc/ui/KviCustomToolBar.cpp +++ b/src/kvirc/ui/KviCustomToolBar.cpp @@ -321,7 +321,7 @@ bool KviCustomToolBar::eventFilter(QObject * o,QEvent * e) pAfterAction=pTmp; break; } - + if(pTmp==g_pDraggedAction) found=true; } diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp index 8d0bc3b67..752ae157a 100644 --- a/src/kvirc/ui/KviInput.cpp +++ b/src/kvirc/ui/KviInput.cpp @@ -319,7 +319,7 @@ void KviInput::multiLineEditorButtonToggled(bool bOn) #ifdef COMPILE_ON_MAC QString tmpHelpLabel =__tr2qs("<Ctrl+Return>; submits, <Alt+Return>; hides this editor"); - tmpHelpLabel.replace(QString("Ctrl"), QString("⌘")); + tmpHelpLabel.replace(QString("Ctrl"), QString("⌘")); m_pHelpLabel->setText(tmpHelpLabel); #else m_pHelpLabel->setText(__tr2qs("<Ctrl+Return>; submits, <Alt+Return>; hides this editor")); diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index 5ba80d354..48753081e 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -153,7 +153,7 @@ KviInputEditor::~KviInputEditor() delete m_pIconMenu; delete m_pHistory; - + if(m_pUndoStack) delete m_pUndoStack; if(m_pRedoStack) @@ -243,7 +243,7 @@ QFontMetrics * KviInputEditor::getLastFontMetrics(const QFont & font) } //height calculation - + int h = qMax(g_pLastFontMetrics->height(), 14) + 2*(KVI_INPUT_MARGIN + KVI_INPUT_PADDING + KVI_INPUT_XTRAPADDING); int w = 100; QStyleOptionFrameV2 option; @@ -257,7 +257,7 @@ QFontMetrics * KviInputEditor::getLastFontMetrics(const QFont & font) QSize dummySize = style()->sizeFromContents(QStyle::CT_LineEdit, &option, QSize(w, h). expandedTo(QApplication::globalStrut()), this); - + g_iCachedHeight = dummySize.height(); return g_pLastFontMetrics; } @@ -1234,7 +1234,7 @@ void KviInputEditor::clearUndoStack() delete m_pUndoStack; m_pUndoStack = NULL; } - + if(m_pRedoStack) { delete m_pRedoStack; @@ -2000,13 +2000,13 @@ void KviInputEditor::undo() return; break; } - + if(!m_pRedoStack) { m_pRedoStack = new KviPointerList<EditCommand>; m_pRedoStack->setAutoDelete(true); } - + m_pRedoStack->append(pCommand); if(m_pRedoStack->count() > KVI_INPUT_MAX_UNDO_SIZE) m_pRedoStack->removeFirst(); // will delete it @@ -2048,13 +2048,13 @@ void KviInputEditor::redo() return; break; } - + if(!m_pUndoStack) { m_pUndoStack = new KviPointerList<EditCommand>; m_pUndoStack->setAutoDelete(true); } - + m_pUndoStack->append(pCommand); if(m_pUndoStack->count() > KVI_INPUT_MAX_UNDO_SIZE) m_pUndoStack->removeFirst(); // will delete it diff --git a/src/kvirc/ui/KviInputEditor.h b/src/kvirc/ui/KviInputEditor.h index 4d1fd4ccd..102ce65f5 100644 --- a/src/kvirc/ui/KviInputEditor.h +++ b/src/kvirc/ui/KviInputEditor.h @@ -208,7 +208,7 @@ protected: * \return void */ void setStartPosition(int iStartPosition){ m_iStartPosition = iStartPosition; } - + /** * \brief Returns the start position * \return int @@ -220,7 +220,7 @@ protected: * \param szText The text to set */ void setText(const QString & szText){ m_szText = szText; } - + /** * \brief Returns the text of the command * \return const QString & @@ -233,7 +233,7 @@ protected: * \return void */ void setType(const Type & eType){ m_eType = eType; } - + /** * \brief Returns the type of the command * \return const Type & @@ -244,7 +244,7 @@ protected: /** * \var m_pUndoStack * \brief The undo stack. - * + * * Contains owned pointers and has autodelete set to true. The most recent command * is at the end. Null when no undo is available. */ @@ -253,7 +253,7 @@ protected: /** * \var m_pRedoStack * \brief The redo stack. - * + * * Contains owned pointers and has autodelete set to true. The most recently undone * command is at the end. Null when no redo is available. */ diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp index 8135f3bf4..85c6d7b58 100644 --- a/src/kvirc/ui/KviIrcToolBar.cpp +++ b/src/kvirc/ui/KviIrcToolBar.cpp @@ -80,7 +80,7 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char * if(KVI_OPTION_UINT(KviOption_uintIrcContextAppletWidth) < 32) KVI_OPTION_UINT(KviOption_uintIrcContextAppletWidth) = 32; - resize(KVI_OPTION_UINT(KviOption_uintIrcContextAppletWidth), + resize(KVI_OPTION_UINT(KviOption_uintIrcContextAppletWidth), KVI_OPTION_UINT(KviOption_uintToolBarIconSize)); } diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index 80086ff2f..50353d4fc 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -1511,12 +1511,12 @@ no_selection_paint: * Try to get the current number of KviIrcViewLines from the paintEvent and set the m_pScrollBar's * pageStep accordingly; the calculated value is valid only: * if there are enough lines to fill up at least a page (pCurTextLine) - * if the value is safe (iLinesPerPage > 0) + * if the value is safe (iLinesPerPage > 0) * if it's different from the actual one (iLinesPerPage != m_pScrollBar->pageStep()) * only on full repaints: rectHeight == rect().height() */ - if(pCurTextLine && - iLinesPerPage > 0 && + if(pCurTextLine && + iLinesPerPage > 0 && iLinesPerPage != m_pScrollBar->pageStep() && rectHeight == rect().height() ) diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp index a5a40c0cc..d4a71923b 100644 --- a/src/kvirc/ui/KviIrcView_events.cpp +++ b/src/kvirc/ui/KviIrcView_events.cpp @@ -260,7 +260,7 @@ void KviIrcView::mousePressEvent(QMouseEvent * e) triggerMouseRelatedKvsEvents(e); return; } - + // Left button handler // We are inside the line marker diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp index e90044588..295aa8005 100644 --- a/src/kvirc/ui/KviIrcView_getTextLine.cpp +++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp @@ -74,28 +74,28 @@ static const kvi_wchar_t * skip_to_end_of_url(const kvi_wchar_t * p) // However, in many cases this isn't respected. Since the browsers will automatically encode the invalid characters // then the users will tend to write the links without the special encoding. ed2k links also use the | character // and it's common for the file names to appear partially unencoded. - - // There is also a very common case of urls being enclosed inside parentheses: (http://url.here). - // In this case the rightmost ')' is shouldn't be included in the url. On the other hand there are many links that + + // There is also a very common case of urls being enclosed inside parentheses: (http://url.here). + // In this case the rightmost ')' is shouldn't be included in the url. On the other hand there are many links that // actually contain the ')' character and have it exactly at the end. Wikipedia, for instance, has a lot of such links. - + // So in the end, we just can't have an algorithm that pleases everybody. If we follow exactly the RFC1738 // then some links that would actually work inside a browser will not be recognized as links and some other links that // a human would recognize being inside parentheses will contain too many chars. - + // The following algorithm, then, is a compromise that works in most cases. - + int iSquareParenthesisLevel = 0; int iRoundParenthesisLevel = 0; - + for(;;) { if(*p <= 32) return p; // no spaces and control characters below 32 - + if((*p == '{') || (*p == '}') || (*p == '<') || (*p == '>') || (*p == '"') || (*p == '\'')) return p; // never valid inside an url - + if(*p == '[') { iSquareParenthesisLevel++; @@ -132,7 +132,7 @@ static const kvi_wchar_t * skip_to_end_of_url(const kvi_wchar_t * p) p++; } - + return p; } @@ -738,7 +738,7 @@ check_http_url: * Profane description: we found an 'h' using the "jump/check table", now check for a 't' (we don't want to search directly for the * "http://" tag, it takes us more cpu time) */ - + // if((*p == 't') || (*p == 'T')) { @@ -907,7 +907,7 @@ check_irc_url: partLen = 8; goto got_url; } - + p++; } } @@ -1219,7 +1219,7 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) iFlags &= ~SetLineMark; } } - + if(iFlags & TriggersNotification) { if(!m_bHaveUnreadedHighlightedMessages && iMsgType == KVI_OUT_HIGHLIGHT) @@ -1235,7 +1235,7 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) iMsgType == KVI_OUT_DCCCHATMSG || iMsgType == KVI_OUT_DCCCHATMSGCRYPTED || iMsgType == KVI_OUT_HIGHLIGHT - )) + )) m_bHaveUnreadedMessages = true; } } diff --git a/src/kvirc/ui/KviIrcView_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp index 0c5459166..3b9f4b1c9 100644 --- a/src/kvirc/ui/KviIrcView_loghandling.cpp +++ b/src/kvirc/ui/KviIrcView_loghandling.cpp @@ -64,7 +64,7 @@ void KviIrcView::stopLogging() szDate = date.toString(Qt::SystemLocaleShortDate); break; } - + QString szLogEnd = QString(__tr2qs("### Log session terminated at %1 ###")).arg(szDate); add2Log(szLogEnd); m_pLogFile->close(); @@ -234,7 +234,7 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) szDate = date.toString(Qt::SystemLocaleShortDate); break; } - + QString szLogStart = QString(__tr2qs("### Log session started at %1 ###")).arg(szDate); add2Log(szLogStart); if(bPrependCurBuffer) @@ -264,7 +264,7 @@ void KviIrcView::add2Log(const QString &szBuffer,int iMsgType,bool bPrependDate) if(m_pLogFile->write(tmp.data(),tmp.length())==-1) qDebug("WARNING : Can not write to the log file."); } - + if(bPrependDate) { QString szDate; @@ -287,7 +287,7 @@ void KviIrcView::add2Log(const QString &szBuffer,int iMsgType,bool bPrependDate) if(m_pLogFile->write(tmp.data(),tmp.length())==-1) qDebug("WARNING : Can not write to the log file."); } - + tmp = szBuffer.toUtf8(); tmp.append('\n'); diff --git a/src/kvirc/ui/KviIrcView_tools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp index 5bdef7bec..b8377ce39 100644 --- a/src/kvirc/ui/KviIrcView_tools.cpp +++ b/src/kvirc/ui/KviIrcView_tools.cpp @@ -118,7 +118,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent) QLabel * pLabel = new QLabel(__tr2qs("Message types"), m_pOptionsWidget); pOptionsLayout->addWidget(pLabel,0,0,1,2); - + m_pFilterView = new QTreeWidget(m_pOptionsWidget); m_pFilterView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_pFilterView->setRootIsDecorated(false); diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index c55671092..f4259fa47 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -462,7 +462,7 @@ void KviMainWindow::closeWindow(KviWindow *wnd) if(!g_pApp->kviClosingDown()) { qDebug("Have no active window: trying to pick one"); - + // this happens when there are only minimized windows in the Mdi area // just pick another window to be the active one bool bGotIt = false; @@ -475,7 +475,7 @@ void KviMainWindow::closeWindow(KviWindow *wnd) break; } } - + if(!bGotIt) { // :/ @@ -513,7 +513,7 @@ void KviMainWindow::addWindow(KviWindow *wnd,bool bShow) if(g_pWinPropertiesConfig->hasGroup(group)) { g_pWinPropertiesConfig->setGroup(group); - } else if(wnd->type() == KviWindow::Channel && + } else if(wnd->type() == KviWindow::Channel && g_pWinPropertiesConfig->hasGroup(group = wnd->windowName()) ) { // try to load pre-4.2 channel settings @@ -558,7 +558,7 @@ void KviMainWindow::addWindow(KviWindow *wnd,bool bShow) } } else { bool bMaximized = g_pWinPropertiesConfig->readBoolEntry("IsMaximized",false); - + wnd->setGeometry(rect); wnd->triggerCreationEvents(); @@ -1076,12 +1076,12 @@ void KviMainWindow::iconSizePopupSelected(QAction *pAction) { if(!pAction) return; - + bool bOk=false; uint uSize=pAction->data().toUInt(&bOk); if(!bOk) return; - + setIconSize(uSize); g_pApp->optionResetUpdate(KviOption_resetReloadImages); } @@ -1090,12 +1090,12 @@ void KviMainWindow::buttonStylePopupSelected(QAction *pAction) { if(!pAction) return; - + bool bOk=false; uint uStyle=pAction->data().toUInt(&bOk); if(!bOk) return; - + setButtonStyle(uStyle); } diff --git a/src/kvirc/ui/KviMdiManager.cpp b/src/kvirc/ui/KviMdiManager.cpp index 829aaaf72..c69bee19d 100644 --- a/src/kvirc/ui/KviMdiManager.cpp +++ b/src/kvirc/ui/KviMdiManager.cpp @@ -81,7 +81,7 @@ KviMdiManager::KviMdiManager(QWidget * parent,const char *pcName) connect(m_pWindowPopup,SIGNAL(aboutToShow()),this,SLOT(fillWindowPopup())); m_pTileMethodPopup = new QMenu(this); connect(m_pTileMethodPopup,SIGNAL(triggered(QAction *)),this,SLOT(tileMethodMenuActivated(QAction *))); - + setAutoFillBackground(false); viewport()->setAutoFillBackground(false); @@ -159,7 +159,7 @@ void KviMdiManager::destroyChild(KviMdiChild *lpC) { removeSubWindow(lpC); delete lpC; - + if(!m_bInSDIMode && KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)) tile(); } @@ -172,7 +172,7 @@ void KviMdiManager::setIsInSDIMode(bool bMode) if(!m_bInSDIMode) { ensureNoMaximized(); - + if(KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)) tile(); } @@ -400,7 +400,7 @@ void KviMdiManager::cascadeWindows() void KviMdiManager::cascadeMaximized() { cascadeSubWindows(); - + QList<QMdiSubWindow*> tmp = subWindowList(QMdiArea::StackingOrder); QListIterator<QMdiSubWindow*> it(tmp); KviMdiChild * lpC; @@ -410,7 +410,7 @@ void KviMdiManager::cascadeMaximized() lpC = (KviMdiChild *) it.next(); if(lpC->windowState() & Qt::WindowMinimized) continue; - + QPoint pnt(lpC->pos()); QSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); if((lpC->minimumSize().width() > curSize.width()) || @@ -491,7 +491,7 @@ void KviMdiManager::restoreAll() lpC->restore(); } - + if(!m_bInSDIMode && KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)) tile(); } @@ -655,7 +655,7 @@ void KviMdiManager::processWindowStateChanged(Qt::WindowStates oldState, Qt::Win //minimized or unminimized pMdiChild->updateCaption(); if(newState.testFlag(Qt::WindowMinimized) && - !m_bIgnoreSDIModeChange + !m_bIgnoreSDIModeChange ) { //a window have just been minimized, but we want another window to get activation diff --git a/src/kvirc/ui/KviMdiManager.h b/src/kvirc/ui/KviMdiManager.h index c5a8c9a19..3c5f2781e 100644 --- a/src/kvirc/ui/KviMdiManager.h +++ b/src/kvirc/ui/KviMdiManager.h @@ -102,7 +102,7 @@ public: * \return QMenu * */ inline QMenu * windowPopup() { return m_pWindowPopup; }; - + /** * \brief Move the focus the the previous active window * \return void diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp index f2d7329ee..055080983 100644 --- a/src/kvirc/ui/KviMenuBar.cpp +++ b/src/kvirc/ui/KviMenuBar.cpp @@ -213,7 +213,7 @@ void KviMenuBar::setupSettingsPopup(QMenu *pop) // // If you're playing with unstable stuff then use /options.save to obtain // the same effect. - // + // //opt->addSeparator(); //opt->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,SLOT(saveConfiguration())); } diff --git a/src/kvirc/ui/KviModeWidget.cpp b/src/kvirc/ui/KviModeWidget.cpp index 5a56be95e..b70e22f96 100644 --- a/src/kvirc/ui/KviModeWidget.cpp +++ b/src/kvirc/ui/KviModeWidget.cpp @@ -112,7 +112,7 @@ void KviModeWidget::editorReturnPressed() char cMode = szSubstring.at(0).unicode(); szSubstring.remove(0,2); - if(!m_pChannel->hasChannelMode(cMode) || + if(!m_pChannel->hasChannelMode(cMode) || (szSubstring != m_pChannel->channelModeParam(cMode))) { // mode was not set before, or the parameter has changed @@ -132,7 +132,7 @@ void KviModeWidget::editorReturnPressed() } } } - + // check for any mode that has been unset for(int i=0; i<szOldModes.count(); ++i) { @@ -218,7 +218,7 @@ void KviModeWidget::editorReturnPressed() szParameters.clear(); } iModes=0; - + emit setMode(szCommitModes); } } @@ -248,7 +248,7 @@ void KviModeWidget::editorReturnPressed() szParameters.clear(); } iModes=0; - + emit setMode(szCommitModes); } } diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index 1c7f26731..af1fc815d 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -446,12 +446,12 @@ void KviQueryWindow::setAliveQuery() connection()->registerQuery(this); QString szNick = target(); - + if(!szNick.isEmpty()) { QString szUser; QString szHost; - + if(pUserDataBase) { KviIrcUserEntry * pEntry = pUserDataBase->find(szNick); @@ -461,7 +461,7 @@ void KviQueryWindow::setAliveQuery() szHost = pEntry->host(); } } - + setTarget(szNick,szUser,szHost); } diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp index 0bf7d1bdc..b39acf98a 100644 --- a/src/kvirc/ui/KviSelectors.cpp +++ b/src/kvirc/ui/KviSelectors.cpp @@ -394,22 +394,22 @@ KviFileSelector::KviFileSelector(QWidget * par,const QString & txt,QString * pOp m_uFlags = uFlags; m_szFilter = szFilter; m_pLabel = new QLabel(txt,this); - + if(uFlags & VerticalLayout) m_Layout->addWidget(m_pLabel,0,0,1,2); else m_Layout->addWidget(m_pLabel,0,0); - + m_pLineEdit = new QLineEdit(this); - + if(uFlags & VerticalLayout) m_Layout->addWidget(m_pLineEdit,1,0); else m_Layout->addWidget(m_pLineEdit,0,1); - + //m_pLineEdit->setMinimumWidth(200); m_pLineEdit->setText(*pOption); - + m_pButton = new QPushButton(__tr2qs("&Browse..."),this); connect(m_pButton,SIGNAL(clicked()),this,SLOT(browseClicked())); @@ -803,7 +803,7 @@ KviSoundSelector::KviSoundSelector(QWidget * par,const QString & txt,QString * p { m_pPlayButton = new QPushButton(__tr2qs("Play"),this); connect(m_pPlayButton,SIGNAL(clicked()),this,SLOT(playSound())); - + //parent layout if(m_uFlags & VerticalLayout) m_Layout->addWidget(m_pPlayButton,2,1); diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp index 0dc3290b1..32ed126af 100644 --- a/src/kvirc/ui/KviStatusBar.cpp +++ b/src/kvirc/ui/KviStatusBar.cpp @@ -147,7 +147,7 @@ void KviStatusBar::dragMoveEvent(QDragMoveEvent *de) pApplet=m_pAppletList->first(); newIndex = pApplet->index(); } - + //swap indexes if(newIndex!=oldIndex) { @@ -220,7 +220,7 @@ void KviStatusBar::save() //ensure the applets are correctly ordered m_pAppletList->sort(); - + int i = 0; for(KviStatusBarApplet * pApplet = m_pAppletList->first(); pApplet; pApplet = m_pAppletList->next()) { diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp index 05bf1d960..830d5342f 100644 --- a/src/kvirc/ui/KviThemedLabel.cpp +++ b/src/kvirc/ui/KviThemedLabel.cpp @@ -61,7 +61,7 @@ void KviThemedLabel::applyOptions() QString szStyle = QString("QLabel { background: %1; background-clip: content; color: %2; font-family: %3; font-size: %4pt; font-weight: %5; font-style: %6;}") .arg(bIsTrasparent ? "transparent" : KVI_OPTION_COLOR(KviOption_colorLabelBackground).name()) - .arg(bIsTrasparent ? KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore()).name() : + .arg(bIsTrasparent ? KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore()).name() : KVI_OPTION_COLOR(KviOption_colorLabelForeground).name()) .arg(KVI_OPTION_FONT(KviOption_fontLabel).family()) .arg(KVI_OPTION_FONT(KviOption_fontLabel).pointSize()) diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp index 1b918016b..cc02cea95 100644 --- a/src/kvirc/ui/KviThemedTreeWidget.cpp +++ b/src/kvirc/ui/KviThemedTreeWidget.cpp @@ -58,7 +58,7 @@ void KviThemedTreeWidget::applyOptions() QString szStyle = QString("QTreeWidget { background: %1; background-clip: content; color: %2; font-family: %3; font-size: %4pt; font-weight: %5; font-style: %6;}") .arg(bIsTrasparent ? "transparent" : KVI_OPTION_COLOR(KviOption_colorLabelBackground).name()) - .arg(bIsTrasparent ? KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore()).name() : + .arg(bIsTrasparent ? KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore()).name() : KVI_OPTION_COLOR(KviOption_colorLabelForeground).name()) .arg(KVI_OPTION_FONT(KviOption_fontLabel).family()) .arg(KVI_OPTION_FONT(KviOption_fontLabel).pointSize()) diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp index 30fbec412..700fc4b93 100644 --- a/src/kvirc/ui/KviToolBar.cpp +++ b/src/kvirc/ui/KviToolBar.cpp @@ -154,7 +154,7 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) } connect(pButtonStyleGroup,SIGNAL(triggered(QAction*)),g_pMainWindow,SLOT(buttonStylePopupSelected(QAction*))); - + } diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp index e463e57b5..dd1eff989 100644 --- a/src/kvirc/ui/KviTreeWindowList.cpp +++ b/src/kvirc/ui/KviTreeWindowList.cpp @@ -253,7 +253,7 @@ void KviTreeWindowListTreeWidget::mousePressEvent(QMouseEvent *e) //left click activate/deactivate window if((g_pActiveWindow != wnd) || (wnd->isMinimized())) g_pMainWindow->setActiveWindow(wnd); - else + else wnd->minimize(); // let our parent handle clicks on branches, etc diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp index c90d133a0..fd911b191 100644 --- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp +++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp @@ -122,10 +122,10 @@ void KviWebPackageManagementDialog::slotLoadFinished(bool bOk) m_pProgressBar->setValue(0); if(!isVisible()) - show(); + show(); // main frame - QWebFrame *pFrame=m_pWebView->page()->mainFrame(); + QWebFrame *pFrame=m_pWebView->page()->mainFrame(); /*QWebElement style=pFrame->documentElement().findFirst("style"); QString szCss=style.toPlainText(); szCss.append("div.item_entry:hover {background-color: rgba(0,0,0,0.9)}"); @@ -135,7 +135,7 @@ void KviWebPackageManagementDialog::slotLoadFinished(bool bOk) // if this is null something is wrong if(elementscollection.count()) - { + { foreach(QWebElement element,elementscollection) { // web element 'title' @@ -173,7 +173,7 @@ void KviWebPackageManagementDialog::slotLinkClicked(const QUrl &url) m_pWebView->load(url); return; } - + // let's search for the 'a' tag QWebElementCollection elementscollection=m_pWebView->page()->mainFrame()->findAllElements("a.item_download_link"); if(elementscollection.count() == 0) diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index 5416f8830..9a7343970 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -126,7 +126,7 @@ KviWindow::KviWindow(Type eType, const QString & szName, KviConsoleWindow * lpCo m_pCryptController = 0; m_pCryptSessionInfo = 0; #endif - + setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT); //setAutoFillBackground(false); setFocusPolicy(Qt::StrongFocus); @@ -519,7 +519,7 @@ void KviWindow::getDefaultLogFileName(QString & szBuffer) QString szDate; QDate date(QDate::currentDate()); - switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 1: szDate = date.toString(Qt::ISODate); @@ -548,7 +548,7 @@ void KviWindow::getDefaultLogFileName(QString & szBuffer) szTmp = "%1_%2_%3.log"; szLog.append(QString(szTmp).arg(typeString(),szBase,szDate)); - + szBuffer=szLog; } @@ -593,7 +593,7 @@ void KviWindow::loadProperties(KviConfigurationFile * pCfg) szKey += m_szName; szCodec=pCfg->readEntry(szKey,KviQString::Empty); } - + setTextEncoding(szCodec.toUtf8().data()); if(m_pInput) { @@ -679,7 +679,7 @@ void KviWindow::createSystemTextEncodingPopup() g_pMdiWindowSystemTextEncodingCurrentAction = g_pMdiWindowSystemTextEncodingPopup->addAction(__tr2qs("Current: ")); g_pMdiWindowSystemTextEncodingActionGroup->addAction(g_pMdiWindowSystemTextEncodingCurrentAction); g_pMdiWindowSystemTextEncodingCurrentAction->setVisible(false); - + // other first level menus g_pMdiWindowSystemTextEncodingPopup->addSeparator(); @@ -706,7 +706,7 @@ void KviWindow::createSystemTextEncodingPopup() pPopupSmart[u] = g_pMdiWindowSystemTextEncodingPopupSmart->addMenu(pcEncodingGroup); pPopupSmartUtf8[u] = g_pMdiWindowSystemTextEncodingPopupSmartUtf8->addMenu(pcEncodingGroup); } - + pcEncodingGroup = KviLocale::instance()->encodingGroup(++u); } @@ -724,12 +724,12 @@ void KviWindow::createSystemTextEncodingPopup() g_pMdiWindowSystemTextEncodingCurrentAction->setVisible(true); g_pMdiWindowSystemTextEncodingCurrentAction->setData(i); } - - QMenu * pMenu = pDesc->bSmart ? (pDesc->bSendUtf8 ? - pPopupSmartUtf8[pDesc->uGroup] : + + QMenu * pMenu = pDesc->bSmart ? (pDesc->bSendUtf8 ? + pPopupSmartUtf8[pDesc->uGroup] : pPopupSmart[pDesc->uGroup] ) : pPopupStandard[pDesc->uGroup]; - + QAction * pAction = pMenu->addAction(szTmp); pAction->setData(i); g_pMdiWindowSystemTextEncodingActionGroup->addAction(pAction); diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h index f95f3175f..027291fd3 100644 --- a/src/kvirc/ui/KviWindow.h +++ b/src/kvirc/ui/KviWindow.h @@ -205,7 +205,7 @@ public: /** * \brief Returns the global ID of this window - * + * * This is unique in the application * \return QString */ @@ -213,7 +213,7 @@ public: /** * \brief Returns the global ID of this window - * + * * This is unique in the application * \return QString */ @@ -234,7 +234,7 @@ public: /** * \brief Sets the progress for the WindowList item - * + * * If "progress" makes sense in your window, well, use this * \param iProgress The progress to set * \return void @@ -258,7 +258,7 @@ public: /** * \brief Returns the KviIrcView of this window - * + * * May be NULL if the window has no KviIrcView (and thus supports no direct output) * \return KviIrcView * */ @@ -266,7 +266,7 @@ public: /** * \brief Returns the mdiParent widget - * + * * May be nulll if the window is undocked * \return KviMdiChild * */ @@ -274,7 +274,7 @@ public: /** * \brief Returns the console that this window belongs to - * + * * May be null for windows that aren't bound to irc contexts * \return KviConsoleWindow * */ @@ -291,7 +291,7 @@ public: /** * \brief Returns the splitter of this window - * + * * It *shouldn't* be null... but... well... who knows ? :D ...better check it * \return KviTalSplitter * */ @@ -299,7 +299,7 @@ public: /** * \brief Returns the windowList item - * + * * The window has ALWAYS a WindowList item * \return KviWindowListItem * */ @@ -384,18 +384,18 @@ public: void updateBackgrounds(QObject * pObj = 0); /** - * \brief Notify the window manager that this window demands attention - * + * \brief Notify the window manager that this window demands attention + * * Depending on the os/window manager, this method uses different approaches to * trigger a notification that tipically makes the application entry flash - * on the application bar. + * on the application bar. * \return void */ void demandAttention(); /** * \brief Returns whether this window is the active one - * + * * This method is useful because it takes in consideration that this window * can be either docked or undocked, and takes a parameter that defines the strictness * of the checks used. diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp index b6b25e2f8..1d883e82d 100644 --- a/src/kvirc/ui/KviWindowListBase.cpp +++ b/src/kvirc/ui/KviWindowListBase.cpp @@ -75,7 +75,7 @@ KviWindowListBase::KviWindowListBase() connect(m_pActivityMeterTimer,SIGNAL(timeout()),this,SLOT(updateActivityMeter())); connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)),this, SLOT(updateDockLocation(Qt::DockWidgetArea))); m_pActivityMeterTimer->start(5000); - + applyOptions(); } @@ -187,11 +187,11 @@ void KviWindowListBase::applyOptions() } else { m_pTitleWidget = new KviWindowListTitleWidget(this); } - + setTitleBarWidget(m_pTitleWidget); - + // if(features() & QDockWidget::DockWidgetVerticalTitleBar) - + } void KviWindowListTitleWidget::paintEvent(QPaintEvent *) @@ -225,7 +225,7 @@ QSize KviWindowListTitleWidget::sizeHint() const QStyleOption opt(0); opt.init(m_pParent); opt.state = QStyle::State_None; -// +// return m_pParent->style()->sizeFromContents(QStyle::CT_Splitter, &opt, QSize(w, h), m_pParent).expandedTo(QApplication::globalStrut()); } ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -288,7 +288,7 @@ void KviWindowListButton::mousePressEvent(QMouseEvent *e) } else { if((g_pActiveWindow != m_pWindow) || (m_pWindow->isMinimized())) g_pMainWindow->setActiveWindow(m_pWindow); - else + else m_pWindow->minimize(); } } else m_pWindow->contextPopup(); @@ -594,7 +594,7 @@ void KviClassicWindowList::insertButton(KviWindowListButton * b) m_pButtonList->insert(idx,b); return; } - + if(btn->kviWindow()->type() == b->kviWindow()->type()) { // same type! @@ -615,7 +615,7 @@ void KviClassicWindowList::insertButton(KviWindowListButton * b) m_pButtonList->append(b); return; } - + if(!(btn->kviWindow()->console()) && b->kviWindow()->console()) { // this must be a new console...insert before the contextless windows diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index 460cb4560..6fee6e827 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -342,7 +342,7 @@ void SingleActionEditor::displaySmallIcon(const QString &szIconId) m_pSmallIconEdit->setText(QString()); m_pSmallIconButton->setIcon(QIcon()); } - + } void SingleActionEditor::displayBigIcon(const QString &szIconId) diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp index 597a98cb1..f2c0bafcc 100644 --- a/src/modules/addon/PackAddonDialog.cpp +++ b/src/modules/addon/PackAddonDialog.cpp @@ -99,9 +99,9 @@ PackAddonDialog::PackAddonDialog(QWidget * pParent) szText += __tr2qs_ctx("Hit the \"Next\" button to begin.","addon"); pLabel->setText(szText); pLayout->addWidget(pLabel); - + pPage->setMinimumWidth(350); - + addPage(pPage); // Packager information @@ -273,7 +273,7 @@ bool PackAddonDialog::packAddon() // Check the addon tree QString szError; - + if(!checkDirTree(&szError)) { QMessageBox::critical(this, @@ -282,7 +282,7 @@ bool PackAddonDialog::packAddon() ); return false; } - + // Raise the files summary dialog m_pPackAddonSummaryFilesWidget = new PackAddonSummaryFilesWidget(this); m_pPackAddonSummaryFilesWidget->setPath(m_szDirPath); @@ -405,7 +405,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent QLabel * pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package &Author:","addon")); pLayout->addWidget(pLabel,0,0); - + m_pPackageAuthorEdit = new QLineEdit(this); m_pPackageAuthorEdit->setText(__tr2qs_ctx("Your name here","addon")); pLabel->setBuddy(m_pPackageAuthorEdit); @@ -414,7 +414,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package &Name:","addon")); pLayout->addWidget(pLabel,1,0); - + m_pPackageNameEdit = new QLineEdit(this); m_pPackageNameEdit->setText(__tr2qs_ctx("No spaces allowed, like MyAddon","addon")); pLabel->setBuddy(m_pPackageNameEdit); @@ -423,7 +423,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package &Version:","addon")); pLayout->addWidget(pLabel,2,0); - + m_pPackageVersionEdit = new QLineEdit(this); m_pPackageVersionEdit->setText(__tr2qs_ctx("Version in the form x.y[.z], like 1.0 or 2.0.3","addon")); pLabel->setBuddy(m_pPackageVersionEdit); diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp index 69a0ecf76..e6efb44a9 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.cpp +++ b/src/modules/aliaseditor/AliasEditorWindow.cpp @@ -333,7 +333,7 @@ void AliasEditorWidget::aliasRefresh(const QString &szName) void AliasEditorWidget::itemRenamed(QTreeWidgetItem *it,int col) { if(it!=m_pLastEditedItem) return; - + ((AliasEditorTreeWidgetItem *)it)->setName(it->text(col)); QString szNam = buildFullItemName((AliasEditorTreeWidgetItem *)it); QString szLabelText; @@ -1183,7 +1183,7 @@ AliasEditorWindow::AliasEditorWindow() m_pEditor = new AliasEditorWidget(this); g->addWidget(m_pEditor,0,0,1,4); - + QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h index e44db6675..c4eaed493 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.h +++ b/src/modules/aliaseditor/AliasEditorWindow.h @@ -150,7 +150,7 @@ protected: QString askForAliasName(const QString &szAction,const QString &szText,const QString &szInitialText); QString askForNamespaceName(const QString &szAction,const QString &szText,const QString &szInitialText); -// +// bool itemExists(QTreeWidgetItem *pSearchFor); bool namespaceExists(QString &szFullItemName); bool aliasExists(QString &szFullItemName); diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 65d137d34..51207644a 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -270,9 +270,9 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c) is a channel at all). If the current window is not a channel, a warning is printed and an empty string is returned.[br] The second form returns the number of users on the channel specified by <window_id>.[br] - The number of users returned depends on the state of KVIrc's data on the channel, which will be - out-of-synch with the server just after the channel is joined. If the function is used prior to - the channel's OnChannelSync event, a smaller user count than there really is will be returned. + The number of users returned depends on the state of KVIrc's data on the channel, which will be + out-of-synch with the server just after the channel is joined. If the function is used prior to + the channel's OnChannelSync event, a smaller user count than there really is will be returned. */ static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c) { @@ -1390,7 +1390,7 @@ static bool chan_kvs_fnc_masklist(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) char cMode = szMode.at(0).unicode(); - + KviKvsArray * pArray = new KviKvsArray(); c->returnValue()->setArray(pArray); @@ -1818,7 +1818,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c) { QString szNick, szChans; kvs_uint_t iContextId; - + KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick) KVSM_PARAMETER("context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,iContextId) \ @@ -1835,7 +1835,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c) pConsole->connection()->getCommonChannels(szNick,szChans,false); c->returnValue()->setString(szChans); } - + return true; } diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index 8484b267c..cc7c71818 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -102,7 +102,7 @@ ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, m_bInternal = false; m_bClassModified = false; QPixmap * pIcon = 0; - + if(eType == ClassEditorTreeWidgetItem::Namespace) pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else @@ -121,14 +121,14 @@ ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * m_iPos = 0; m_bClassModified = false; QPixmap * pIcon = 0; - + if(eType == ClassEditorTreeWidgetItem::Namespace) pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else if(eType == ClassEditorTreeWidgetItem::Class) pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); else pIcon = g_pIconManager->getSmallIcon(KviIconManager::Function); - + setIcon(0,QIcon(*pIcon)); } @@ -136,12 +136,12 @@ void ClassEditorTreeWidgetItem::setClassNotBuilt(bool bModified) { m_bClassModified = bModified; QPixmap * pIcon = 0; - + if(bModified) pIcon = g_pIconManager->getSmallIcon(KviIconManager::ClassNotBuilt); else pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); - + setIcon(0,QIcon(*pIcon)); } @@ -155,14 +155,14 @@ void ClassEditorTreeWidgetItem::setType(Type eType) { m_eType = eType; QPixmap * pIcon = 0; - + if(eType == ClassEditorTreeWidgetItem::Namespace) pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else if(eType == ClassEditorTreeWidgetItem::Class) pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); else pIcon = g_pIconManager->getSmallIcon(KviIconManager::Function); - + setIcon(0,QIcon(*pIcon)); } @@ -290,7 +290,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::findItem(const QString & szFullNa ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0)); if(!pItem) return 0; - + for(int i=1; i < lNamespaces.count(); i++) { bFound = false; @@ -313,7 +313,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::createFullItem(const QString & sz { bool bFound; int i; - + QStringList lNamespaces = szFullName.split("::"); if(lNamespaces.count() == 0) return 0; @@ -350,7 +350,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::createFullNamespace(const QString { bool bFound; int i; - + QStringList lNamespaces = szFullName.split("::"); if(lNamespaces.count() == 0) return 0; @@ -385,13 +385,13 @@ void ClassEditorWidget::oneTimeSetup() QString szPath; g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes); QDir d(szPath); - + QString szExtension = QString("*%1").arg(KVI_FILEEXTENSION_SCRIPT); // *.kvs sl = d.entryList(QStringList(szExtension), QDir::Files | QDir::NoDotAndDotDot); - + g_pModuleManager->getModule("objects"); KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict()); - + KviKvsObjectClass * pClass = 0; ClassEditorTreeWidgetItem * pClassItem = 0; while(KviKvsObjectClass * pClass = it.current()) @@ -546,13 +546,13 @@ void ClassEditorWidget::renameFunction() return; } } - + pFunction->setName(szNewFunctionName); pFunction->setReminder(szNewReminder); currentItemChanged(pFunction,pFunction); pFunction->setInternalFunction(bInternal); pParentClass->setClassNotBuilt(true); - + KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses; lInheritedClasses.setAutoDelete(false); searchInheritedClasses(szClassName,lInheritedClasses); @@ -633,7 +633,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem) m_pClasses->insert(szNewClassName,pClassItem); pClassItem->setInheritsClass(szNewInheritsClassName); pClassItem->setClassNotBuilt(true); - + KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses; lInheritedClasses.setAutoDelete(false); searchInheritedClasses(szClassName,lInheritedClasses); @@ -643,7 +643,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem) lInheritedClasses.at(i)->setExpanded(true); lInheritedClasses.at(i)->setInheritsClass(szNewClassName); } - + if(pNewItem) { activateItem(pNewItem); @@ -652,7 +652,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem) activateItem(pClassItem); pClassItem->setExpanded(true); } - + qDebug("delete class %s caused by rename",szClassName.toUtf8().data()); KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName); if(pClass) @@ -773,15 +773,15 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI m_pEditor->setEnabled(false); return; } - + ClassEditorTreeWidgetItem * pClassItem = 0; if(m_pLastEditedItem->isMethod()) pClassItem = (ClassEditorTreeWidgetItem *)m_pLastEditedItem->parent(); else pClassItem = m_pLastEditedItem; - + QString szClassName = buildFullClassName(pClassItem); - + if(m_pLastEditedItem->isNamespace()) { QString szLabelText = __tr2qs_ctx("Namespace","editor"); @@ -798,7 +798,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI m_pTreeWidget->setFocus(); return; } - + QString szLabelText = __tr2qs_ctx("Class","editor"); szLabelText += ": <b>"; szLabelText += szClassName; @@ -826,7 +826,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI m_pReminderLabel->setText(szReminderText); m_pReminderLabel->show(); } - + m_pFunctionNameLabel->setText(szLabelText); m_pFunctionNameLabel->show(); m_pFunctionNameRenameButton->show(); @@ -846,7 +846,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI QStringList szFunctionsList; KviPointerHashTable<QString,ClassEditorTreeWidgetItem> lFunctions; lFunctions.setAutoDelete(false); - + ClassEditorTreeWidgetItem * pItem = 0; for(int i=0; i < pTree->childCount(); i++) { @@ -1103,7 +1103,7 @@ void ClassEditorWidget::exportSelected() void ClassEditorWidget::exportSelectionInSinglesFiles(KviPointerList<ClassEditorTreeWidgetItem> * pList) { bool bReplaceAll = false; - + if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR))) m_szDir += KVI_PATH_SEPARATOR; if(!pList->first()) @@ -1155,7 +1155,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) QString szNameFile; QString szFile; int iCount = 0; - + saveLastEditedItem(); KviPointerList<ClassEditorTreeWidgetItem> list; @@ -1165,13 +1165,13 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) appendSelectedClassItems(&list); else appendAllClassItems(&list); - + if(bSingleFiles) { exportSelectionInSinglesFiles(&list); return; } - + ClassEditorTreeWidgetItem * pTempItem = 0; KviPointerList<ClassEditorTreeWidgetItem> skiplist; skiplist.setAutoDelete(false); @@ -1200,7 +1200,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) szOut += "\n"; } } - + if(szOut.isEmpty()) { g_pClassEditorModule->lock(); @@ -1213,7 +1213,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) if(!szName.endsWith(QString(KVI_PATH_SEPARATOR))) szName += KVI_PATH_SEPARATOR; - + g_pClassEditorModule->lock(); if(iCount != 1) @@ -1222,7 +1222,7 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles) QString szTmp = buildFullClassName(pTempItem); szNameFile = szTmp.replace("::","_"); } - + szName += szNameFile; szName += ".kvs"; if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,false,true,true)) @@ -1321,7 +1321,7 @@ void ClassEditorWidget::removeItemChildren(ClassEditorTreeWidgetItem * pItem, Kv lInheritedClasses.at(u)->setInheritsClass("object"); } } - + while(pItem->childCount() > 0) { ClassEditorTreeWidgetItem * pChild = (ClassEditorTreeWidgetItem *)(pItem->child(0)); @@ -1363,7 +1363,7 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer { szMsg = QString(__tr2qs_ctx("Do you really want to remove the function \"%1\"?","editor")).arg(szName); } - + g_pClassEditorModule->lock(); int iRet = QMessageBox::question(this,__tr2qs_ctx("Remove item","editor"),szMsg,__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("Yes to All","editor"),__tr2qs_ctx("No","editor")); g_pClassEditorModule->unlock(); @@ -1577,7 +1577,7 @@ void ClassEditorWidget::newClass() if(szClassName.isEmpty()) return; ClassEditorTreeWidgetItem * pItem = newItem(szClassName,ClassEditorTreeWidgetItem::Class); - + KviQString::escapeKvs(&szClassName, KviQString::EscapeSpace); KviQString::escapeKvs(&szinheritsClassName, KviQString::EscapeSpace); @@ -1606,7 +1606,7 @@ void ClassEditorWidget::newMemberFunction() QString szFunctionName; QString szClassName; QString szReminder; - + if(m_pLastClickedItem->isMethod()) m_pLastClickedItem = (ClassEditorTreeWidgetItem*)m_pLastClickedItem->parent(); szClassName = buildFullClassName(m_pLastClickedItem); @@ -1615,7 +1615,7 @@ void ClassEditorWidget::newMemberFunction() return; if(szFunctionName.isEmpty()) return; - + ClassEditorTreeWidgetItem * pItem = newItem(szFunctionName,ClassEditorTreeWidgetItem::Method); pItem->setInternalFunction(bInternal); if(!szReminder.isEmpty()) @@ -1628,11 +1628,11 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::newItem(QString & szName, ClassEd { if(m_pLastClickedItem) buildFullItemPath(m_pLastClickedItem,szName); - + QString szTmp; if(findItem(szName)) szName.append("1"); - + int iIdx = 2; while(findItem(szName)) { @@ -1940,7 +1940,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz QRegExpValidator * pValidator = new QRegExpValidator(re,this); m_pClassNameLineEdit->setValidator(pValidator); m_pClassNameLineEdit->setObjectName("functionameineedit"); - + pHBox = new KviTalHBox(this); pHBox->setSpacing(0); pHBox->setMargin(0); @@ -1969,7 +1969,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz szClasses.append(pBuiltinClasses.currentKey()); ++pBuiltinClasses; } - + int iCurrentIdx; szClasses.sort(); for(int i=0; i < szClasses.count(); i++) @@ -2004,7 +2004,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz pCancelButton->setObjectName("cancelButton"); pCancelButton->setText(__tr2qs_ctx("&Cancel","editor")); connect(pCancelButton, SIGNAL(clicked()), this, SLOT(reject())); - + setLayout(pLayout); } @@ -2081,7 +2081,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co m_pFunctionNameLineEdit->setFocus(); pLabel->setBuddy(m_pInternalCheckBox); connect(m_pFunctionNameLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); - + pHBox->setAlignment(m_pInternalCheckBox,Qt::AlignLeft); pHBox->setStretchFactor(m_pInternalCheckBox,70); pHBox->setStretchFactor(pLabel,30); @@ -2097,7 +2097,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co m_pNewFunctionButton->setText(__tr2qs_ctx("&Add","editor")); else m_pNewFunctionButton->setText(__tr2qs_ctx("&Rename","editor")); - + if(szFunctionName.isEmpty()) m_pNewFunctionButton->setEnabled(false); connect(m_pNewFunctionButton, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h index d9eca0cb9..3982fe7f1 100644 --- a/src/modules/classeditor/ClassEditorWindow.h +++ b/src/modules/classeditor/ClassEditorWindow.h @@ -66,7 +66,7 @@ public: * \return ClassEditorTreeWidget */ ClassEditorTreeWidget(QWidget * pParent); - + /** * \brief Destroys the tree widget */ @@ -109,7 +109,7 @@ public: * \return ClassEditorTreeWidgetItem */ ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName); - + /** * \brief Constructs the class editor tree widget item * \param pParentItem The parent tree widget item @@ -118,7 +118,7 @@ public: * \return ClassEditorTreeWidgetItem */ ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * pParentItem, Type eType, const QString & szName); - + /** * \brief Destroys the class editor tree widget item */ @@ -139,33 +139,33 @@ public: * \return void */ void setInheritsClass(QString szInheritsClassName){ m_szInheritsClassName = szInheritsClassName; }; - + /** * \brief Returns the class name of the classes we inherit from * \return QString */ QString inheritsClass(){ return m_szInheritsClassName; }; - + /** * \brief Returns the name of the item * \return const QString & */ const QString & name(){ return m_szName; }; - + /** * \brief Sets the name of the item * \param szName The name of the item :P * \return void */ void setName(const QString & szName); - + /** * \brief Sets the list of parameters the function accept * \param szRem The parameters' list * \return void */ void setReminder(const QString & szRem){ m_szReminder = szRem; }; - + /** * \brief Returns the parameters list * \return QString @@ -178,70 +178,70 @@ public: * \return void */ void setClassNotBuilt(bool bModified); - + /** * \brief Returns true if we class is not built yet, false otherwise * \return bool */ bool classNotBuilt(){ return m_bClassModified; }; - + /** * \brief Sets the function as internal * \param bInternal Whether the function is internal or not * \return void */ void setInternalFunction(bool bInternal){ m_bInternal = bInternal; }; - + /** * \brief Returns true if the function is set as internal, false otherwise * \return bool */ bool isInternalFunction(){ return m_bInternal; }; - + /** * \brief Returns the type of the item * \return Type */ Type type(){ return m_eType; }; - + /** * \brief Sets the type of the item * \param eType The type! * \return void */ void setType(Type eType); - + /** * \brief Returns true if the item is a class, false otherwise * \return bool */ bool isClass(){ return m_eType == Class; }; - + /** * \brief Returns true if the item is a namespace, false otherwise * \return bool */ bool isNamespace(){ return m_eType == Namespace; }; - + /** * \brief Returns true if the item is a member function, false otherwise * \return bool */ bool isMethod(){ return m_eType == Method; }; - + /** * \brief Saves the code of the item in a buffer * \param szBuffer The buffer ;) * \return void */ void setBuffer(const QString & szBuffer){ m_szBuffer = szBuffer; }; - + /** * \brief Returns the buffer containing the code of the item * \return const QString & */ const QString & buffer(){ return m_szBuffer; }; - + /** * \brief Returns the cursor's position * \return const int & @@ -270,7 +270,7 @@ public: * \return ClassEditorWidget */ ClassEditorWidget(QWidget * pParent); - + /** * \brief Destroys the class editor object */ @@ -299,32 +299,32 @@ public: * \return void */ virtual void saveProperties(KviConfigurationFile * pCfg); - + /** * \brief Called to load the window properties * \param pCfg The configuration file * \return void */ virtual void loadProperties(KviConfigurationFile * pCfg); - + /** * \brief Builds the class! * \return void */ void build(); - + /** * \brief Saves non-built classes to a file * \return void */ void saveNotBuiltClasses(); - + /** * \brief Loads non-built classes to a file * \return void */ void loadNotBuiltClasses(); - + /** * \brief Searches a function * \param szFunctionName The name of the function @@ -340,14 +340,14 @@ public: * \return void */ void exportClasses(bool bSelectedOnly, bool bSingleFiles = false); - + /** * \brief Exports the current selection to single files * \param pList The list of file to export * \return void */ void exportSelectionInSinglesFiles(KviPointerList<ClassEditorTreeWidgetItem> * pList); - + /** * \brief Removes the item from the tree * \param pItem The item to remove @@ -376,21 +376,21 @@ protected: bool askForNamespaceName(const QString & szAction, const QString & szText, const QString & szInitialText, QString & szNameBuffer); bool askForFunction(QString & szFunctionName, QString & szReminder, bool * pbInternal, const QString & szClassName, bool bRenameMode); void searchInheritedClasses(const QString szClass, KviPointerList<ClassEditorTreeWidgetItem> & lInheritsedClasses); - + /** * \brief Returns true if the class exists, false otherwise * \param szName The name of the class * \return bool */ bool classExists(QString & szName); - + /** * \brief Renames a class * \param pClass The class to rename * \return void */ void renameClass(ClassEditorTreeWidgetItem * pClass); - + /** * \brief Renames a namespace * \param pNamespace The namespace to rename @@ -413,9 +413,9 @@ protected: * \return ClassEditorTreeWidgetItem * */ ClassEditorTreeWidgetItem * findItem(const QString & szName); - - - + + + ClassEditorTreeWidgetItem * findTopLevelItem(const QString & szName); ClassEditorTreeWidgetItem * createFullItemRecursive(QTreeWidgetItem * pCurrent, QStringList & lNameSpaces, int & iLevel, bool bCreateNameSpace = 0); protected slots: @@ -435,13 +435,13 @@ protected slots: void slotFind(); void slotFindWord(const QString &); void searchReplace(const QString & szSearch, bool bReplace = false, const QString & szReplace = "n"); - + /** * \brief Called when we collapse an item * \return void */ void slotCollapseItems(); - + /** * \brief Called when we collapse an item recursively * \param pItem The starting item to collapse @@ -454,7 +454,7 @@ protected slots: * \return void */ void removeSelectedItems(); - + /** * \brief Called when we replace text everywhere * \param szBefore The text before the replace @@ -477,7 +477,7 @@ public: * \return ClassEditorWindow */ ClassEditorWindow(); - + /** * \brief Destroys the class editor window */ @@ -490,21 +490,21 @@ protected: * \return QPixmap * */ virtual QPixmap * myIconPtr(); - + /** * \brief Sets the configuration group name as classeditor * \param szName The name of the group * \return void */ virtual void configGroupName(QString & szName); - + /** * \brief Called to save the window properties * \param pCfg The configuration file * \return void */ virtual void saveProperties(KviConfigurationFile * pCfg); - + /** * \brief Called to load the window properties * \param pCfg The configuration file @@ -517,13 +517,13 @@ protected slots: * \return void */ void cancelClicked(); - + /** * \brief Called when we want to build the class * \return void */ void buildClicked(); - + /** * \brief Called when we want to save the class * \return void @@ -550,7 +550,7 @@ public: * \return KviClassEditorDialog */ KviClassEditorDialog(QWidget * pParent, const QString & szName, KviPointerHashTable<QString,ClassEditorTreeWidgetItem> * pClasses, const QString & szClassName, const QString & szInheritsClassName, bool bRenameMode = false); - + /** * \brief Destroys the class dialog */ @@ -565,7 +565,7 @@ public: * \return QString */ QString className(){ return m_pClassNameLineEdit->text(); }; - + /** * \brief Returns the class name of the parent classes * \return QString @@ -599,7 +599,7 @@ public: * \return KviClassEditorFunctionDialog */ KviClassEditorFunctionDialog(QWidget * pParent, const QString & szName, const QString & szClassName, const QString & szFunctionName, const QString & szReminder, bool bIsInternal, bool bRenameMode = false); - + /** * \brief Destroys the function dialog */ @@ -615,7 +615,7 @@ public: * \return QString */ QString functionName(){ return m_pFunctionNameLineEdit->text(); }; - + /** * \brief Returns the parameters of the function * \return QString diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index e9fe071d2..a55c60b94 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -732,7 +732,7 @@ static bool context_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c) c->returnValue()->setString(""); return true; } - + if(!pSocket->usingSSL()) { c->warning(__tr2qs("Unable to get SSL information: the IRC Connection is not using SSL")); diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index 3b7d80fca..1496baaff 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -21,9 +21,9 @@ set(kvidcc_SRCS ) if(NOT COMPILE_DISABLE_DCC_VIDEO) - list(APPEND kvidcc_SRCS - DccVideoWindow.cpp - ) + list(APPEND kvidcc_SRCS + DccVideoWindow.cpp + ) endif() set(files diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp index 8a7b4d779..484174737 100644 --- a/src/modules/dcc/DccCanvasWindow.cpp +++ b/src/modules/dcc/DccCanvasWindow.cpp @@ -160,7 +160,7 @@ { KviCString buf(KviCString::Format,"%s\r\n",text); // m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index ac4180c6e..5f9cbc470 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -271,9 +271,9 @@ void DccChatWindow::fillCaptionBuffers() { QString tmp = QString("DCC %1 %2@%3:%4").arg( #ifdef COMPILE_SSL_SUPPORT - m_pDescriptor->bIsSSL ? "SChat" : "Chat", + m_pDescriptor->bIsSSL ? "SChat" : "Chat", #else - "Chat", + "Chat", #endif m_pDescriptor->szNick, m_pDescriptor->szIp, m_pDescriptor->szPort); @@ -351,7 +351,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) KviCString buf(KviCString::Format,"%s\r\n",d); QString tmp = text.right(text.length() - 1); m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), @@ -363,7 +363,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) #endif KviCString buf(KviCString::Format,"%s\r\n",d); m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), @@ -549,7 +549,7 @@ void DccChatWindow::connected() updateCaption(); m_pSlaveThread = new DccChatThread(this,m_pMarshal->releaseSocket()); - + #ifdef COMPILE_SSL_SUPPORT KviSSL * s = m_pMarshal->releaseSSL(); if(s) diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index a19a59f45..20aa5e2d7 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -656,7 +656,7 @@ void DccSendThread::run() quint64 uTotLastAck = 0; bool bAckHack = false; int iAckHackRounds = 0; - + if(m_pOpt->iPacketSize < 32)m_pOpt->iPacketSize = 32; char * buffer = (char *)KviMemory::allocate(m_pOpt->iPacketSize * sizeof(char)); @@ -761,7 +761,7 @@ void DccSendThread::run() { uTotLastAck = (iAckHackRounds*4u*1024u*1024u*1024u) + iNewAck; } else { - + uTotLastAck = iNewAck; } iBytesInAckBuffer = 0; @@ -773,7 +773,7 @@ void DccSendThread::run() // ssl error....? switch(m_pSSL->getProtocolError(readLen)) { - + case KviSSL::ZeroReturn: //if (!handleInvalidSocketRead(readLen) // break; @@ -866,7 +866,7 @@ void DccSendThread::run() // ssl error....? switch(m_pSSL->getProtocolError(readLen)) { - + case KviSSL::ZeroReturn: readLen = 0; break; @@ -907,7 +907,7 @@ void DccSendThread::run() if (!handleInvalidSocketRead(readLen)) break; #endif - + } else { KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE); e->setData(new KviCString(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc"))); @@ -2207,7 +2207,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f // port doesn't match if(!bFileNameMatches) return false; // neither filename nor port match - + if(!KVI_OPTION_BOOL(KviOption_boolAcceptMismatchedPortDccResumeRequests)) return false; @@ -2218,7 +2218,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f } // port matches - + if(!bFileNameMatches) { // bad file name @@ -2226,7 +2226,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f return false; // neither filename nor port match // port matches (this is very likely to be the right transfer) - + if(!KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)) { if(_OUTPUT_VERBOSE) diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index b9cd95acc..559af20b1 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -46,7 +46,7 @@ #if defined(COMPILE_SSL_SUPPORT) - // Apple deprecated openssl since osx 10.7: + // Apple deprecated openssl since osx 10.7: #ifdef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER @@ -262,7 +262,7 @@ static bool file_kvs_cmd_writeBytes(KviKvsModuleCommandCall * c) { QString szFileName; KviKvsArray * pArray = NULL; - + KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName) KVSM_PARAMETER("dataArray",KVS_PT_ARRAY,0,pArray) @@ -1107,7 +1107,7 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c) bool bLocal8Bit = c->switches()->find('l',"local-8-bit"); bool bNoSeparator = c->switches()->find('n',"no-separator"); bool bAddCR = c->switches()->find('c',"crlf"); - + if(!f.open(QFile::WriteOnly | (bAppend ? QFile::Append : QFile::Truncate))) { if(!c->switches()->find('q',"quiet")) @@ -1410,7 +1410,7 @@ static bool file_kvs_fnc_diskSpace(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) if(szPath.isEmpty()) szPath = "."; - + const char * pcPath = szPath.toUtf8().data(); long long int fTotal; long long int fFree; @@ -1467,7 +1467,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c) c->warning(__tr2qs("Can't open the file '%Q' for reading"),&szFile); return true; } - + QByteArray content = file.readAll(); if(content.isEmpty()) { diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index 09f6f021e..73294aeca 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -257,7 +257,7 @@ FileTransferWindow::FileTransferWindow( { g_pFileTransferWindow = this; setAutoFillBackground(false); - + m_pContextPopup = 0; m_pLocalFilePopup = 0; m_pOpenFilePopup = 0; @@ -560,7 +560,7 @@ void FileTransferWindow::openFilePopupActivated(QAction *pAction) QString mimetype = KMimeType::findByPath(tmp)->name(); KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application"); - + int idx = 0; for(KService::List::Iterator itOffers = offers.begin(); itOffers != offers.end(); ++itOffers) diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp index f37f71a7b..cf81340e8 100644 --- a/src/modules/fish/libkvifish.cpp +++ b/src/modules/fish/libkvifish.cpp @@ -52,7 +52,7 @@ #include "KviCryptController.h" // KviApplication.cpp extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; - + #if defined(COMPILE_SSL_SUPPORT) #include <KviSSL.h> @@ -64,7 +64,7 @@ #include <openssl/sha.h> DH * g_fish_dh = 0; - + // ### new sophie-germain 1080bit prime number ### // const char *g_fish_prime1080_bin="++ECLiPSE+is+proud+to+present+latest+FiSH+release+featuring+even+more+security+for+you+++shouts+go+out+to+TMG+for+helping+to+generate+this+cool+sophie+germain+prime+number++++/C32L"; const char *g_fish_prime1080_hex="FBE1022E23D213E8ACFA9AE8B9DFADA3EA6B7AC7A7B7E95AB5EB2DF858921FEADE95E6AC7BE7DE6ADBAB8A783E7AF7A7FA6A2B7BEB1E72EAE2B72F9FA2BFB2A2EFBEFAC868BADB3E828FA8BADFADA3E4CC1BE7E8AFE85E9698A783EB68FA07A77AB6AD7BEB618ACF9CA2897EB28A6189EFA07AB99A8A7FA9AE299EFA7BA66DEAFEFBEFBF0B7D8B"; @@ -124,7 +124,7 @@ if(!pParams->firstAsString(szNick)) return true; - + pParams->next(); pParams->next(); @@ -160,7 +160,7 @@ szTmp.data() ); } - + if(szMessage.startsWith("DH1080_FINISH ", Qt::CaseSensitive)) { // fish appends an 'A' to all base64 coded strings @@ -171,7 +171,7 @@ if(!c->window()->connection()) return false; - + KviQueryWindow * pWnd = c->window()->connection()->findQuery(szNick); if(!pWnd) { @@ -218,7 +218,7 @@ szFinalKey.bufferToBase64((char *) hashedSecret, SHA256_LEN); //strip the trailing = szFinalKey.stripRight('='); - + KviMemory::free(hashedSecret); #else c->warning(__tr2qs("FiSH has been compiled without ssl support, unable to proceed")); @@ -238,7 +238,7 @@ inf->m_szEngineName = szEngine; inf->m_bDoEncrypt = true; inf->m_bDoDecrypt = true; - + pWnd->setCryptSessionInfo(inf); } else { c->warning(__tr2qs("Failed to initialize the Mircryption engine: %Q"),&(e->lastError())); @@ -285,11 +285,11 @@ static bool fish_module_init(KviModule * m) KviSSL::globalSSLInit(); #endif m->kvsRegisterAppEventHandler(KviEvent_OnQueryNotice,fish_event_onQueryNotice); - + KVSM_REGISTER_SIMPLE_COMMAND(m,"keyx",fish_cmd_keyx); return true; -#else +#else return false; #endif } diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index b1dd47e34..95d125cfe 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -196,7 +196,7 @@ QString HelpIndex::getCharsetForDocument(QFile *file) meta = meta.toLower(); QRegExp r(QLatin1String("charset=([^\"\\s]+)")); if (r.indexIn(meta) != -1) { - encoding = r.cap(1); + encoding = r.cap(1); } } @@ -284,13 +284,13 @@ void HelpIndex::writeDocumentList() return; QDataStream s( &f ); s << docList; - + QFile f1( docListFile+".titles" ); if ( !f1.open(QFile::WriteOnly ) ) return; QDataStream s1( &f1 ); s1 << titleList; - + } void HelpIndex::readDict() diff --git a/src/modules/help/HelpIndex.h b/src/modules/help/HelpIndex.h index 6eb1cdf6c..effe15f8e 100644 --- a/src/modules/help/HelpIndex.h +++ b/src/modules/help/HelpIndex.h @@ -96,7 +96,7 @@ public: void setDictionaryFile( const QString& ); void setDocListFile( const QString& ); void setDocList( const QStringList & ); - + const QStringList& documentList() { return docList; }; const QStringList& titlesList() { return titleList; }; diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp index 44be162fe..9db49d8a9 100644 --- a/src/modules/help/HelpWidget.cpp +++ b/src/modules/help/HelpWidget.cpp @@ -76,12 +76,12 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone) m_pTextBrowser->setStyleSheet("QTextBrowser { background-color:white; color:black; }"); m_pLayout->addWidget(m_pTextBrowser); connect(m_pTextBrowser,SIGNAL(loadFinished(bool)),this,SLOT(slotLoadFinished(bool))); - + // lower toolbar m_pToolBarHighlight = new QToolBar(this); m_pLayout->addWidget(m_pToolBarHighlight); m_pToolBarHighlight->hide(); - + QLabel *pHighlightLabel = new QLabel(); pHighlightLabel->setText(__tr2qs("Highlight: ")); m_pToolBarHighlight->addWidget(pHighlightLabel); diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 563b7aa93..0ed1f86fd 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -58,7 +58,7 @@ HelpWindow::HelpWindow(const char * name) m_pHelpWidget = new HelpWidget(m_pSplitter); - m_pToolBar=new KviTalVBox(m_pSplitter); + m_pToolBar=new KviTalVBox(m_pSplitter); m_pTabWidget = new QTabWidget(m_pToolBar); m_pBottomLayout = new KviTalHBox(m_pToolBar); diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h index 29e6a3dea..c9817f008 100644 --- a/src/modules/help/HelpWindow.h +++ b/src/modules/help/HelpWindow.h @@ -92,7 +92,7 @@ public slots: void startSearch(); void searchSelected ( QListWidgetItem * ); void refreshIndex(); - + void initialSetup(); void indexingStart( int iNum ); void indexingProgress( int iNum ); diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index 515ec96cc..b7d5aa23a 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -46,7 +46,7 @@ #ifdef COMPILE_CRYPT_SUPPORT - + #include "KviMemory.h" #include "KviPointerList.h" #include "KviCryptEngineDescription.h" @@ -102,7 +102,7 @@ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 223 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 231 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 239 : - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : + 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 }; @@ -138,11 +138,11 @@ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 223 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 231 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 239 : - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : + 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , // 247 : 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 }; - - + + KviCryptEngine::EncryptResult KviLamerizerEngine::encrypt(const char * plainText,KviCString &outBuffer) { outBuffer = plainText; @@ -167,7 +167,7 @@ aux++; } } - + if(!m_bLight) { outBuffer.replaceAll("F","Ph"); diff --git a/src/modules/language/detector/data/afrikaans-iso-8859-15.dat b/src/modules/language/detector/data/afrikaans-iso-8859-15.dat index d250221da..c90f79aca 100644 --- a/src/modules/language/detector/data/afrikaans-iso-8859-15.dat +++ b/src/modules/language/detector/data/afrikaans-iso-8859-15.dat @@ -1,6 +1,6 @@ die vorm aanneem van 'n man sonder 'n gesig en 'n rooi en wit geknoopte - + gaan word, kinders wat in konsentrasiekampe gevange gehou gaan word, bestaan nie. @@ -84,8 +84,8 @@ gediskrimineer sal word. Maar in die tyd wat die seun begin skoolgaan Skielik staan Kootjie op. "Hy's dood", s hy eenvoudig. Hy kyk na die Alles is dan so gou verby. - - + + die geleidelike ontlading van die week se spanning te wyt. die winter was al in sy doodsnikke, dan kon jy nog die herfs in sy o @@ -108,7 +108,7 @@ deur Johan Horn dat hy nie sy geslagsdeel met beide hande vasgehou het nie. "Dit was my oomblik met Vreugde," glimlag hy dan en haal sy beursie uit - + "Ek is 'n fee, nie 'n engel nie!" antwoord sy en vou haar arms uitdagend Ek het maar gesukkel hier. Baie moeite om aan te pas. Maar hier is ek diff --git a/src/modules/language/detector/data/basque-iso-8859-15.dat b/src/modules/language/detector/data/basque-iso-8859-15.dat index 70a77321a..4dda958fa 100644 --- a/src/modules/language/detector/data/basque-iso-8859-15.dat +++ b/src/modules/language/detector/data/basque-iso-8859-15.dat @@ -1,77 +1,77 @@ perifrasietara mugatzen ez bagara. Adibidez:25 - Cambridge University Press. + Cambridge University Press. + + Euskalki guztietan, ezin elementuaz osatutako perifrasiak erabil - Euskalki guztietan, ezin elementuaz osatutako perifrasiak erabil - 3.2. EZIN IZAN - (14b) ulertu + behar duzu - + (14b) ulertu + behar duzu + Brunot ezin zen baliatu gaurko kontzeptu pragmatiko eta linguistikoez. A.K.: Ofizialki ez. Aztertzaileek ohar bat idazten dute beren txosten - Badaude, alegia, 3.3.2 eta 3.3.3an aipatutako bi joerak berak. Euskara + Badaude, alegia, 3.3.2 eta 3.3.3an aipatutako bi joerak berak. Euskara + + + + zer gertatuko den derrigorrez), (2)an posibilitatea (mundu horretan zer gerta - - zer gertatuko den derrigorrez), (2)an posibilitatea (mundu horretan zer gerta - - A.K.: Asko. Mundu bat dago hor. Kontzeptu batzuk hizkuntzen irakaskuntzan - modaltasun epistemikoak hiztunaren sinesmenak adierazten ditu. Ondoko bi - + modaltasun epistemikoak hiztunaren sinesmenak adierazten ditu. Ondoko bi + ateratzen duen Euskaltzaindiko batzordeko partaide da aspaldiko partez. A.K.: Ez dakit oraindik. Ez dut astirik izan ongi aztertzeko non komeni - daitezke.10 Hizkuntza desberdin askotan formalki agerian egoten diren + daitezke.10 Hizkuntza desberdin askotan formalki agerian egoten diren (43a) *esateko beharrik azken urteotan egiten ari diren ikerketak interes haundikoak izan daitezke 3.3. BEHAR IZAN Herrian finkatu naiz, hasieran Donostian eta azken lau urteotan Zarautzen. urruti samar dago nik ulertzen dudan kontzeptutik. Bestalde, G. Leech - batetatik, geruzapena delako kontzeptuaz ere balia gaitezke.13 Frantses + batetatik, geruzapena delako kontzeptuaz ere balia gaitezke.13 Frantses + - luzatzea, denbora minimoan egiteko apostu egin nuen. Eta hala egin nuen. buruz beste bat hasita daukat. Eta berriena: miscellanea idiomatica delako - litzateke egokia eros(i) nezake (bizkaieraz neike) eta joan ninteke - -Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, + litzateke egokia eros(i) nezake (bizkaieraz neike) eta joan ninteke + +Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, *Euskal Herrian Euskaraz. Euskararen defentsarako herri mugimendua - Forma gramatikalizatuagoen esanahiak orokorragoak, zabalagoak eta + Forma gramatikalizatuagoen esanahiak orokorragoak, zabalagoak eta + +(E) Baliabide linguistikoen zerrenda ez da amaitzen hemen aditzezko -(E) Baliabide linguistikoen zerrenda ez da amaitzen hemen aditzezko + zenbait baliokide erabili ohi diren testuinguruetara larregi zabaltzea. - zenbait baliokide erabili ohi diren testuinguruetara larregi zabaltzea. - - Euskaltzaindia (1987). Euskal gramatika: lehen urratsak, 2. tomoa. Bilbo: Euskaltzaindia. + Euskaltzaindia (1987). Euskal gramatika: lehen urratsak, 2. tomoa. Bilbo: Euskaltzaindia. - epistemikoa adierazten baitu,18 adibidez: - + epistemikoa adierazten baitu,18 adibidez: + + + gramatiketan aipatu ohi diren aditz modalen ezaugarri nagusiak2 -ezaugarri +26. Wilbur-entzat (1981:172) ahal, behar eta nahi "root-modal particles" + Kategoria semantiko gisa, aldiz, modaltasun kontzeptua edozein - gramatiketan aipatu ohi diren aditz modalen ezaugarri nagusiak2 -ezaugarri -26. Wilbur-entzat (1981:172) ahal, behar eta nahi "root-modal particles" - Kategoria semantiko gisa, aldiz, modaltasun kontzeptua edozein - daukagu; hau egiazko aintzindaritzat emango nuke. Orain dela bi urte, bihar edo) beharbada modaltasun epistemikoa adieraz dezakete. eta J. Svartvik-en 1975eko A communicative grammar of English delakoa moduan erabili duzula interesatzen zaizkizun puntu batzuk aztertzeko? - - Behar bezala, nahi berez izena da, nahiz nahi-ren izenezko erabilera - derrigorrez sinonimotzat jotzen direnik, baizik eta hein batetako kidetasun + Behar bezala, nahi berez izena da, nahiz nahi-ren izenezko erabilera + + derrigorrez sinonimotzat jotzen direnik, baizik eta hein batetako kidetasun ideiari jarraituz idatzi zen lehenengo hizkuntz deskribapena; jakina, Galdera: Ematen da notarik edo bestelako kalifikapenik? @@ -80,37 +80,37 @@ Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, zaidan kaleratzea, ezta nor egongo litzatekeen argitaratzeko prest ere. acts kontzeptua dute iturri, baina kontzeptua geroztik oso landua izan - berriro--hots, (55) eta (56), (55) eta (57) erabiltzea baino hobe: + berriro--hots, (55) eta (56), (55) eta (57) erabiltzea baino hobe: + - hau da, ea gramatika deskribapen "osorik" aurkitzen den munduan. Baina haundia da, dedikazio gehiegi eskatuko luke, eta suposatzen duen ezagupen hitza dakarkidala burura, asoziazioz edo). "Epaimahai" bezala, bi kanpoko - -7. Hegoaldeko euskaran; iparraldeko hizkeretan, berriz, (2)ko egiturak + +7. Hegoaldeko euskaran; iparraldeko hizkeretan, berriz, (2)ko egiturak gogoa eduki < nahi izan < - + Lhande, P. (1926). Dictionnaire basque-franais. Paris: Gabriel Beauchesne. - + gero eta presio gehiago egiten ari da Inglaterran tesiak lehenbailehen - - kasua, non derrigorrezkoa baita ahal izan-en erabilpena (edo beste - erabilpena nahi-rena baino are murritzagoa dela dirudi. - + kasua, non derrigorrezkoa baita ahal izan-en erabilpena (edo beste + erabilpena nahi-rena baino are murritzagoa dela dirudi. + + dela inoiz egingo? - + unibertsitateko tesi doktorala denez, inglesez dago noski. Luzeraz, 400 - erabileran berean ez ezik, zuzentasunari buruzko kontzeptuetan ere. Konfusio - ditu, bereizketa zenbait arrazoi sintaktikotan oinarritzen dituelarik. + erabileran berean ez ezik, zuzentasunari buruzko kontzeptuetan ere. Konfusio + ditu, bereizketa zenbait arrazoi sintaktikotan oinarritzen dituelarik. gerundiboa bezalatsu erabilirik).24 - besteak beste, inoiz berezitzat hartu dituzte ikuspegi sintaktiko batetatik, + besteak beste, inoiz berezitzat hartu dituzte ikuspegi sintaktiko batetatik, posibilitatea edo ez-segurtasuna A.K.: Ez dut uste neronek bakarrik tamaina haundiko euskal gramatika Eta 1993ko abenduan Londresko Unibertsitatean doktoratu egin zen linguistikan, @@ -118,7 +118,7 @@ Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, 12. King (1993:110). probetxagarriak gramatika komunikatiboaren teoria lantzerakoan? - + ahozko azterketa bat da, "viva voce" deitzen dena (edo laburturik, "viva" Euskarazko Orrialdea @@ -129,8 +129,8 @@ Halere, azken urteotan nahaste bat gertatzen ari da zenbait hiztunengan, A.K.: Izugarrizkoa. Hitz gutxitan, pragmatikan aztertzen dira linguista - - - - Wilbur, T.H. (1981). Basque syntax. Euskalarien nazioarteko jardunaldiak, pp. 169-186, + + + + Wilbur, T.H. (1981). Basque syntax. Euskalarien nazioarteko jardunaldiak, pp. 169-186, diff --git a/src/modules/language/detector/data/catalan-iso-8859-15.dat b/src/modules/language/detector/data/catalan-iso-8859-15.dat index 3762f1786..94e14462a 100644 --- a/src/modules/language/detector/data/catalan-iso-8859-15.dat +++ b/src/modules/language/detector/data/catalan-iso-8859-15.dat @@ -23,7 +23,7 @@ programa de las "Nits i efecte de garantir d'ara en endavant la l'estructura del Patronat, i ms tard se y el Ayuntamiento - 46 motocicletas y ciclomotores + 46 motocicletas y ciclomotores guionistes. inserir icones d'accs directe al costat del amb seu a Seattle, no t magatzem diff --git a/src/modules/language/detector/data/chinese-big5.dat b/src/modules/language/detector/data/chinese-big5.dat index dce143083..b3fd4a0ac 100644 --- a/src/modules/language/detector/data/chinese-big5.dat +++ b/src/modules/language/detector/data/chinese-big5.dat @@ -1,7 +1,7 @@ ~ Q ` K F p ~ A M b ] _ D C - * ĥ|QE^G睊Bzsh AUUD + * ĥ|QE^G睊Bzsh AUUD j B j B u M h H h K i p ` q u X ~ q M q T @@ -37,8 +37,8 @@ O O D P M p M L T ~ M Y ~ B s ~ s ~ [ ~ T i | C M h O H D q U M q H - * ĤQ^GLͤTڼƽXӬ۾E䲣qCnF - * ĥ|QK^GMG ʵ{ݧﵽ@ĪGݡutv@ + * ĤQ^GLͤTڼƽXӬ۾E䲣qCnF + * ĥ|QK^GMG ʵ{ݧﵽ@ĪGݡutv@ ~ ~ q M u | O q ~ W M ] F i [ H C @@ -59,7 +59,7 @@ | L i N M I l U I l G J W A S A P _ H U G n @ p ~ W j w C - * ĥ|QE^G睊Bzsh AUUD + * ĥ|QE^G睊Bzsh AUUD } M k w M P y M ¾ o { q @@ -67,7 +67,7 @@ d @ i @ B d C x V j o e M C - * ĤCQT^G@CӪOETܥdغؤP + * ĤCQT^G@CӪOETܥdغؤP M ` b G Q C I E a q M F b s @ M ~ D g M C @@ -97,7 +97,7 @@ E Q C C ij O b u L i ` v p U M ~ X ij M PqqlзsDХa - * ĤQ^Gp뱽ynPaEկȤW[¦QrpH + * ĤQ^Gp뱽ynPaEկȤW[¦QrpH e ] x M M w T ~ V q H d P M B X U C ¾ u F w D p | X E K ~ [ ~ v Q diff --git a/src/modules/language/detector/data/chinese-gb2313.dat b/src/modules/language/detector/data/chinese-gb2313.dat index cb3800127..36660d7ce 100644 --- a/src/modules/language/detector/data/chinese-gb2313.dat +++ b/src/modules/language/detector/data/chinese-gb2313.dat @@ -1,158 +1,158 @@ - ̲ס -Ӣ ڽ ʵ ̸ - ʼ - Ӫ Ʊ ǻ ˮ ƽ - - Ա ֳ - ˵ ֧ Ϲ կ -ƻ Ʒ ۸ ϸ ִй - ڿ Ů - Ʒ -Ҫ ˤ ϴ - -Ŀǰ ԭ -ȫϵ С - -ؼ - ҹ ȡ Ŀ ΰɾ - չ ߷ - ȥ - - ˿ ֮ ʮ -չ ڼ -ܵ ũ ӭ - Լ չ Ҫ - ϵ Ǣ - - -Я -Ŀ - ɹ ϵͳ -绰 Ԫ - -Ϲ ⳤ - - - Ӣ ٷ ͳ - ɲ ְ Ƿ Ԫ - - - - - ˵ - -ȳ ک ս -һ Ϸ - - ȡ 彨 ش ʤ -ι ʫ - - ͬ չ ֲ Ӧ - ȫ ҩƷ - Ѯ ֵ - - - ֮ ʮ ս Լ - һ - ë һ Ů ӪҵԱ Ƽ -Ϊ ˳ -Ϻ Ϳ - ո ĥ ˵ -ְ - վ - -ί Ա -ž äĿ - һ ʽ ѵ ѵ - -̶ ٻ Ķ ɭ - ճ - Сʱ ս - ȫ ÿ λ - ȫ ˲ ʹ - ȥ - -վ 쵼 Э - - Ǽ Լ Ԫ - ʵ ƻ - Ү· о - - ʮ - ʲ ɧ κ ϵ - - ά ¯ ʱ -Сѧ ˼ Ҫ dz - - ȡ -Ϊ ά Ŭ -ṩ Ϣ - ֽ ſ - - Ӫ - - - ٿ ṩ Ϣ - ᳹ ִ ӳ - ﷸ κ ֤ -ʳ չ ʽ Ϊ ص - ũ -ʩ λ Υ Ӫ - Σ - ½ о 滮 ʵʩ - ס θ - ˷ ӵ - ũҵ о -й Ͷ ˾ ½ 쵼 - װ ͻ - Լ ɽ ʡ ũ Сѧ -ְ - Ϊ ͳ ҵ ע ѪҺ - Ⱥ - - Ͷ - ʱ -ҹ ﵽ Ƚˮ ƽ -Сѧ ˼ Ҫ dz -Щ ǰ Ȱ -ֹ ҵ ְ - - ߷ -ȫ Ϸ ʡ - ȱ - - ս -ʹ Ʒ ۸ ͬҵ ˮ ƽ - - Ӣ Ӽ - - - ҵ ʵ ˰ Ԫ - ѧ ¥ - ɱ ھ - ܳ -ί - -ȥ - ʱ ̨ ը - ҹ ũҵ ; - Ȩ - - ֽ ʱ ƪ ͷ չ Ϣ - ; - - Ѯ - - - ܳ - ˵ - - - ָ - ʱ ʱ - ߽ -ë - ǰ ֮ ȥ ֮ - - й » -ʹ ջ һ + ̲ס +Ӣ ڽ ʵ ̸ + ʼ + Ӫ Ʊ ǻ ˮ ƽ + + Ա ֳ + ˵ ֧ Ϲ կ +ƻ Ʒ ۸ ϸ ִй + ڿ Ů + Ʒ +Ҫ ˤ ϴ + +Ŀǰ ԭ +ȫϵ С + +ؼ + ҹ ȡ Ŀ ΰɾ + չ ߷ + ȥ + + ˿ ֮ ʮ +չ ڼ +ܵ ũ ӭ + Լ չ Ҫ + ϵ Ǣ + + +Я +Ŀ + ɹ ϵͳ +绰 Ԫ + +Ϲ ⳤ + + + Ӣ ٷ ͳ + ɲ ְ Ƿ Ԫ + + + + + ˵ + +ȳ ک ս +һ Ϸ + + ȡ 彨 ش ʤ +ι ʫ + + ͬ չ ֲ Ӧ + ȫ ҩƷ + Ѯ ֵ + + + ֮ ʮ ս Լ + һ + ë һ Ů ӪҵԱ Ƽ +Ϊ ˳ +Ϻ Ϳ + ո ĥ ˵ +ְ + վ + +ί Ա +ž äĿ + һ ʽ ѵ ѵ + +̶ ٻ Ķ ɭ + ճ + Сʱ ս + ȫ ÿ λ + ȫ ˲ ʹ + ȥ + +վ 쵼 Э + + Ǽ Լ Ԫ + ʵ ƻ + Ү· о + + ʮ + ʲ ɧ κ ϵ + + ά ¯ ʱ +Сѧ ˼ Ҫ dz + + ȡ +Ϊ ά Ŭ +ṩ Ϣ + ֽ ſ + + Ӫ + + + ٿ ṩ Ϣ + ᳹ ִ ӳ + ﷸ κ ֤ +ʳ չ ʽ Ϊ ص + ũ +ʩ λ Υ Ӫ + Σ + ½ о 滮 ʵʩ + ס θ + ˷ ӵ + ũҵ о +й Ͷ ˾ ½ 쵼 + װ ͻ + Լ ɽ ʡ ũ Сѧ +ְ + Ϊ ͳ ҵ ע ѪҺ + Ⱥ + + Ͷ + ʱ +ҹ ﵽ Ƚˮ ƽ +Сѧ ˼ Ҫ dz +Щ ǰ Ȱ +ֹ ҵ ְ + + ߷ +ȫ Ϸ ʡ + ȱ + + ս +ʹ Ʒ ۸ ͬҵ ˮ ƽ + + Ӣ Ӽ + + + ҵ ʵ ˰ Ԫ + ѧ ¥ + ɱ ھ + ܳ +ί + +ȥ + ʱ ̨ ը + ҹ ũҵ ; + Ȩ + + ֽ ʱ ƪ ͷ չ Ϣ + ; + + Ѯ + + + ܳ + ˵ + + + ָ + ʱ ʱ + ߽ +ë + ǰ ֮ ȥ ֮ + + й » +ʹ ջ һ diff --git a/src/modules/language/detector/data/danish-iso-8859-15.dat b/src/modules/language/detector/data/danish-iso-8859-15.dat index 93e7a75b6..2c5dd0f9d 100644 --- a/src/modules/language/detector/data/danish-iso-8859-15.dat +++ b/src/modules/language/detector/data/danish-iso-8859-15.dat @@ -4,21 +4,21 @@ beskftigelseskonsulenterne lser denne opgave. Der er mange grunde hertil, fx r tnker lige som du selv. Du br altid teste din hjemmeside p en konkrete undersgelser er en evaluering af SUM-programmets formidlingsenheder og en undersgelse af de - deltageren vre bevidst om de centrale forhold i at deltage i et projekt, + deltageren vre bevidst om de centrale forhold i at deltage i et projekt, soziokonomische Analyse von Storstrms Amt, Dnemark, und des Kreises Ostholstein, Deutschland. Im - Samlinger, som endnu ikke er ordnede, er altid utilgngelige. + Samlinger, som endnu ikke er ordnede, er altid utilgngelige. at vor indlringsevne stiger ved alfabetiske og systematiske katalog og i de srlige brevregistranter i de browsere, de foretrkker, og som kan kre p deres maskiner, og det er -ikke tilfldet under den nuvrende elforsyningslov. +ikke tilfldet under den nuvrende elforsyningslov. AKF-Nyt nr. 4 december 1994: Tema: Samfund, konomi og milj. -Milevogn til udmling af vejlngder. Et tllevrk opsummerer den krte distance. (Tjhusmuseet) +Milevogn til udmling af vejlngder. Et tllevrk opsummerer den krte distance. (Tjhusmuseet) "Grundfos Worldwide" ville have vret mere dkkende. -Bibliotek) +Bibliotek) - PLACERING -Skjold med Dannebrog- og Elefantordenens kde. (Tjhusmuseet) + PLACERING +Skjold med Dannebrog- og Elefantordenens kde. (Tjhusmuseet) stiliseret tegning. styringsinstrument i forhold til transportomfanget og energiforbruget. Dette sker ved konometriske analyser @@ -34,17 +34,17 @@ Hugo Allardt Koppenhagen. Kobberstik udfrt i Amsterdam i midten af 1600-tallet. den renssanceforskning, der finder sted i Danmark, samt knytte og udbygge forbindelser til udenlandske Det er godt, at der er en klart mrket knap for at skifte sprog for f.eks. har en ikke grafisk browser, fr kun at vide, at siden indeholder "Image" -conference European Welfare Development sharing experience June 27-29 1994 in Denmark. - henvendelse til Telefonbestillingen (33 93 01 11 man-fre 10-13). +conference European Welfare Development sharing experience June 27-29 1994 in Denmark. + henvendelse til Telefonbestillingen (33 93 01 11 man-fre 10-13). Det er veldokumenteret, at et menneske kan holde syv (plus/minus to) begreber Hndskrifter og arkivmateriale er unikt kildemateriale, der ikke -Den ny Aristoteles +Den ny Aristoteles Kopiering Der var system og teori bag de store jagtscener: kobbertavler fra Jo. Tntzer's jagtbog, eller Jagt Wissenschaft, Dannebrogsordenen. De hvide riddere af Dannebrogsordenen var frst og fremmest embedsmnd, der stod lsesalen p Amager. Der tages forbehold overfor skrbeligt og - Karen Blixens arkiv + Karen Blixens arkiv gre det klart, at det ikke er et link til Ramblls egen ledelse. energi. Christian frte dagbog over sine oplevelser under dannelsesrejsen. Flere i prinsens flge skrev ogs dagbger, @@ -55,12 +55,12 @@ Christian frte dagbog over sine oplevelser under dannelsesrejsen. Flere i prins projekt. det gr det ikke. Linket gr til en generel web-side om brskurser. Den enevldige kongemagt nskede at skabe et system, hvor det var klart, at re og -Christian 5. Kobberstik af Pieter van Haarlem fra 1686. (Det kongelige Bibliotek) -conference European Welfare Development sharing experience June 27-29 1994 in Denmark. +Christian 5. Kobberstik af Pieter van Haarlem fra 1686. (Det kongelige Bibliotek) +conference European Welfare Development sharing experience June 27-29 1994 in Denmark. Danmark end de langt mere reguleringstunge engelske og amerikanske modeller. Den store vgtning af Aristoteles, end i de foregende 1000 r. Endvidere blev de middelalderlige, latinske Aristoteles-oversttelser - Thott + Thott hndskrifter og privatarkiver, breve, manuskripter, optegnelser ses som karakteristiske for det moderne samfund. 1400 og 1500-tallets mest markante bidrag til det Jahre und die Erwartungen fr die nchsten 1-2 jahre. Im Abschnitt vier werden die langfristigen @@ -68,8 +68,8 @@ Jahre und die Erwartungen fr die nchsten 1-2 jahre. Im Abschnitt vier werden d siden overset af mange. udviklingen af renssancens epos og for teatret. Endelig kom Politikken, der i Leonardo Brunis oversttelse - Martin Andersen Nexs arkiv + Martin Andersen Nexs arkiv af kongemagten og sikringen af dens voldsmonopol var flles for flertallet af stater i I anledning af kongens frelse fra havet skrev Thomas Kingo et hyldestdigt til Christian 5. Omtalen af -prinsesser var indtgtskilde for de kbenhavnske bogtrykkere i 1700-tallet. (Det kongelige Bibliotek) +prinsesser var indtgtskilde for de kbenhavnske bogtrykkere i 1700-tallet. (Det kongelige Bibliotek) Jensen, Torben Pilegaard, Franck Andersen, Sren Arnberg, Jan Christensen: AMU og kommunerne. 152 diff --git a/src/modules/language/detector/data/english-iso-8859-15.dat b/src/modules/language/detector/data/english-iso-8859-15.dat index 696bd1679..a825a3cce 100644 --- a/src/modules/language/detector/data/english-iso-8859-15.dat +++ b/src/modules/language/detector/data/english-iso-8859-15.dat @@ -1,62 +1,62 @@ - deputies of the strongest cities awed and corrupted those of the - leaders became mercenary instruments for inveigling their countrymen. - government and her legislation. This circumstance alone proves a - nation we have made peace and war; as a nation we have vanquished - government itself; and there is nothing to check the inducements to - constitution, it emphatically illustrates the tendency of federal - of an adoption of the new Constitution or a dismemberment of the - bodies rather to anarchy among the members, than to tyranny in the - injustice, and confusion introduced into the public councils, have, - abetted by Athens and Sparta, refused to submit to the decree. The - commencing demagogues, and ending tyrants. - form the memorable Congress of 1774. That body recommended certain -government, frequent appeals would, in a great measure, deprive - the possession of different degrees and kinds of property - chains, under which it is groaning at this hour. - Theoretic politicians, who have patronized this species of -less adverse to the executive and judiciary departments. The - unfriendly passions and excite their most violent conflicts. But - of the members on the federal head. - Achaeans, though weakenened by internal dissensions and by the - and to inflict vengeance on sacrilegious despoilers of the temple. - or extensive republics are more favorable to the election of proper -Had the Greeks, says the Abbe Milot, been as wise as they were - or by other means, first obtain the suffrages, and then betray the - insuperable obstacle to a uniformity of interests. The protection - place in one national government. - as successors of Alexander, were rivals of the king of Macedon. - sentiments and views of the respective proprietors, ensues a - party and faction in the necessary and ordinary operations of the - ADOPTION WILL AFFORD TO THE PRESERVATION OF THAT SPECIES OF - society, the fewer probably will be the distinct parties and - interests, the more frequently will a majority be found of the same - have already sufficient indications that it will happen in this as -The influence of factious leaders may kindle a flame within - circumstances and lesser interests; as by reducing it too much, you - The Amphictyons were the guardians of religion, and of the immense - time, be perfectly equalized and assimilated in their possessions, - commencing demagogues, and ending tyrants. -expense of the other departments. The appeals to the people, - increased variety of parties comprised within the Union, increase - influence on each other; and the former will be objects to which -government hold their power, is derived, it seems strictly - majority at the same time must be prevented, or the majority, having - Union gives it the most palpable advantage. - she had been a member, left her in the full exercise of her - the one, by destroying the liberty which is essential to its - in what degree, by restrictions on foreign manufactures? are - nature. I am well aware that it would be disingenuous to resolve - the reasons on which they are founded. The consciousness of good - abetted by Athens and Sparta, refused to submit to the decree. The - confederation, and persevered in her union, she would never have - TO PRESERVE THAT UNION THE NECESSITY OF A GOVERNMENT AT LEAST - wrong election of the part we shall act may, in this view, deserve - regarded as the era in which that decision is to be made; and a - attached, provides a proper cure for it. The instability, - increased variety of parties comprised within the Union, increase -most influential part of the society. The nature of their public - in the substitution of representatives whose enlightened views and - attempts, from whatever quarter, to influence your decision in a -As a weak government, when not at war, is ever agitated by - number of unsocial, jealous, and alien sovereignties. -Whilst the Amphictyonic confederacy remained, that of the + deputies of the strongest cities awed and corrupted those of the + leaders became mercenary instruments for inveigling their countrymen. + government and her legislation. This circumstance alone proves a + nation we have made peace and war; as a nation we have vanquished + government itself; and there is nothing to check the inducements to + constitution, it emphatically illustrates the tendency of federal + of an adoption of the new Constitution or a dismemberment of the + bodies rather to anarchy among the members, than to tyranny in the + injustice, and confusion introduced into the public councils, have, + abetted by Athens and Sparta, refused to submit to the decree. The + commencing demagogues, and ending tyrants. + form the memorable Congress of 1774. That body recommended certain +government, frequent appeals would, in a great measure, deprive + the possession of different degrees and kinds of property + chains, under which it is groaning at this hour. + Theoretic politicians, who have patronized this species of +less adverse to the executive and judiciary departments. The + unfriendly passions and excite their most violent conflicts. But + of the members on the federal head. + Achaeans, though weakenened by internal dissensions and by the + and to inflict vengeance on sacrilegious despoilers of the temple. + or extensive republics are more favorable to the election of proper +Had the Greeks, says the Abbe Milot, been as wise as they were + or by other means, first obtain the suffrages, and then betray the + insuperable obstacle to a uniformity of interests. The protection + place in one national government. + as successors of Alexander, were rivals of the king of Macedon. + sentiments and views of the respective proprietors, ensues a + party and faction in the necessary and ordinary operations of the + ADOPTION WILL AFFORD TO THE PRESERVATION OF THAT SPECIES OF + society, the fewer probably will be the distinct parties and + interests, the more frequently will a majority be found of the same + have already sufficient indications that it will happen in this as +The influence of factious leaders may kindle a flame within + circumstances and lesser interests; as by reducing it too much, you + The Amphictyons were the guardians of religion, and of the immense + time, be perfectly equalized and assimilated in their possessions, + commencing demagogues, and ending tyrants. +expense of the other departments. The appeals to the people, + increased variety of parties comprised within the Union, increase + influence on each other; and the former will be objects to which +government hold their power, is derived, it seems strictly + majority at the same time must be prevented, or the majority, having + Union gives it the most palpable advantage. + she had been a member, left her in the full exercise of her + the one, by destroying the liberty which is essential to its + in what degree, by restrictions on foreign manufactures? are + nature. I am well aware that it would be disingenuous to resolve + the reasons on which they are founded. The consciousness of good + abetted by Athens and Sparta, refused to submit to the decree. The + confederation, and persevered in her union, she would never have + TO PRESERVE THAT UNION THE NECESSITY OF A GOVERNMENT AT LEAST + wrong election of the part we shall act may, in this view, deserve + regarded as the era in which that decision is to be made; and a + attached, provides a proper cure for it. The instability, + increased variety of parties comprised within the Union, increase +most influential part of the society. The nature of their public + in the substitution of representatives whose enlightened views and + attempts, from whatever quarter, to influence your decision in a +As a weak government, when not at war, is ever agitated by + number of unsocial, jealous, and alien sovereignties. +Whilst the Amphictyonic confederacy remained, that of the diff --git a/src/modules/language/detector/data/finnish-iso-8859-15.dat b/src/modules/language/detector/data/finnish-iso-8859-15.dat index 6220bb56e..88de67d1a 100644 --- a/src/modules/language/detector/data/finnish-iso-8859-15.dat +++ b/src/modules/language/detector/data/finnish-iso-8859-15.dat @@ -21,7 +21,7 @@ GHOSTS...of the Civil Dead -elokuvan nostattamassa keskustelussa on kiinnitetty soidinhuutojaan kirkkaina alkuiltoina ennen keskiyt, jolloin ni kantaa Viittaamme ylloleviin vastauksiin. puuhailevat kahden koulupivn ajan ympristkysymysten parissa. Pienryhmiin jakaantuneina nuoret - Muutoksenhakuelimen toimiva valtion tilintarkastuslautakunta + Muutoksenhakuelimen toimiva valtion tilintarkastuslautakunta naistoimikunnan toiminnasta useita vuosia.. Olen jrjestnyt lukemattomia @@ -49,14 +49,14 @@ Glover - Kevin Mackey Helsinki kaataa huvikseen mets Nuuksiossa! uusia ihmisi toimimaan ympristn puolesta. Koulujen pienryhmist kehkeytyy helposti pysyvi maitotlkkej, vai peltilehm, suurta maitosilit? Ent onko voi tarjolla viheliisiss napeissa vai reilun - tuovat. Olen huolestunut ja aion vaikuttaa + tuovat. Olen huolestunut ja aion vaikuttaa Mit tulee postitoiminnan kokonaisuudelle aiheutuvaan haittaan, Keskuskauppakamari toteaa, -oikeuttaa status quon silyttmiseen thtvt yhteiskunnalliset kontrollivlineet, kuten poliisivoimat." +oikeuttaa status quon silyttmiseen thtvt yhteiskunnalliset kontrollivlineet, kuten poliisivoimat." stmisjrjestyksess. - Keskuskauppakamarin mielest argumentti ei ole vakuuttava edell esitetyin perustein. + Keskuskauppakamarin mielest argumentti ei ole vakuuttava edell esitetyin perustein. yrityksen ja rahoittajan vlinen keskininen periaatteessa vapaa sopimustilanne, yhtyy - Helvetiss. + Helvetiss. Jos hakija haluaa toiminta-aluettaan nyt laajennettavan siten, ett sill olisi vaikutusta hakijan jrisyttvsti, ett niit voidaan sanoa samanlaisiksi - ja kuitenkin erilaisiksi - yht avoimiksi ja suojatuiksi: diff --git a/src/modules/language/detector/data/georgian-unknown.dat b/src/modules/language/detector/data/georgian-unknown.dat index c2604b20c..9cf45b463 100644 --- a/src/modules/language/detector/data/georgian-unknown.dat +++ b/src/modules/language/detector/data/georgian-unknown.dat @@ -16,7 +16,7 @@ , " ", " "? , - : , . - . - + @@ -29,7 +29,7 @@ " " , ", II. . , - + , , , @@ -43,7 +43,7 @@ , " ", , , - + . : - ... , . @@ -74,7 +74,7 @@ , , . " , "" "". , , "". - + . ""- ! . , , diff --git a/src/modules/language/detector/data/hebrew-iso-8859-8.dat b/src/modules/language/detector/data/hebrew-iso-8859-8.dat index b717ed68d..099821840 100644 --- a/src/modules/language/detector/data/hebrew-iso-8859-8.dat +++ b/src/modules/language/detector/data/hebrew-iso-8859-8.dat @@ -1,51 +1,51 @@ - , , + , , , . . ," , - - , . + + , . . . , , - , " " , + , " " , 67 - , . - + , . + . , - . + . , ' " . . .7 - . - , , - . , ," + . + , , + . , ," - " " : + " " : - 7 ' - - + 7 ' - - - (") " + (") " , ." , . - : . - , , - " , " - + : . + , , + " , " + . - . ," , + . ," , ) , , 4 , : : @@ -53,26 +53,26 @@ , , . - . , , + . , , " , . , . - , + , ... , - , + , - . 60 - ' - " - , , . + . 60 - ' + " + , , . . ," (1979) , . . - - . " " - (") " + - . " " + (") " , , " diff --git a/src/modules/language/detector/data/hungarian-iso-8859-2.dat b/src/modules/language/detector/data/hungarian-iso-8859-2.dat index cb88aa84f..86f4661ca 100644 --- a/src/modules/language/detector/data/hungarian-iso-8859-2.dat +++ b/src/modules/language/detector/data/hungarian-iso-8859-2.dat @@ -7,7 +7,7 @@ Az a sok vz aztn szpen tnkre is tette azt a sok szegny kori fldmrt s e S hogy lett este Utnajrt a dolgoknak s kidertette, hogy a vast kilnknt 50 frankot fizet. Ekkor tmadt az tlete, hogy - + eszseket egy kiss tlmretezte, ebbl kifolylag a Fldet egy hatalmas rvz mosta el. betegsg miatt meghisult utazs kltsgeit trti meg. Replvel trtn utazs esetn az @@ -27,14 +27,14 @@ A jtk szignlja a kvetkez kppen nzne ki: A vegyes letbiztostsoknak - az gyfelek krben rendkvl npszer - alapmdozata. Ha a mozdony egy szikrjtl meggyullad a brnd, akkor mennyit fizet krtrtsknt a vasttrsasg? A Szns-hegyeket a pannon flra blcsjnek tartjk, a kutatk szerint a nvnyek -Hrom v mlva lehet rtejnni. +Hrom v mlva lehet rtejnni. trzs: az n drga, gynevezett npem maga. Msnap reggelre, Ha divathzban akad nki dolga, - visszafizetsvel. + visszafizetsvel. Februr: levizsgzik geodzibl, s megbukik matekbl. Cseh Kztrsasg, valamint Szlovkia Budakeszi kzelben vadasparkot hoztak ltre, ahol a budai erdkben is honos @@ -42,7 +42,7 @@ Februr: levizsgzik geodzibl, s megbukik matekbl. Nvnybiztosts, rvzkrbiztosts, jgkr, tli fagykr, szlgykereztet iskolk jgkra, szl kivgja. -Nappali tagozat: 210 f (hrom vfolyam, mindkt ltez szak egytt) +Nappali tagozat: 210 f (hrom vfolyam, mindkt ltez szak egytt) A szerzds idtartama lehet tbb v, de ha kell, akr egy nap is. kedvez volt. A hordnyi borban sszelltak az eszencik, s a mi Urunk jkedvt igazoland egy eddig @@ -61,7 +61,7 @@ volna, hogy Magyarorszg fvrosa Budapest. Vagy ppen Debrecen, esetleg Pozsony Ht mg egyszer kptt. emlskn, madarakon kvl szmos egyb llattal tallkozhatnak a kirndulk. - Generali, mr Knban is + Generali, mr Knban is diff --git a/src/modules/language/detector/data/icelandic-iso-8859-1.dat b/src/modules/language/detector/data/icelandic-iso-8859-1.dat index 349dd2130..47315cc0c 100644 --- a/src/modules/language/detector/data/icelandic-iso-8859-1.dat +++ b/src/modules/language/detector/data/icelandic-iso-8859-1.dat @@ -1,7 +1,7 @@ - + verkfri um eina milljn krna. - + Brunavarna Suurnesja var kalla t. Hvtir kanar @@ -23,7 +23,7 @@ og jnustufyrirtki svinu. g hef unni a essu mli marga mnui - + gstsson astoaryfirlgreglujnn Grindavk. ar b ttast menn fyrirtki a reka starfsemi bjarflaginu, skrt s teki fram a sk. "step by step" og er ekkt tgfuafer erlendis. Einnig stendur @@ -43,24 +43,24 @@ r hfu veri fer mib Keflavkur lngu eftir a a var kominn Gti ori mikil lyftistng fyrir Suurnesin - - + + unga sem hefur veri landslii matreislumanna undanfarin r. r fiskvinnsluhsi Suurnesjum. Myndin tengist greininni ekki neinn Slmar veurhorfur voru um mija sustu viku og hfu menn stu sr ar sem hann l glfinu. Tvr tennur brotnuu og arar losnuu fyrir stt flskunnar. Kokteilar sem essir eru ekki algengir gtueirum - + undirheimunum. ar nttust eir framleislu fkniefna. llu landinu Reykjanesb a undanskildum Garab. eirri naflaskoun bkun meirihlutans vi afgreislu fjrhagstlunar kemur fram a forsendur - - + + sem lgreglan er a hafa afskipti af vegna neyslu eiturlyfja. htt. @@ -70,7 +70,7 @@ - + gerur t n heldur Bragi GK. Unni a veglegum fkniefna-bklingi Uppsgn samninga lgleg @@ -90,7 +90,7 @@ sr ar sem hann l glfinu. Tvr tennur brotnuu og arar losnuu Reykjanesb kemur ljs a bum Hfnum fkkai um 14,6% aa fkkai - + tlai eiginkonu sinni, fr Duus, a rkta matjurtir og trjplntur, eru "harari" efnum en ur ekktist. @@ -111,18 +111,18 @@ au Benedikt og Heirn eru ng me breytingarnar aptekinu og segja gerur t n heldur Bragi GK. - + vera sjnum. Happasll hefur fengi 240 tonn 16 dgum. Smu sgu ramtum og nmerapltur hafa fengi a fjka af 75 blum ar sem eigendur fara 14% en fjrmagnskostna og afborganir 9% af skatttekjum, um nutu - + hbb a verkframkvmdir vegum Mannvirkjasjs Nat yru bonar t, sem egar - + geta leita til Lgreglunnar sma 421 5500 ea slkkvilis sma - + eru tlaar ann li. eignfra fjrfestingu eru tlaar 9 millj. diff --git a/src/modules/language/detector/data/irish-iso-8859-1.dat b/src/modules/language/detector/data/irish-iso-8859-1.dat index 89107a804..7f00c5cf8 100644 --- a/src/modules/language/detector/data/irish-iso-8859-1.dat +++ b/src/modules/language/detector/data/irish-iso-8859-1.dat @@ -1,28 +1,28 @@ - + ceann = one - - - + + + it igin in irinn. Ag teacht abhaile n sipal L Fhile Pdraig di, go dt Ti-Boy. an oiread acu = as many of them - - - + + + "Is fidir, a bhean uasal," a d'freagair an portrid. - + "An-asca, is osa mac Muire." - + Freagraonn an bhean rialta eile: cloiseann s paidreacha a mhic ars: @@ -30,38 +30,38 @@ - - + + bh s ina chd probhideadh acu: "Ar mhaith leat an nochn a dhanamh?" Chonaic s foirgneamh ard, agus dhruid s leis. Tharraing s comhartha - + Forscal n Ollscoil anseo i nGaillimh: Ti-Boy: Chihuahua!?! T t ag tarraingt asam! Dheamhan seans ag mada Tann an buachaill beag a lu agus tig lena athair a phaidreacha a chloisteil: - + Bh cailn beag san fholcadn in ineacht lena dearthir beag. Tar is - + SEATAC, ait ar thuirling s sln. - + T iontas ar an mbean rialta, ceart go leor, ach s rud gurb eisean cpla oche shinn ag l cpla pinta agus d'inis s scaln dhom faoi - + T fgra faighte agat... - + ar an rothar seo. Lim s den rothar, 's bhain s di a cuid ada uilig bh s ina chd probhideadh acu: "Ar mhaith leat an nochn a dhanamh?" @@ -75,26 +75,26 @@ agus h br cn galradh a bhuail Sen t a fhios ag Dia go cheannaigh "Ach," a deir s, "nl teanga ar bith ann a bhfuil dearfach dbailte ach n fhaigheann siad ach gnsacht mar fhreagra. - + Tamall ina dhiaidh sin, d'iompaigh s chun an stra ars: L amhin bh s ag iarraidh tobac a cheannacht sa siopa. "Old Holborn" - + t ag dul?" "Ceart go leor," a deir an t-stir. dearthir = brother gcathair, agus dirt s leis an stir, - + "Nl, a chro, ach m fhaighim bs, psfaidh m'fhear ars, t m cinnte. - + An Striapach agus an Tuathnach Chonaic s foirgneamh ard, agus dhruid s leis. Tharraing s comhartha - - + + mian liom a bheith g agus lainn." Bingo! Bh s g agus lainn. Chaith ar a raibh scrofa "C bhfuil m?" agus chroch amach ar an fhuinneog - + @@ -106,28 +106,28 @@ - T m cinnte. FAIGH FIN AN PHLUID MHALLAITHE D !!! "Maith go leor. Scaoil amach iad", arsa mo dhuine. - + "Tabharfaidh m seans duit do chuid airgid a fhil ar ais. Cuirfidh m - + chuaigh s sos go dt an tr d fhin le lu ar an ngainimh. Thit s "Ceart go leor," a deir an t-stir. - Earra ar cairde. Comhtharl? "Musa", a deir Pidn, "N faitas at mo choinnal imo shu ach - + "Bhuel," a deir an pas, "an bhfuil t cinnte dearfa gur ar neamh a bheas - + isteach. Tar is cpla focal leis an mbartender, chuaigh an fear seo da bhr sin t m ag usid ainmeacha bragach sa scal. Bh m Tigh Mhirtn N sa Fhaiche Mhr anseo i nGaillimh le m'athair amhin n dirt an tAlbanach, ach thg s an chuileog as a phionta agus - + Praic Cualin - + Ti-Boy agus na Madra @@ -136,7 +136,7 @@ tada!" - + Bean rialta @@ -148,9 +148,9 @@ Dolan!" - + - T brn orm ach nl ach seomra amhin fgtha agam. Caithfidh t a - + . Chonaic na daoine san fhoirgneamh an chomhartha, agus go gasta, scrobh 1. ti (<- petit) = beag i bhFraincis Cajun cloiseann s paidreacha a mhic ars: @@ -162,31 +162,31 @@ phsta. Tann an buachaill beag a lu agus tig lena athair a phaidreacha a chloisteil: - + Bh seanbhean ina su ar bhinse i bpirc i Mosc, ag lamh "Teach Yourself - - + + Bh fear ag iarraidh gabhil ar imirce chun na hAstrile. Chuaigh s an fholctha, dirt s lena mthair, "Cn fth nach bhfuil pp agamsa - + "Nl a leithid agam", a d'feagair s, "ach t cuid ag teacht isteach - + go ndanfaidh S an Talamh a scriosadh faoi cheann tr l." - - + + agus greim a bhreith ar a shil eile. - - - + + + @@ -201,9 +201,9 @@ dt anois, mura raibh sibh ssta le chile? [i dtir seachas ire a bh - + Clinton, Yeltsin agus Paisley saol mr, le go mbeidh seans acu aithreachas a dhanamh." - - + + diff --git a/src/modules/language/detector/data/japanese-shift_jis.dat b/src/modules/language/detector/data/japanese-shift_jis.dat index 27449e154..48f8aaa2a 100644 --- a/src/modules/language/detector/data/japanese-shift_jis.dat +++ b/src/modules/language/detector/data/japanese-shift_jis.dat @@ -16,7 +16,7 @@ yziPjXCT[ő卪̂܂܂ɂāAy̒X[vŎςB R[q[Lݏ̌ʂ ܂BʓIȂ̂͂ Ɏ݂AxXgłB - + @Ql̎qiwQN̒j qƍZRN̏̎qj̎q ĂāA˂Ă 𑝂₵Aቺɖ𗧂 BɁAHׂSɔR ĂĔ얞h~ɂȂ܂B @@ -33,7 +33,7 @@ @{t́uŏdvۑvƂČfĂ(1)sv(2)\v(3)Љۏ\v(4)oύ\v(5)ZVXev(6)v̑́B ȂȂĐbɂȂl Ɏ炾vB̐lɂ낢 ƂꂽBłACɂ ~iɂȂ܂B܂AR pAׁEɁEH ɂʂ܂BƂɃr^ - + @Ȃ͔z_͂AP̖育Ƃɉp[Zg̎kŌʂ\B āAƎcł lO̍ٔɂȂ肽ł ˁv @@ -57,7 +57,7 @@ @ux̓t@bVȂł ˁB̗x̗ǂcĂ ƓɗsĂ̂ B}ɁAȂ łȂ̂ɁAhXƃx[ ͎̎茳ɂB - + YƌoϐV̐OYE햱 씭@uN[^[v̒n Pɂ @@ -66,7 +66,7 @@ ySňSł鍑z @ă\Η̏ÍAAoς̗ʂɂ킽萢Ẻ邱ƂƂȂ܂AǒnIȒn整댯͈ˑRƂĎcĂ܂B̉ŁA킪̈SAăAWAmn̕aƈǂ邩́A킪ʂO̍łdvȉۑł܂B - 씭@PQû܂v + 씭@PQû܂v P̃bZ[W̖ڎɖ߂B nSƓkɁAROVw diff --git a/src/modules/language/detector/data/romanian-iso-8859-2.dat b/src/modules/language/detector/data/romanian-iso-8859-2.dat index 3f9fe1c74..821ff38a0 100644 --- a/src/modules/language/detector/data/romanian-iso-8859-2.dat +++ b/src/modules/language/detector/data/romanian-iso-8859-2.dat @@ -1,4 +1,4 @@ -dezumfla ciorapii de matase ai domnisoarei atlantide cufarul care +dezumfla ciorapii de matase ai domnisoarei atlantide cufarul care omului este DADA. destul de logic. @@ -8,16 +8,16 @@ tata sau papa? ah, chie, mama, ah, domnisoara, ba nu, profesoara ! DEPINDE DE FORMA DATA buna ziua -Dada e teribil: nu se induioseaza in fata infringerilor inteligentei. -Un manifest este o comunicare facuta lumii intregi, in care nu se +Dada e teribil: nu se induioseaza in fata infringerilor inteligentei. +Un manifest este o comunicare facuta lumii intregi, in care nu se vecinilor. la TV, unde in plina emisiune ardea o hirtie de 500 de franci (mai mare nu - foarte rapid impopulara, scrie ziarul francez + foarte rapid impopulara, scrie ziarul francez si cu sens unic. E ceea ce a fost fara indoiala un "cartier popular" acum strecor in fata si constat ca organizatorii se opresc in fata unei bojdeuci pe Astfel intre brazii cu tulpini de ceara -taiate pe din doua, in care vezi stralucind brun sau violet cristalele interioare, +taiate pe din doua, in care vezi stralucind brun sau violet cristalele interioare, nici metode, nici excese persuazive. si urlau hienele si gemeau acrobatele in remorci de hirtie. pe care-o ajut sa se dezbrace si sa se culce @@ -31,15 +31,15 @@ ca femeile lui kooning. functia si masina si as fi purtat lantzug de argint pe coastele costelive. <I>iata pentru ce veti crapa cu totii,</I> -pe acela care are in miini cheia niagarei omul care schioapata +pe acela care are in miini cheia niagarei omul care schioapata -pina la tinerelul cu mustata si creier si pina la masculul cu calvitie si +pina la tinerelul cu mustata si creier si pina la masculul cu calvitie si defavoarea celor doi contracandidati ai sai, Ulm Spineanu si scara redusa realizat stingaci de un copil grabit sau neglijent. Dintr'una au ramas numai traversele, sinele au fost ridicate de mult de vreun -intra pe o straduta ingusta unde aproape se blocheaza. Ce dracu cauta aici? Ma +intra pe o straduta ingusta unde aproape se blocheaza. Ce dracu cauta aici? Ma asupra noastra, antologia compasulete, @@ -51,7 +51,7 @@ dar iarna, iarna cu tine... tii tu minte, annabell lee, seama, peste un pod ca in Eliade, peste unul din aceste Finis Africae pe linga "Ei" au gasit un mod abil de a ne indeparta, si poate ca dupa douazeci de - cu Romania + cu Romania dragostea nu moare niciodata. dar fi cele mai fericite momente ale zilei; nici un terminal @@ -59,13 +59,13 @@ Dada este dictatura limbajului, posibila o intoarcere in Romania. vreun motiv special pentru care s'a oprit circulatia? Nu, zice, ca sa se plimbe e pace, pace si realism. -sticla plin cu pietre verzi translucide cam de marimea unei unghii, grele si la fel +sticla plin cu pietre verzi translucide cam de marimea unei unghii, grele si la fel intriga lui ensor. si birfeala sotilor prin cancelarii. In orice caz, o initiativa deosebit de reusita ("un bon coup de pub") al dreptei da' ce se intimpla de fapt? Pai, zice cocoselul-sef, nu vezi? Lumea se plimba. E XIV -Stapinul locurilor e batrin, schiop si vorbeste cu un accent puternic. E ungur de -decit biografia voastra pe care voi o clociti sub burta cerebelului +Stapinul locurilor e batrin, schiop si vorbeste cu un accent puternic. E ungur de +decit biografia voastra pe care voi o clociti sub burta cerebelului la TV, unde in plina emisiune ardea o hirtie de 500 de franci (mai mare nu Rumeioara juna, cu burtica mare, @@ -73,30 +73,30 @@ politica a manifestatiei. O buna parte din ceilalti participanti gindesc la fel, laudat fie'i numele, mai bine ca se zgirceste la asta decit mult. Totul este invadat de verdeata si parasit, cu vagi arome de Rem sau de ceata cu ochii mari, cu sinii aproape vizibili prin tesatura capotului. -Casa in care m'am mutat e o casa foarte ciudata (spun ciudata in lipsa unui +Casa in care m'am mutat e o casa foarte ciudata (spun ciudata in lipsa unui -eu ca omul. Voi ramine cu impresia agreabila a unei manifestatii civilizate si +eu ca omul. Voi ramine cu impresia agreabila a unei manifestatii civilizate si Parisien", care considera ca, desi comunistii au fost inlaturati de increderea alegatorilor, pentru a forma un guvern trainic, -si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei +si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei dragostea ?! toata lumea pare sa creada ca sint lenes, omului este DADA. raselor si epistolarul perfectionat al amaraciunii. -si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei +si cel mai putin daunator este acela de a te jefui pe tine insuti. Ei (baietii dintr-a opta poate dincolo de firesc) Seara, pe la ora opt, tot datoriata acestei Doamne capricioase care este Maria XV Seara, pe la ora opt, tot datoriata acestei Doamne capricioase care este Maria -ca si celelalte forme, afaceri, casatorii, vizite, razboaie, +ca si celelalte forme, afaceri, casatorii, vizite, razboaie, iar noi citeam in statia lui 31 oriana fallaci -ei sint acei care, fara sa stie, ii doresc si-i pregatesc o +ei sint acei care, fara sa stie, ii doresc si-i pregatesc o Chemati in amintire fiinta pe care o iubiti cel mai mult. cu un mar si tigara de sufletu lu Serge. Dupa care onoram cu prezenta noastra ponderii parlamentare, PNTCD, USD si PNL au acceptat, in -nu fara o oarecare gratie, da de trei ori ocol Coloanei din Iulie si o porneste +nu fara o oarecare gratie, da de trei ori ocol Coloanei din Iulie si o porneste o femeie oarecare ma incoltise: sint o oglinda purtata de-a lungul unei oglinzi. diff --git a/src/modules/language/detector/data/russian-koi8-r.dat b/src/modules/language/detector/data/russian-koi8-r.dat index 04540280f..40809abe8 100644 --- a/src/modules/language/detector/data/russian-koi8-r.dat +++ b/src/modules/language/detector/data/russian-koi8-r.dat @@ -1,38 +1,38 @@ ", ""), - , - + - - , - -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... + -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... , . ... , "" - + - , ? . - - , - , - , , - . , - , , 60 , , ... - . - () , , . + , - , + , , - . , - , , 60 , , ... - . - () , , . + + + : , , , , . (, .) - : , , , , . (, .) - - , , . - . . ? + , , . - . . ? , , , . - + , -- . . - - - , . , - , 2000 . , , - ( ). . . - 300 , . , , , , 200 . , , , 300 . . , . 50 , 200 . . . . 4- . , , 1 . +- . . - - - , . , - , 2000 . , , - ( ). . . + 300 , . , , , , 200 . , , , 300 . . , . 50 , 200 . . . . 4- . , , 1 . - -. . . , . , , 1920 . , , . . . . . . - - , , . + -. . . , . , , 1920 . , , . . . . . . - - , , . ? ? , , - - , . , , , , . - -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... + + , . , , , , . + -, , . , ? . , . . , , , 34- - . - ( , ) - . , , . . - ... diff --git a/src/modules/language/detector/data/russian-windows1251.dat b/src/modules/language/detector/data/russian-windows1251.dat index b94dd200e..596fec10c 100644 --- a/src/modules/language/detector/data/russian-windows1251.dat +++ b/src/modules/language/detector/data/russian-windows1251.dat @@ -9,7 +9,7 @@ . , ? ? - , . , , - + : - " . , , ? @@ -27,7 +27,7 @@ . , , - - + . , , . . , @@ -68,7 +68,7 @@ , ? - + . 12 , , : , , ! , . , diff --git a/src/modules/language/detector/data/slovak-windows1250.dat b/src/modules/language/detector/data/slovak-windows1250.dat index 27295c2cc..8988c023a 100644 --- a/src/modules/language/detector/data/slovak-windows1250.dat +++ b/src/modules/language/detector/data/slovak-windows1250.dat @@ -6,7 +6,7 @@ Systmovm problmom vak bude cena repy a odbyt cukru, ktorho vlaajia - + - Vna do vedomia obanov naptie a neistotu, ktorch zkonitm vystenm monost, a poda schopnost ich vedcich initeov. POPRAVA NA VLASTN IADOS @@ -36,7 +36,7 @@ Systmovm problmom vak bude cena repy a odbyt cukru, ktorho vlaajia cirkv proti vlde a o masmedilnom vymvan mozgov sa nikto neponha iba hraj. - + Jozefovi Barusovi, predstaviteovi pchovskej firmy Matador v uzbeckom dotovania telefnnych prstrojov. Budci tde zana Globtel GSM predva diff --git a/src/modules/language/detector/data/slovenian-iso-8859-2.dat b/src/modules/language/detector/data/slovenian-iso-8859-2.dat index da3619254..d0135890e 100644 --- a/src/modules/language/detector/data/slovenian-iso-8859-2.dat +++ b/src/modules/language/detector/data/slovenian-iso-8859-2.dat @@ -45,7 +45,7 @@ dejal Stanko Nerad in pristavil, da dogajanje dejansko zanima vse iz predvidenega prorauna; dejal je, da so se e lani prispevki za - + "Avstrija se je pogajala zelo dolgo," je odvrnil med smehom. "Odkrito Evrope - "za katero ni politine alternative in ki pomeni krepitev da bi z raunalnikim branjem listin in s posebnimi voznimi pasovi @@ -68,7 +68,7 @@ zahteva, da jim posreduje svoja stalia. Za poslanca dravnega zbora, ki bo zamenjal Zorana Thalerja (LDS), v delegatskem sistemu. - Branko Maksimovi + Branko Maksimovi vrzel v ukrepu, in bi slovenski delavci e imeli nekaj monosti za Viktor Klima (ki so ga v Ljubljani sprejeli z najvijimi in tudi @@ -81,7 +81,7 @@ prizoriu. Katastrofa v Amsterdamu (9:1) sodi med najbolj "rne kluba iz Ljudskega vrta. Seveda pa tudi ta okoliina ni nobena tolaba bil dosegljiv. - + in zgolj dokumentarno nizajo vsebine masovnih medijev: kariera, druina, predsednika drave, te bodo 23. novembra, in volitev dravnih svetnikov, diff --git a/src/modules/language/detector/data/ukrainian-koi8-r.dat b/src/modules/language/detector/data/ukrainian-koi8-r.dat index 4d2098d93..1efc6fb1d 100644 --- a/src/modules/language/detector/data/ukrainian-koi8-r.dat +++ b/src/modules/language/detector/data/ukrainian-koi8-r.dat @@ -19,22 +19,22 @@ ̤Ҧ ¦ Ħ - + " " ,"¦ Ԧ - + <HR SIZE 3> - I + I + - - + , Ц ϧ , Ԧ צ ϧ - + " Ħ ? ¦ . æ̦ Φ." צצ @@ -42,7 +42,7 @@ Ħ æ צ ̦ צ Ҧ ̦ ˦ צ : "֦ - + ?" @@ -65,10 +65,10 @@ ͦΦ ڦ . դ ¦ צ - - + + æ Ҧ - . צΦ Ҧ - + @@ -83,7 +83,7 @@ Ц...Ц - + I @@ -93,10 +93,10 @@ Ӧ ۦ ." - - - + + + צ Ħ Ҧ ¤ . ¦ Ħ Φ Φ, @@ -113,13 +113,13 @@ ˦ æ Ԧ ˦ Φ, Ħ - + - - + + @@ -132,15 +132,15 @@ Ԧ . צæ Ҧ. Ц - - + + "צ ?" . - + צ . צ Ʀ @@ -181,22 +181,22 @@ * , Ԧ - + Ħ צԦ " Ħ" ˦Ҧ, Ҧ - + I I : I I . - - + + Ʀæ Ц ¦:" ?" - + Ҧ " - + צ ̦ צ. Ħ -:" Ӧ æ ." diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index 58535fcb3..d49914801 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -52,7 +52,7 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole) m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pTopSplitter->setObjectName("top_splitter"); m_pTopSplitter->setChildrenCollapsible(false); - + // The button box on the left KviTalHBox * box = new KviTalHBox(m_pTopSplitter); diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 84fcd18b4..305c82cfe 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -249,7 +249,7 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole) m_pTreeWidget->setSortingEnabled(true); m_pTreeWidget->sortItems(0,Qt::AscendingOrder); m_pTreeWidget->setUniformRowHeights(true); - + m_pTreeWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); m_pTreeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); m_pTreeWidget->header()->setStretchLastSection(false); diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h index 73b2bfa07..6df7faa9e 100644 --- a/src/modules/list/ListWindow.h +++ b/src/modules/list/ListWindow.h @@ -75,7 +75,7 @@ private: ChannelTreeWidgetItemData * m_pData; public: bool operator<(const QTreeWidgetItem & other) const; - inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; + inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; }; class ChannelTreeWidget: public KviThemedTreeWidget diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp index 172a1c32b..8fb70ae7b 100644 --- a/src/modules/logview/LogFile.cpp +++ b/src/modules/logview/LogFile.cpp @@ -80,7 +80,7 @@ LogFile::LogFile(const QString & szName) QString szDate = szTmpName.section('_',-1).section('.',0,-2); - switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 1: m_date = QDate::fromString(szDate, Qt::ISODate); diff --git a/src/modules/logview/LogFile.h b/src/modules/logview/LogFile.h index 7a8cafebc..7adabf03b 100644 --- a/src/modules/logview/LogFile.h +++ b/src/modules/logview/LogFile.h @@ -51,7 +51,7 @@ typedef struct _LogFileData /** * \class LogFile * \brief The LogFile class which handle any log file -* +* * Log is in the format: * $type_$nick.$network_$YYYY.$MM.$DD.log * Examples: @@ -79,7 +79,7 @@ public: */ enum ExportType { PlainText, /**< export log in plain text file */ - HTML /**< export log in a HTML archive */ + HTML /**< export log in a HTML archive */ //XML /**< export log in a XML file */ //DB /**< export log in a database file */ }; diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 7957e637d..a6759c774 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -98,7 +98,7 @@ LogViewWindow::LogViewWindow() m_pTabWidget = new QTabWidget(m_pLeftLayout); m_pBottomLayout = new KviTalHBox(m_pLeftLayout); m_pProgressBar = new QProgressBar(m_pBottomLayout); - + m_pCancelButton = new QPushButton(m_pBottomLayout); m_pCancelButton->setText(__tr2qs_ctx("Cancel","log")); connect(m_pCancelButton,SIGNAL(clicked()),this,SLOT(abortFilter())); @@ -368,7 +368,7 @@ void LogViewWindow::filterNext() break; } } - + if(!m_pLastGroupItem) m_pLastGroupItem = new LogListViewItemFolder(m_pLastCategory,m_szLastGroup); } diff --git a/src/modules/mediaplayer/MpSpotifyInterface.cpp b/src/modules/mediaplayer/MpSpotifyInterface.cpp index 59a29479c..acaeb9013 100644 --- a/src/modules/mediaplayer/MpSpotifyInterface.cpp +++ b/src/modules/mediaplayer/MpSpotifyInterface.cpp @@ -79,7 +79,7 @@ QString KviSpotifyInterface::get_window_title() { return szReturn.replace(QString("Spotify - "), QString("")); } else szReturn = QString(""); - + return szReturn; } diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp index 6dc7977d7..d17aa71b0 100644 --- a/src/modules/notifier/NotifierMessage.cpp +++ b/src/modules/notifier/NotifierMessage.cpp @@ -36,7 +36,7 @@ NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText) { m_pLabel0 = 0; m_pLabel1 = 0; - + m_szText=szText; m_pPixmap=pPixmap; @@ -88,8 +88,8 @@ void NotifierMessage::updateGui() m_pLabel1->setFont(KVI_OPTION_FONT(KviOption_fontNotifier)); QPalette pal = m_pLabel1->palette(); pal.setColor(QPalette::WindowText, KVI_OPTION_COLOR(KviOption_colorNotifierForeground)); - m_pLabel1->setPalette(pal); - + m_pLabel1->setPalette(pal); + if(bShowImages) { m_pHBox->setStretch(1,99); diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h index 025e5a11d..9129cdf37 100644 --- a/src/modules/notifier/NotifierMessage.h +++ b/src/modules/notifier/NotifierMessage.h @@ -46,7 +46,7 @@ class NotifierMessage : public QWidget public: /** * \brief Constructs the NotifierMessage object - * \param pPixmap pointer to a message icon, can be null + * \param pPixmap pointer to a message icon, can be null * \param szText const reference to message text in irc format * \return NotifierMessage */ diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index c36997eb1..9029893aa 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -163,7 +163,7 @@ void NotifierWindow::updateGui() palette.setColor(m_pLineEdit->foregroundRole(), KVI_OPTION_COLOR(KviOption_colorNotifierForeground)); m_pLineEdit->setPalette(palette); m_pLineEdit->setFont(KVI_OPTION_FONT(KviOption_fontNotifier)); - + for(int i=0; i<m_pWndTabs->count();++i) { ((NotifierWindowTab*)m_pWndTabs->widget(i))->updateGui(); @@ -265,7 +265,7 @@ void NotifierWindow::stopAutoHideTimer() #if COMPILE_KDE_SUPPORT #include <kwindowsystem.h> - + static bool active_window_is_full_screen() { WId activeId = KWindowSystem::activeWindow(); @@ -274,7 +274,7 @@ void NotifierWindow::stopAutoHideTimer() } #else // COMPILE_KDE_SUPPORT #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - + static bool active_window_is_full_screen() { HWND hForeground = ::GetForegroundWindow(); @@ -294,13 +294,13 @@ void NotifierWindow::stopAutoHideTimer() if((rct.right - rct.left) < GetSystemMetrics(SM_CXSCREEN)) return false; - + if((rct.bottom - rct.top) < GetSystemMetrics(SM_CYSCREEN)) return false; return true; } - + #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW #endif // COMPILE_KDE_SUPPORT @@ -636,7 +636,7 @@ void NotifierWindow::paintEvent(QPaintEvent * e) szTitle += "notifier"; } pPaint->drawText(m_pWndBorder->titleRect(),Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine,szTitle); - + delete pPaint; e->ignore(); } @@ -712,7 +712,7 @@ void NotifierWindow::mousePressEvent(QMouseEvent * e) update(); return; } - + if(m_pWndBorder->captionRect().contains(e->pos())) { if(m_pWndBorder->closeRect().contains(e->pos())) @@ -933,13 +933,13 @@ void NotifierWindow::leaveEvent(QEvent *) m_pWndBorder->resetIcons(); if(!m_bResizing) setCursor(-1); - + if(!m_pShowHideTimer) { m_pShowHideTimer = new QTimer(); connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); } - + if(m_eState!=Hidden) { m_eState = FocusingOff; @@ -1049,7 +1049,7 @@ void NotifierWindow::showLineEdit(bool bShow) if(!((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()) return; m_pLineEdit->setToolTip(""); - + QString szTip = __tr2qs_ctx("Write text or commands to window","notifier"); szTip += " \""; szTip += ((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()->plainTextCaption(); diff --git a/src/modules/notifier/NotifierWindowTab.cpp b/src/modules/notifier/NotifierWindowTab.cpp index 0a9c4329e..41c29cf36 100644 --- a/src/modules/notifier/NotifierWindowTab.cpp +++ b/src/modules/notifier/NotifierWindowTab.cpp @@ -221,7 +221,7 @@ void NotifierWindowTab::paintEvent(QPaintEvent * e) #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - + delete pPainter; e->ignore(); } diff --git a/src/modules/notifier/NotifierWindowTab.h b/src/modules/notifier/NotifierWindowTab.h index 5a07f387d..be2163e20 100644 --- a/src/modules/notifier/NotifierWindowTab.h +++ b/src/modules/notifier/NotifierWindowTab.h @@ -57,7 +57,7 @@ public: * \return NotifierWindowTab */ NotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent); - + /** * \brief Destroys the tab object */ @@ -75,19 +75,19 @@ public: * \return void */ void appendMessage(NotifierMessage * pMessage); - + /** * \brief Updates the GUI * \return void */ void updateGui(); - + /** * \brief Returns the name of the current window * \return QString */ inline QString label() const { return m_szLabel; }; - + /** * \brief Returns the pointer of the current window * \return KviWindow * @@ -103,13 +103,13 @@ private slots: * \return void */ void scrollRangeChanged(int, int); - + /** * \brief Emitted when the window changes its name * \return void */ void labelChanged(); - + /** * \brief Emitted when the window is being destroyed * \return void diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index 3983f5d90..21e93bf35 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -287,7 +287,7 @@ bool KvsObject_http::functionGet(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("remote_path",KVS_PT_STRING,0,szPath) KVSO_PARAMETER("local_filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szDest) KVSO_PARAMETERS_END(c) - + QFile * pFile=0; if (!szDest.isEmpty()) { diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp index 48dedf4fc..5c026c661 100644 --- a/src/modules/objects/KvsObject_multiLineEdit.cpp +++ b/src/modules/objects/KvsObject_multiLineEdit.cpp @@ -212,7 +212,7 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_textedit,"multilineedit","widget") KVSO_REGISTER_HANDLER(KvsObject_textedit,"setPointSize", functionsetPointSize) KVSO_REGISTER_HANDLER(KvsObject_textedit,"setReadOnly",functionSetReadOnly) - + KVSO_REGISTER_HANDLER(KvsObject_textedit,"setTextFormat", functionsetTextFormat) KVSO_REGISTER_HANDLER(KvsObject_textedit,"textFormat", functiontextFormat) KVSO_REGISTER_HANDLER(KvsObject_textedit,"loadFile", functionloadFile); diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index fcb57a78d..55bf48f40 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -144,7 +144,7 @@ KVSO_CLASS_FUNCTION(pixmap,fill) if (!var1->asInteger(iCol1)) { var1->asString(szColor); - if (c->paramCount()<2) + if (c->paramCount()<2) iOpacity=255; else { if (!var2->asInteger(iOpacity)) @@ -362,11 +362,11 @@ KVSO_CLASS_FUNCTION(pixmap,rotate) { if (KviQString::equalCI(szAxis,"XAxis")) axis=Qt::XAxis; - else if (KviQString::equalCI(szAxis,"YAxis")) + else if (KviQString::equalCI(szAxis,"YAxis")) axis=Qt::YAxis; - else if (KviQString::equalCI(szAxis,"ZAxis")) + else if (KviQString::equalCI(szAxis,"ZAxis")) axis=Qt::ZAxis; - else + else c->warning(__tr2qs_ctx("Unknown axis '%Q' switching to default ZAxis","objects"),&szAxis); } diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp index 571aff749..98cb3d217 100644 --- a/src/modules/objects/KvsObject_socket.cpp +++ b/src/modules/objects/KvsObject_socket.cpp @@ -109,7 +109,7 @@ const char * const sockerrors_tbl[] = { 4=Bound[br] 5=Closing[br] 6=Listening - + !fn: $connect(<host>,<port>) Attempts a connection to <host> on port <port>.[br] <host> can be a numeric internet address (either Ipv4 or Ipv6 (if supported)) or a hostname.[br] @@ -124,7 +124,7 @@ const char * const sockerrors_tbl[] = { and you will be notified of the attempt result by an asynchronous event call: in case of failure, $connectFailedEvent() will be called, in case of succes, $connectEvent() will be called. - + !fn: $listen([<port>[,<interface>[,<force_ipv6>]]]) Attempts to listen on the specified <port> and <interface>.[br] If <port> is not passed it is assumed to be 0, if <interface> is not passed, it is assumed to be @@ -136,14 +136,14 @@ const char * const sockerrors_tbl[] = { On some systems listening in the IPV6 namespace allows to accept also IPV4 connections (this includes linux but not windows afaik).[br] When an incoming connection will arrive, $incomingConnectionEvent() will be called. - + !fn: $connectedEvent() This function is called when a connection attempt has been successfully completed. The socket is actually connected to [classfnc:socket]$remoteIp[/classfnc]() on [classfnc:socket]$remotePort[/classfnc](). You can start writing data and you may expect [classfnc:socket]$dataAvailableEvent[/classfnc]() to be triggered. - + !fn: $incomingConnectionEvent(<socket:h_object>) This function is called when an incoming connection arrives over a socket in listening state.[br] You must return 1 if you to terminad this incoming connectioncall [classfnc:socket]$accept[/classfnc]() passing a newly created socket object @@ -165,14 +165,14 @@ const char * const sockerrors_tbl[] = { This function is called when some data is available to be read: the <data_length> parameter specifies the length of the available data in bytes.[br] You can use one of the $read* functions to obtain the data - + !fn: $read(<length>[,<hobject>]) Reads at most <length> bytes of data from the socket. If <length> is anything "outside" the available data range (<length> < 0 or <length> > available_data_length), this function returns all the available data.[br] By default this function can deal ascii data only: NULL characters are transformed to ASCII characters 255. You can pass a [class]memorybuffer[/class] object to read binary data. - + !fn: $write(<data, array,files or hobject>[,length]) Writes <data> to the socket.[br] This function can deal with binary data passing a [class]memorybuffer[/class] object[br] @@ -182,7 +182,7 @@ const char * const sockerrors_tbl[] = { Using an array you can pass bytes or data string like this: @$write($array($(0xff),$(0xff),$(0xff),$(0xff),"This is an example")); If you're going to [cmd]delete[/cmd] this object just after the $write call, you should call [classfnc:socket]$close[/classfnc]() just before [cmd]delete[/cmd] to ensure the data delivery. - + !fn: $close() Resets this socket state: kills any pending or active connection. After a close() call the socket may be used for a new connection.[br] @@ -190,22 +190,22 @@ const char * const sockerrors_tbl[] = { You don't need to call $close() if you [cmd]delete[/cmd] the socket: KVIrc will reset the socket state automatically and free the memory. But if you want to ensure data delivery after a $write call sequece and just before a [cmd]delete[/cmd], $close() is the only chance to do it. - + !fn: $remoteIp() Returns the IP address of the remote end of this socket.[br] The return value is meaningful only if the socket is in connected or connecting state. - + !fn: $setProtocol(<protocol>) Let KVIrc use TCP or UDP protocol - + !fn: $remotePort() Returns the port of the remote end of this socket.[br] The return value is meaningful only if the socket is in connected or connecting state. - + !fn: $localIp() Returns the IP address of the local end of this socket.[br] The return value is meaningful only if the socket is in connected, listening or connecting state. - + !fn: $localPort() Returns the port of the local end of this socket.[br] The return value is meaningful only if the socket is in connected, listening or connecting state. diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index ba1758b45..90c7e051b 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -260,7 +260,7 @@ const char * const actions_tbl[] = { Sets the link delegation policy: what happens when the users click on a link. Valid values: [br] DontDelegateLinks: No links are delegated. Instead, webView tries to handle them all. [br] DelegateExternalLinks: When activating links that point to documents not stored on the local filesystem or an equivalent then $linkClickedEvent() is executed. - [br] DelegateAllLinks: Whenever a link is activated the $linkClickedEvent() is executed. + [br] DelegateAllLinks: Whenever a link is activated the $linkClickedEvent() is executed. !fn: $linkClickedEvent() This function can be called when the user clicks on a link, depending no the current link delegation policy. The argument of the function is the url that has been clicked.[br] diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index 0d93f72ab..1e7eafe9a 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -1741,7 +1741,7 @@ KVSO_CLASS_FUNCTION(widget,setFont) QString szFamily; QStringList szListStyle; kvs_int_t iSize; - KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("family",KVS_PT_STRING,0,szFamily) KVSO_PARAMETER("size",KVS_PT_INTEGER,0,iSize) KVSO_PARAMETER("style",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,szListStyle) diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index 3e1debd49..5806005f8 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -393,7 +393,7 @@ bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QS for(int j=0;j<lKeywords.count() && !bFoundSomethingHere;j++) if(szInstanceKeywords.at(i).contains(lKeywords.at(j),Qt::CaseInsensitive)) bFoundSomethingHere = true; - + if(bFoundSomethingHere) { pItem->setForeground(0, Qt::yellow); diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index 24fc7e528..353811eae 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -86,7 +86,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e) m_pOptionsWidget = NULL; } } - + QWidget::childEvent(e); } diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index c3bfd7b9f..06edc0421 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -120,7 +120,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Minimum delay between two channel requests:","options"),KviOption_uintOnJoinRequestsDelay,0,10,1); u->setSuffix(__tr2qs_ctx(" sec","options")); mergeTip(u,__tr2qs_ctx("<center>This is an artificial delay for the channel requests made on join.<br>You may increase it if your server complains about flooding when joining many channels at once.<br>Minimum value: <b>0 secs</b><br>Maximum value: <b>10 secs</b></center>","options")); - + addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin); diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp index be69cdfb4..28b62ca18 100644 --- a/src/modules/options/OptionsWidget_ircOutput.cpp +++ b/src/modules/options/OptionsWidget_ircOutput.cpp @@ -54,7 +54,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent) if(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) > KVI_VERBOSITY_LEVEL_PARANOIC) KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL; m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel)); - + pLabel = new QLabel(__tr2qs_ctx("Datetime format","options"),this); addWidgetToLayout(pLabel,0,1,0,1); @@ -63,7 +63,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent) m_pDatetimeCombo->addItem(__tr2qs_ctx("ISO 8601 format","options")); m_pDatetimeCombo->addItem(__tr2qs_ctx("System locale format","options")); addWidgetToLayout(m_pDatetimeCombo,1,1,1,1); - + m_pDatetimeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)); KviTalGroupBox * pGroup = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Show in active window","options")); @@ -102,7 +102,7 @@ void OptionsWidget_ircOutput::commit() iIdx = KVI_VERBOSITY_LEVEL_NORMAL; } KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = iIdx; - + KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat) = m_pDatetimeCombo->currentIndex(); } diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp index 7fb56fc48..e62e6f430 100644 --- a/src/modules/options/OptionsWidget_ircView.cpp +++ b/src/modules/options/OptionsWidget_ircView.cpp @@ -167,7 +167,7 @@ OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent) addBoolSelector(pGroup,__tr2qs_ctx("Nick links","options"),KviOption_boolEnableNickLinkToolTip); addBoolSelector(pGroup,__tr2qs_ctx("Channel links","options"),KviOption_boolEnableChannelLinkToolTip); addBoolSelector(pGroup,__tr2qs_ctx("Escape sequences","options"),KviOption_boolEnableEscapeLinkToolTip); - + addRowSpacer(0,14,0,14); } diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp index 97d9c9978..f529d1789 100644 --- a/src/modules/options/OptionsWidget_logging.cpp +++ b/src/modules/options/OptionsWidget_logging.cpp @@ -46,7 +46,7 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent) QWidget * w = addDirectorySelector(0,1,0,1,__tr2qs_ctx("Save logs to folder:","options"),KviOption_stringLogsPath); mergeTip(w, __tr2qs_ctx("<center>This is the base log directory:<br>" \ "all the log files will be saved inside this directory</center>","options")); - + w = addStringSelector(0,2,0,2,__tr2qs_ctx("Dynamic subfolder:","options"),KviOption_stringLogsDynamicPath); mergeTip(w, __tr2qs_ctx("<center>You can specify a subdirectory where log files will be saved:" \ "use kvs code to create dynamic subfolders.</center>","options")); diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index a83eb558c..280f2e774 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -163,7 +163,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) "Note that KDE's notifier isn't flexible and \"tabbed\" like KVIrc's","options"); szTip += "</center>"; mergeTip(m_pKdeNotifier,szTip); - + m_pKdeNotifier->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); connect(b,SIGNAL(toggled(bool)),m_pKdeNotifier,SLOT(setEnabled(bool))); connect(m_pKdeNotifier,SIGNAL(toggled(bool)),this,SLOT(toggleNotifierProtocol(bool))); @@ -205,7 +205,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) "your game from fullscreen to window mode.","options"); szTip += "</center>"; mergeTip(b2,szTip); - + b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); @@ -219,7 +219,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); iRow++; - + b2 = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading); b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index e83a72b49..bc247d567 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -1609,7 +1609,7 @@ void OptionsWidget_servers::fillServerList() KviPointerList<KviIrcServer> * sl = r->serverList(); bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data(); net->setExpanded(bCurrent); - + for(KviIrcServer * s = sl->first();s;s = sl->next()) { srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),s); @@ -1693,7 +1693,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &) for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { network = (IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); - if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || + if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || network->m_pNetworkData->description().contains(szFilter, Qt::CaseInsensitive)) { network->setHidden(false); @@ -1706,7 +1706,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &) } } else { uint uServers=0; - + IrcServerOptionsTreeWidgetItem * ch; for (int j=0;j<network->childCount();j++) { @@ -1714,7 +1714,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &) ch=(IrcServerOptionsTreeWidgetItem *)network->child(j); if(ch->m_pServerData) { - if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || + if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || ch->m_pServerData->description().contains(szFilter, Qt::CaseInsensitive)) bHidden=false; } diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h index c23851ded..bb38ec65a 100644 --- a/src/modules/options/OptionsWidget_servers.h +++ b/src/modules/options/OptionsWidget_servers.h @@ -64,7 +64,7 @@ public: { return m_pServerData; } - + KviIrcNetwork * networkData() const { return m_pNetworkData; diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index 3b8b6d306..3eeeefaf1 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -155,14 +155,14 @@ void OptionsWidget_soundGeneral::showEvent(QShowEvent *) return; // We fill these boxes only before the first show since the soundFillBox() // is likely to trigger sound system-detection which may take time... - + g_pApp->setOverrideCursor(Qt::WaitCursor); - + soundFillBox(); mediaFillBox(); - + g_pApp->restoreOverrideCursor(); - + m_bFirstShow = false; } @@ -177,7 +177,7 @@ void OptionsWidget_soundGeneral::soundTest() return; // doh QString szFileName; - + if(!g_pApp->findAudioFile(szFileName,QString::fromUtf8("jingle.wav"))) { qDebug("Can't find the jingle.wav file: was it shipped with your kvirc installation?"); diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index a7d4225e1..07dcdeec0 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -110,7 +110,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) connect(m_pTable,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged())); connect(m_pTable,SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)),this,SLOT(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *))); - + fillTable(); } @@ -128,7 +128,7 @@ void OptionsWidget_textIcons::fillTable() header.append(__tr2qs("Emoticon")); m_pTable->setHorizontalHeaderLabels(header); m_pTable->setRowCount(g_pTextIconManager->textIconDict()->count()); - + int idx = 0; QTableWidgetItem *item0; TextIconTableItem *item1; @@ -148,7 +148,7 @@ void OptionsWidget_textIcons::fillTable() ++idx; ++it; } - + // disable the delete button m_pDel->setEnabled(false); } diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp index b5bf0c3d0..cbb5240dc 100644 --- a/src/modules/popup/libkvipopup.cpp +++ b/src/modules/popup/libkvipopup.cpp @@ -714,7 +714,7 @@ static bool popup_kvs_fnc_isEmpty(KviKvsModuleFunctionCall * c) Returns the popup item id that owns the executing code @description: When called inside a popup item's callback, this function returns the id of the popup item. - Outside of callback code, $null is returned. + Outside of callback code, $null is returned. @examples: [example] #clean any previous popup by the same name diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp index 3d6e9778a..0cfc83e9d 100644 --- a/src/modules/python/libkvipython.cpp +++ b/src/modules/python/libkvipython.cpp @@ -36,7 +36,7 @@ #include <Python.h> static KviModule * g_pPythonCoreModule = 0; - + #define KVS_CHECK_PYTHONCORE(_m,_c) \ g_pPythonCoreModule = g_pModuleManager->getModule("pythoncore"); \ if(!g_pPythonCoreModule) \ diff --git a/src/modules/pythoncore/CMakeLists.txt b/src/modules/pythoncore/CMakeLists.txt index ba49fd109..44551235e 100644 --- a/src/modules/pythoncore/CMakeLists.txt +++ b/src/modules/pythoncore/CMakeLists.txt @@ -5,7 +5,7 @@ set(kvipythoncore_SRCS kvircmodule.cpp ) -set(KVI_DEFAULT_FRAME_CAPTION "") +set(KVI_DEFAULT_FRAME_CAPTION "") set(kvi_module_name kvipythoncore) diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp index 297b8945f..ea0dc5393 100644 --- a/src/modules/pythoncore/kvircmodule.cpp +++ b/src/modules/pythoncore/kvircmodule.cpp @@ -89,7 +89,7 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs) static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs) { Q_UNUSED(pSelf); - + const char * pcText=0; const char * pcWinId=0; KviWindow * pWnd=0; @@ -169,7 +169,7 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs) if(!PyArg_ParseTuple(pArgs,"s",&szVarName)) return 0; - + if(g_pCurrentKvsContext) { KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(szVarName); @@ -402,7 +402,7 @@ PyMODINIT_FUNC python_init() PyKVIrc_API[7] = (void *)PyKVIrc_eval; PyKVIrc_API[8] = (void *)PyKVIrc_internalWarning; PyKVIrc_API[9] = (void *)PyKVIrc_error; - + // Create a CObject containing the API pointer array's address pC_API_Object = PyCObject_FromVoidPtr((void *)PyKVIrc_API,NULL); diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index 7028d422f..a1637549b 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -221,7 +221,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) .arg(ch->name()) .arg(ch->netMask()) ); - + for(QHash<QString,QString>::Iterator it2 = ch->propertyDict()->begin();it2 != ch->propertyDict()->end();++it2) { c->window()->outputNoFmt( diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index f616789ca..9abe11c24 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -651,7 +651,7 @@ void RegisteredUserEntryDialog::okClicked() } else { u->setProperty("notify",QString("")); } - + m_pPropertyDict->remove("comment"); m_pPropertyDict->remove("notify"); m_pPropertyDict->remove("avatar"); diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h index 249d8e975..05ee01146 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.h +++ b/src/modules/reguser/RegisteredUserEntryDialog.h @@ -107,7 +107,7 @@ protected: QCheckBox * m_pNotifyCheck; QLineEdit * m_pNotifyNick; QLabel * m_pNotifyLabel; - + KviPixmap * m_pAvatar; KviPixmapSelector * m_pAvatarSelector; diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp index 9cea65f25..bd9f74b3e 100644 --- a/src/modules/rijndael/BlowFish.cpp +++ b/src/modules/rijndael/BlowFish.cpp @@ -315,15 +315,15 @@ BlowFish::BlowFish(unsigned char* ucKey, unsigned int keysize, const SBlock& roC /* * BRAINDEAD DEVELOPER DISCLAIMER: * Blowfish can accept keys up to 72 bytes, but the common value is 56: - * Using keylenghts of 72 chars offers a small amount of added security, - * but adds also the possibility of choosing a weak key that resulted in all - * 18 P sub−keys turning into 0 after being XORed with a 576 bit key + * Using keylenghts of 72 chars offers a small amount of added security, + * but adds also the possibility of choosing a weak key that resulted in all + * 18 P sub−keys turning into 0 after being XORed with a 576 bit key * (Short version: someone can trick you into using an empty password, and you won't notice) - * + * * Original mircryption uses keys of 56 bytes in ecb mode. * FiSH uses keys of 72 bytes in both ecb and cbc mode. * Newer mirccryption uses keys of 80 (!?) bytes only in ecb mode and 56 in cbc mode. - * + * * Since having a longer key doesn't imply more security (but, instead, adds a potential * security risk), we go the safe way using the standard keylength. */ diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt index 92b3fe56b..2b3c374e8 100644 --- a/src/modules/rijndael/CMakeLists.txt +++ b/src/modules/rijndael/CMakeLists.txt @@ -11,7 +11,7 @@ if(WANT_OPENSSL) InitVectorEngine.cpp ) - + # set(ADDITIONAL_COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS} -fno-strict-aliasing") diff --git a/src/modules/rijndael/InitVectorEngine.cpp b/src/modules/rijndael/InitVectorEngine.cpp index 83faeb3ee..667a11d4b 100644 --- a/src/modules/rijndael/InitVectorEngine.cpp +++ b/src/modules/rijndael/InitVectorEngine.cpp @@ -42,7 +42,7 @@ namespace InitVectorEngine for(int i=0;i<iLen;i++) pIn[i] = (unsigned char)(rand() % 256); - + return iLen; } }; diff --git a/src/modules/rijndael/InitVectorEngine.h b/src/modules/rijndael/InitVectorEngine.h index ae6565990..7d0a20235 100644 --- a/src/modules/rijndael/InitVectorEngine.h +++ b/src/modules/rijndael/InitVectorEngine.h @@ -28,5 +28,5 @@ namespace InitVectorEngine { extern int fillRandomIV(unsigned char * pIn, int iLen=8); } - + #endif //!_INITVECTORENGINE_H_ diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp index 5683a3604..5a80efc54 100644 --- a/src/modules/rijndael/UglyBase64.cpp +++ b/src/modules/rijndael/UglyBase64.cpp @@ -95,7 +95,7 @@ namespace UglyBase64 *p++ = fake_base64[*dd1 & 0x3f]; } } - + void decode(KviCString & szText, unsigned char ** buf, int *len) { // make sure its length is multiple of 12 (eventually pad with zeroes) diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 5784dc8c7..6e525b01d 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -32,7 +32,7 @@ #include "KviControlCodes.h" #include "UglyBase64.h" #include "InitVectorEngine.h" - + //#warning "Other engines: mircStrip koi2win colorizer lamerizer etc.." /* @@ -120,7 +120,7 @@ KviCString szTmpEncryptKey = KviCString(encKey,encKeyLen); KviCString szTmpDecryptKey = KviCString(decKey,decKeyLen); - + m_bEncryptMode = CBC; // default mode m_bDecryptMode = CBC; // default mode @@ -438,7 +438,7 @@ } m_szEncryptKey = KviCString(encKey,encKeyLen); m_szDecryptKey = KviCString(decKey,decKeyLen); - + m_bEncryptCBC = true; m_bDecryptCBC = true; diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index d4bcd58c8..a4cefc66d 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -451,7 +451,7 @@ SetupWizard::SetupWizard() pPixmapLabelHiRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); pPixmapLabelHiRes->setMargin(0); pThemeGrid->addWidget(pPixmapLabelHiRes, 1,1); - + m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),m_pThemeButtonGroup); pThemeGrid->addWidget(m_pThemeHiRes, 2,1); @@ -464,18 +464,18 @@ SetupWizard::SetupWizard() } QLabel* pPixmapLabelLowRes = new QLabel(m_pThemeButtonGroup); - + pPixmapLabelLowRes->setPixmap(*pLowResPixmap); pPixmapLabelLowRes->setFixedSize(pLowResPixmap->size()); pPixmapLabelLowRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); pPixmapLabelLowRes->setMargin(0); pThemeGrid->addWidget(pPixmapLabelLowRes, 1,2); - + m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"),m_pThemeButtonGroup); pThemeGrid->addWidget(m_pThemeLoRes, 2,2); m_pThemeNone = new QRadioButton(__tr2qs("&Don't apply any theme"),m_pThemeButtonGroup); pThemeGrid->addWidget(m_pThemeNone, 3,1); - + m_pThemeHiRes->setChecked(true); addPage(m_pTheme,__tr2qs("Default Theme")); diff --git a/src/modules/setup/SetupWizard.h b/src/modules/setup/SetupWizard.h index 88df3a4a5..3b2204699 100644 --- a/src/modules/setup/SetupWizard.h +++ b/src/modules/setup/SetupWizard.h @@ -148,7 +148,7 @@ public slots: void oldDirClicked(); void newDirClicked(); void portableClicked(); - + void oldDataTextChanged ( const QString & ); void newDataTextChanged ( const QString & ); void newIncomingTextChanged ( const QString & ); diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 0fad1f912..ab170402e 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -300,7 +300,7 @@ void KviSoundPlayer::cleanupPhonon() sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT); return true; } - + void KviSoundPlayer::cleanupWinmm() { // FIXME: how to stop playing on windows ? @@ -319,7 +319,7 @@ void KviSoundPlayer::cleanupPhonon() } return true; } - + void KviSoundPlayer::cleanupOssAudiofile() { } diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h index 1b73c31b1..5fe69f0b1 100644 --- a/src/modules/snd/libkvisnd.h +++ b/src/modules/snd/libkvisnd.h @@ -124,12 +124,12 @@ public: { return m_pPlayRoutine; } - + SoundSystemCleanupRoutine cleanupRoutine() const { return m_pCleanupRoutine; } - + }; class KviSoundPlayer : public QObject diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index b8a029f2c..78b94189a 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -213,8 +213,8 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) if(!iId) //Delete all spaste's from the current window { - if((c->window()->type() != KviWindow::Channel) && - (c->window()->type() != KviWindow::Query) && + if((c->window()->type() != KviWindow::Channel) && + (c->window()->type() != KviWindow::Query) && (c->window()->type() != KviWindow::DccChat) && (c->window()->type() != KviWindow::DeadChannel) && (c->window()->type() != KviWindow::DeadQuery) diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index a4869dca0..0791e7005 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -420,7 +420,7 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) <variant> $system.dbus(<service:string>,<path:string>,<interface:string>,<method:string>[,<bus_type:string>[,<parameter1:string>[,<parameter2:string>[,...]]]]) @description: This function allows performing simple Dbus calls without executing - an external process. This feature is available ONLY under unix: + an external process. This feature is available ONLY under unix: this means that this function is absolutely non portable (don't use it in scripts that you're going to distribute). <application> is the name of the application being called, <objectid> is the @@ -475,7 +475,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) szBusType = "session"; QDBusConnection busType(""); - + if(szBusType == "system") { busType = QDBusConnection::systemBus(); @@ -485,7 +485,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) c->warning(__tr2qs("No DBus type specified")); return false; } - + if(szService.left(1).compare("?")==0) { szService.remove(0,1); diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index 875266f06..ac031ba74 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -65,7 +65,7 @@ PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> setMinimumSize(400,350); setDefaultProperty("QTextEdit","plainText",SIGNAL(textChanged())); m_pThemeInfoList = pThemeInfoList; - + QPixmap * pSide = g_pIconManager->getBigIcon("kvi_setup_label.png"); QPixmap * pLogo = g_pIconManager->getBigIcon("kvi_bigicon_addons.png"); @@ -99,7 +99,7 @@ PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> pPage->setLayout(pLayout); pPage->setTitle(__tr2qs_ctx("Welcome","theme")); - + QString szText = "<p>"; szText += __tr2qs_ctx("This procedure allows you to export the selected themes to a single package. It is useful when you want to distribute your themes to the public.","theme"); szText += "</p><p>"; @@ -121,11 +121,11 @@ PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> // Packager information m_pPackThemeInfoWidget = new PackThemeInfoWidget(this); addPage(m_pPackThemeInfoWidget); - + // Screenshot/logo/icon m_pPackThemeImageWidget = new PackThemeImageWidget(this); addPage(m_pPackThemeImageWidget); - + // Save file name m_pPackThemeSaveWidget = new PackThemeSaveWidget(this); addPage(m_pPackThemeSaveWidget); @@ -151,10 +151,10 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL KviThemeInfo * pThemeInfo = 0; bool bPackagePathSet = false; - + QString szPackagePath = QDir::homePath(); KviQString::ensureLastCharIs(szPackagePath,QChar(KVI_PATH_SEPARATOR_CHAR)); - + if(pThemeInfoList->count() > 1) { szPackageName = "MyThemes"; @@ -181,7 +181,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL bPackagePathSet = true; } } - + if(!bPackagePathSet) { szPackagePath += szPackageName; @@ -255,7 +255,7 @@ PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent) setObjectName("theme_package_info_page"); setTitle(__tr2qs_ctx("Package Information","theme")); setSubTitle(__tr2qs_ctx("Here you need to provide information about you (the packager) and a short description of the package you're creating.","theme")); - + QGridLayout * pLayout = new QGridLayout(this); @@ -297,7 +297,7 @@ PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent) pLayout->setRowStretch(3,1); pLayout->setColumnStretch(1,1); - + // Store data in the fields registerField("packageName*",m_pPackageNameEdit); registerField("packageVersion*",m_pPackageVersionEdit); @@ -391,7 +391,7 @@ PackThemeSaveWidget::PackThemeSaveWidget(PackThemeDialog * pParent) pLabel->setWordWrap(true); pLabel->setText(__tr2qs_ctx("Finally hit the \"Finish\" button to complete the packaging operation.","theme")); pLayout->addWidget(pLabel); - + // Store data in the fields registerField("packageSavePath*",m_pSavePathSelector); } @@ -466,7 +466,7 @@ bool PackThemeDialog::packTheme() QString szTmp; QDateTime date = QDateTime::currentDateTime(); - + switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: @@ -562,7 +562,7 @@ bool PackThemeDialog::packTheme() szTmp, QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton ); - + return false; } @@ -574,6 +574,6 @@ bool PackThemeDialog::packTheme() __tr2qs("Package saved successfully"), QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton ); - + return true; } diff --git a/src/modules/theme/PackThemeDialog.h b/src/modules/theme/PackThemeDialog.h index 920bed2a1..15f8e83d2 100644 --- a/src/modules/theme/PackThemeDialog.h +++ b/src/modules/theme/PackThemeDialog.h @@ -54,7 +54,7 @@ protected: PackThemeImageWidget * m_pPackThemeImageWidget; PackThemeSaveWidget * m_pPackThemeSaveWidget; KviPointerList<KviThemeInfo> * m_pThemeInfoList; - + QString m_szAuthor; QString m_szName; QString m_szVersion; diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp index 009858128..6caab1d0b 100644 --- a/src/modules/theme/SaveThemeDialog.cpp +++ b/src/modules/theme/SaveThemeDialog.cpp @@ -244,7 +244,7 @@ bool SaveThemeDialog::saveTheme() sto.setAuthor(m_pAuthorNameEdit->text()); sto.setDescription(m_pThemeDescriptionEdit->toPlainText()); - + QString szTmp; QDateTime date = QDateTime::currentDateTime(); switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) @@ -261,7 +261,7 @@ bool SaveThemeDialog::saveTheme() szTmp = date.toString(Qt::SystemLocaleShortDate); break; } - + sto.setDate(szTmp); sto.setVersion(m_pThemeVersionEdit->text()); sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE); diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index 4778b75ad..e6ca012a6 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -80,7 +80,7 @@ ThemeListWidgetItem::ThemeListWidgetItem(KviTalListWidget * pBox, KviThemeInfo * : KviTalListWidgetItem(pBox) { m_pThemeInfo = pInfo; - + QString szText; szText = "<nobr><b>"; szText += pInfo->name(); @@ -334,7 +334,7 @@ void ThemeManagementDialog::contextMenuRequested(const QPoint & pos) if(!pInfo) return; QString szDir = pInfo->dirName(); - + if(!pInfo->isBuiltin()) m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Minus)),__tr2qs_ctx("&Remove Theme","theme"),this,SLOT(deleteTheme())); @@ -394,7 +394,7 @@ void ThemeManagementDialog::deleteTheme() &(pInfo->name()), &(pInfo->version())) ) goto jump_out; - + QString szThemePath; ((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->getCompleteDirPath(szThemePath); KviFileUtils::deleteDir(szThemePath); diff --git a/src/modules/theme/WebThemeInterfaceDialog.h b/src/modules/theme/WebThemeInterfaceDialog.h index fa0437f0e..dac3efc74 100644 --- a/src/modules/theme/WebThemeInterfaceDialog.h +++ b/src/modules/theme/WebThemeInterfaceDialog.h @@ -48,9 +48,9 @@ protected: virtual bool installPackage(const QString &szPath,QString &szError); }; - + #endif //COMPILE_WEBKIT_SUPPORT - + #endif //_WEBTHEMEINTERFACEDIALOG_H_ diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index ba7d06adf..0f02ac47a 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -209,7 +209,7 @@ void TipWindow::prevTip() unsigned int uNumTips = m_pConfig->readUIntEntry("uNumTips",0); unsigned int uCurTip = m_pConfig->readUIntEntry("uCurTip",0); - + if(uCurTip == 0)uCurTip = uNumTips-1; else uCurTip--; diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp index d097572f7..73664c129 100644 --- a/src/modules/toolbar/libkvitoolbar.cpp +++ b/src/modules/toolbar/libkvitoolbar.cpp @@ -321,7 +321,7 @@ static bool toolbar_kvs_fnc_exists(KviKvsModuleFunctionCall * c) <boolean> $toolbar.isVisible(<id:string>) @description: Returns 1 if the toolbar with the specified <id> is visible, - or 0 when invisible or the given toolbar does not exist. + or 0 when invisible or the given toolbar does not exist. @seealso: [cmd]toolbar.show[/cmd] */ @@ -349,7 +349,7 @@ static bool toolbar_kvs_fnc_isVisible(KviKvsModuleFunctionCall * c) <array> $toolbar.list() @description: Returns a list of defined toolbar identifiers - - this can be used to loop through all defined toolbars. + this can be used to loop through all defined toolbars. @seealso: */ diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index f3711e022..4e8869b37 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -93,8 +93,8 @@ KviTrayIconWidget::KviTrayIconWidget() QPalette p; m_pTitleLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); QWidgetAction * pAction = new QWidgetAction(this); - pAction->setDefaultWidget(m_pTitleLabel); - m_pContextPopup->addAction(pAction); + pAction->setDefaultWidget(m_pTitleLabel); + m_pContextPopup->addAction(pAction); m_pContextPopup->setWindowTitle(__tr2qs("Context")); m_pAwayMenuId = m_pContextPopup->addMenu(m_pAwayPopup); diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index f80729a1f..3ccd05bef 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -137,7 +137,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *) :KviWindow(KviWindow::Tool,"URL List") { setAutoFillBackground(false); - + m_pUrlList = new UrlDialogTreeWidget(this); m_pMenuBar = new KviTalMenuBar(this,"url menu"); diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp index 34bc69672..43942c396 100644 --- a/src/modules/userlist/libkviuserlist.cpp +++ b/src/modules/userlist/libkviuserlist.cpp @@ -126,7 +126,7 @@ static bool userlist_kvs_fnc_selected(KviKvsModuleFunctionCall * c) static bool userlist_kvs_cmd_select(KviKvsModuleCommandCall * c) { GET_KVS_WINDOW_ID_AND_NICK - + if(pWnd->type() != KviWindow::Channel) { c->warning(__tr2qs_ctx("The specified window is not a channel","kvs")); @@ -140,7 +140,7 @@ static bool userlist_kvs_cmd_select(KviKvsModuleCommandCall * c) static bool userlist_kvs_cmd_ensureVisible(KviKvsModuleCommandCall * c) { GET_KVS_WINDOW_ID_AND_NICK - + if(pWnd->type() != KviWindow::Channel) { c->warning(__tr2qs_ctx("The specified window is not a channel","kvs")); |