diff options
| author |  Matt Ullman | 2015-10-18 05:16:18 -0400 |
|---|---|---|
| committer | Matt Ullman | 2015-10-18 05:17:31 -0400 |
| commit | e227679b0af3687acf9292953edbb0ebeab19df9 (patch) | |
| tree | b498cd485b2cf65cd6e4288ba75beb3ba6e89e02 | |
| parent | Merge pull request #1674 from un1versal/The-Emperor's-New-Clothes (diff) | |
| download | KVIrc-e227679b0af3687acf9292953edbb0ebeab19df9.tar.gz KVIrc-e227679b0af3687acf9292953edbb0ebeab19df9.tar.bz2 KVIrc-e227679b0af3687acf9292953edbb0ebeab19df9.zip | |
Clean up trailing whitespaces and excess newlines
Oh how I can already hear the sound of angry villagers
with pitchforks running over to my desk
226 files changed, 154 insertions, 439 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c838cb21e..b55b74c20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1527,4 +1527,3 @@ if(COMPILE_ENABLE_GTKSTYLE AND WANT_QT4) endif() message(STATUS " ") - @@ -41,6 +41,6 @@ Compiling KVIrc on your Linux platform is now easier than ever, and the best way #### Licensing -- [GPLv2](https://github.com/kvirc/KVIrc/blob/master/doc/LICENSE-GPLV2) -- [GPLv3](https://github.com/kvirc/KVIrc/blob/master/doc/LICENSE-GPLV3) +- [GPLv2](https://github.com/kvirc/KVIrc/blob/master/doc/LICENSE-GPLV2) +- [GPLv3](https://github.com/kvirc/KVIrc/blob/master/doc/LICENSE-GPLV3) - [OpenSSL](https://github.com/kvirc/KVIrc/blob/master/doc/LICENSE-OPENSSL) diff --git a/admin/gendoc.pl b/admin/gendoc.pl index cacf7236a..0d68538a0 100755 --- a/admin/gendoc.pl +++ b/admin/gendoc.pl @@ -784,7 +784,7 @@ sub process_kvs_syntax sub process_body_line { my($bInExample); - + $bInExample = $_[1]; # Kill plain text tags @@ -964,7 +964,7 @@ sub process_file # If we have the initial tabblock , remove it from the line (remove indentation) $_ =~ s/^$tabblock//g; } - + # Process example code blocks if($iExampleState eq 0) { @@ -1001,7 +1001,7 @@ sub process_file } process_body_line($_,$iExampleState); - + $partbody="$partbody$_"; } @@ -1075,7 +1075,7 @@ sub process_file #{ # substitute_keyterms($parts{'switches'},"$docfilename$g_fileextension"); #} - + use File::Path; mkpath("$g_directory"); if(open(DOCFILE,">$g_directory/$docfilename$g_fileextension")) @@ -1097,7 +1097,7 @@ sub process_file print_entry("Usage","<div class='syntax-text'>$parts{'usage'}</div>"); } } - + if($parts{'parameters'} ne "") { print_entry("Parameters","<font color=\"$g_syntaxcolor\"><pre><code>$parts{'parameters'}</code></pre></font>"); diff --git a/admin/gensrc.pl b/admin/gensrc.pl index 94292d4e5..9a0c14ac3 100644 --- a/admin/gensrc.pl +++ b/admin/gensrc.pl @@ -88,4 +88,3 @@ if(open(THEFILE,">$name")) } else { print "No way to open the file $name\n"; } - diff --git a/admin/makedist.sh b/admin/makedist.sh index 2052faedb..3a87c0e21 100644 --- a/admin/makedist.sh +++ b/admin/makedist.sh @@ -173,4 +173,3 @@ fi # Done :) echo "Done. Have a nice day. :)" - diff --git a/data/icons/128x128/CMakeLists.txt b/data/icons/128x128/CMakeLists.txt index 08c145351..547b0dfec 100644 --- a/data/icons/128x128/CMakeLists.txt +++ b/data/icons/128x128/CMakeLists.txt @@ -24,5 +24,3 @@ elseif(WIN32) install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/apps/) install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/mimetypes/) endif() - - diff --git a/data/icons/16x16/CMakeLists.txt b/data/icons/16x16/CMakeLists.txt index 15435f7e5..65b2b68ae 100644 --- a/data/icons/16x16/CMakeLists.txt +++ b/data/icons/16x16/CMakeLists.txt @@ -24,5 +24,3 @@ elseif(WIN32) install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/apps/) install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/mimetypes/) endif() - - diff --git a/data/icons/32x32/CMakeLists.txt b/data/icons/32x32/CMakeLists.txt index 9de46bde3..4de3fa4b5 100644 --- a/data/icons/32x32/CMakeLists.txt +++ b/data/icons/32x32/CMakeLists.txt @@ -24,5 +24,3 @@ elseif(WIN32) install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/apps/) install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/mimetypes/) endif() - - diff --git a/data/icons/48x48/CMakeLists.txt b/data/icons/48x48/CMakeLists.txt index bde43f942..9a156df81 100644 --- a/data/icons/48x48/CMakeLists.txt +++ b/data/icons/48x48/CMakeLists.txt @@ -26,5 +26,3 @@ elseif(WIN32) install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/apps/) install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/mimetypes/) endif() - - diff --git a/data/icons/64x64/CMakeLists.txt b/data/icons/64x64/CMakeLists.txt index 6feb541ef..81da6c4dc 100644 --- a/data/icons/64x64/CMakeLists.txt +++ b/data/icons/64x64/CMakeLists.txt @@ -24,5 +24,3 @@ elseif(WIN32) install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/apps/) install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/mimetypes/) endif() - - diff --git a/data/icons/scalable/CMakeLists.txt b/data/icons/scalable/CMakeLists.txt index d13674319..306e7bb00 100644 --- a/data/icons/scalable/CMakeLists.txt +++ b/data/icons/scalable/CMakeLists.txt @@ -24,5 +24,3 @@ elseif(WIN32) install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/apps/) install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/mimetypes/) endif() - - diff --git a/doc/COPYING b/doc/COPYING index 29d5818fe..613fe7f7c 100644 --- a/doc/COPYING +++ b/doc/COPYING @@ -46,5 +46,3 @@ you distribute KVIrc. Inclusion of this notice with such a distribution constitutes a grant of such permission. If you do not wish to grant these permissions, remove this section entitled "OpenSSL Exception" from your distribution. - - diff --git a/doc/INSTALL-MacOS.txt b/doc/INSTALL-MacOS.txt index d0f5a66c9..07f5037ba 100644 --- a/doc/INSTALL-MacOS.txt +++ b/doc/INSTALL-MacOS.txt @@ -134,5 +134,3 @@ to install Qt in order to run your bundle. Open Finder, move your bundle into a better location (e.g. /Applications), and double click to start. - - diff --git a/doc/INSTALL-Win32.txt b/doc/INSTALL-Win32.txt index 42c8ac520..415800f64 100644 --- a/doc/INSTALL-Win32.txt +++ b/doc/INSTALL-Win32.txt @@ -324,5 +324,5 @@ Common errors, pitfalls, - * Windows Vista and 7 Users * If you have UAC enabled (default setting) and KVIrc is installed in the Program Files folder and you have opted to use the portable setting, then KVIrc's data files will be found in the VirtualStore folder, - typically: C:\Users\[UserName]\AppData\Local\VirtualStore\Program Files\KVIrc\ If you plan on using the portable setting, + typically: C:\Users\[UserName]\AppData\Local\VirtualStore\Program Files\KVIrc\ If you plan on using the portable setting, it is recommended that you install KVIrc in a non UAC protected folder. diff --git a/doc/INSTALL-Win64.txt b/doc/INSTALL-Win64.txt index 5f66b3341..c6b5b2d04 100644 --- a/doc/INSTALL-Win64.txt +++ b/doc/INSTALL-Win64.txt @@ -37,12 +37,12 @@ Prerequisites Get it from http://www.activestate.com/activeperl/downloads Get the 64-bit version, use 5.20.x (newer versions don't have dmake yet in the repo). Install in default location with default options. - + If you want scripting support, you will also have to do this: Go to C:\Perl64\lib\CORE, make the file config.h not read-only and open it for editing. Find the line that starts with "#define PERL_STATIC_INLINE" and put "/*" in front of it (so it's commented). And of course save the file. - + Some perl releases miss dmake at install time; if you get a strange error at compilation time, run the following command from cmdline: ppm install dmake @@ -109,7 +109,7 @@ Prerequisites cmake .. -G "NMake Makefiles" -DPHONON_BUILD_PHONON4QT5=ON -DCMAKE_INSTALL_PREFIX=C:\Qt\5.4\msvc2013_64 -DCMAKE_PREFIX_PATH=C:\Qt\5.4\msvc2013_64 -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON -Wno-dev nmake nmake install - + - GNU GetText for Win32. Required if you're building a redistributable package, needed to translate KVIrc interface into your own language. @@ -156,7 +156,7 @@ Compilation cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=release -DWANT_KDE=0 nmake nmake install - + Your binaries are now located at C:\kvirccomp\kvirc\build\release. But you can’t start kvirc.exe as there're some libraries missing. You can either copy these to the system dir, add their locations to %PATH% or copy them to the KVIrc-release dir. diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index cd60b63d0..ce9ed2279 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -645,4 +645,3 @@ Alternatively, you can try the experimental CPack support included in CMakelist.txt to build a package. In this case, please refer to the CPack documentation. - diff --git a/doc/LICENSE-OPENSSL b/doc/LICENSE-OPENSSL index e47d101f1..7d0e2378b 100644 --- a/doc/LICENSE-OPENSSL +++ b/doc/LICENSE-OPENSSL @@ -19,7 +19,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -74,21 +74,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -103,10 +103,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -118,10 +118,9 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence * [including the GNU Public Licence.] */ - diff --git a/doc/README b/doc/README index f78fa3c43..f34e3c5f5 100644 --- a/doc/README +++ b/doc/README @@ -528,7 +528,3 @@ Have fun :) Szymon Stefanek and The KVIrc Development Team ############################################################################### - - - - diff --git a/doc/TODO-cmake b/doc/TODO-cmake index 4c23917e3..9dce4045c 100644 --- a/doc/TODO-cmake +++ b/doc/TODO-cmake @@ -3,4 +3,3 @@ transition autotools -> cmake. * Missing or broken rules - uninstall: delete directories - diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt index ee54c435e..2a1220111 100644 --- a/doc/hackers.guide.txt +++ b/doc/hackers.guide.txt @@ -325,7 +325,7 @@ As of 2012.07.01: As of 2015.08.24: pragma@photon:/src/pragma/kvirc-git/KVIrc$ cloc ./ 5654 text files. - 4080 unique files. + 4080 unique files. 2882 files ignored. http://cloc.sourceforge.net v 1.60 T=7.61 s (417.3 files/s, 76656.1 lines/s) @@ -996,4 +996,3 @@ Then take a look at doc/api/html/annotated.html Let's also try to document the code we write: the doxygen syntax is trivial and you can find a 5 minute tutorial by googling. - diff --git a/doc/themes.howto.txt b/doc/themes.howto.txt index c7fc2f7a6..0d0c5cc05 100644 --- a/doc/themes.howto.txt +++ b/doc/themes.howto.txt @@ -120,4 +120,3 @@ shipped in the distribution. Have fun :) Szymon Stefanek - diff --git a/po/msgcheckformat.c b/po/msgcheckformat.c index 3c4a96a9e..ecaea54d4 100644 --- a/po/msgcheckformat.c +++ b/po/msgcheckformat.c @@ -311,4 +311,3 @@ int main(int argc, char **argv) return 0; } - diff --git a/scripts/pydocparser-example/parsefiles.py b/scripts/pydocparser-example/parsefiles.py index 2dd540cf8..6cebb7fbf 100644 --- a/scripts/pydocparser-example/parsefiles.py +++ b/scripts/pydocparser-example/parsefiles.py @@ -86,4 +86,3 @@ for filename in filelist: outfile.write("</div><br>\n") outfile.close() - diff --git a/src/kvirc/kernel/KviApplication_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp index e80711b4d..ab6fa7c0f 100644 --- a/src/kvirc/kernel/KviApplication_setup.cpp +++ b/src/kvirc/kernel/KviApplication_setup.cpp @@ -854,4 +854,3 @@ void KviApplication::saveKvircDirectory() cfgx.writeEntry("LocalKvircDirectory",m_szLocalKvircDir); cfgx.writeEntry("SourcesDate",KVI_SOURCES_DATE_NUMERIC); } - diff --git a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp index 779852de6..bd4cbfaa1 100644 --- a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp +++ b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp @@ -37,4 +37,3 @@ KviAsynchronousConnectionData::~KviAsynchronousConnectionData() if(m_pReconnectInfo) delete m_pReconnectInfo; } - diff --git a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp index 5a29d0c01..f554cb42b 100644 --- a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp +++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp @@ -220,4 +220,3 @@ void KviCustomToolBarDescriptor::save(KviConfigurationFile * cfg) i++; } } - diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index 8f8f766c3..529f905a6 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -1328,4 +1328,3 @@ void KviIconManager::cacheCleanup() if(m_pCachedImages->isEmpty())m_pCleanupTimer->stop(); } */ - diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp index f744b8a4b..c5520131b 100644 --- a/src/kvirc/kernel/KviIpcSentinel.cpp +++ b/src/kvirc/kernel/KviIpcSentinel.cpp @@ -69,7 +69,7 @@ static Atom kvi_atom_ipc_remote_message; static KviCString kvi_sentinel_id; static bool g_bIpcAtomsLoaded = false; - + static kvi_u64_t g_uLocalInstanceId = 0; static void kvi_ipcLoadAtoms() @@ -88,18 +88,18 @@ { if(!command) return; - + int len = kvi_strLen(command) + 1; - + char * buffer = (char *)::malloc(len + 8); - + *((kvi_u64_t *)buffer) = g_uLocalInstanceId; - + ::memcpy(buffer+8,command,len); - + XChangeProperty(kvi_ipc_get_xdisplay(),w,kvi_atom_ipc_remote_command, XA_STRING,8,PropModeReplace,(const unsigned char *)buffer,len+8); - + ::free(buffer); } @@ -273,7 +273,7 @@ #else #if defined(COMPILE_X11_SUPPORT) && defined(COMPILE_QX11INFO_SUPPORT) - + bool KviIpcSentinel::x11GetRemoteMessage() { Atom type; @@ -281,7 +281,7 @@ unsigned long nItems,after; unsigned char * data = 0; KviCString szData; - + if(XGetWindowProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_remote_command,0,1024,false,XA_STRING, &type,&format,&nItems,&after,&data) == Success) { @@ -293,17 +293,17 @@ XFree((char *)data); } } - + if(szData.isEmpty()) return false; // no command, or our own command - + kvi_ipcSetRemoteCommand(winId(),""); if(g_pApp) g_pApp->ipcMessage(szData.ptr()); return true; } - + bool KviIpcSentinel::x11Event(XEvent *e) { if(e->type == ClientMessage) @@ -344,7 +344,7 @@ kvi_u32_t atom; // .. other stuff follows, but we don't care } fake_xcb_property_notify_event_t; - + #define FAKE_XCB_PROPERTY_NOTIFY 28 } diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp index 18b634c63..ffd17ae45 100644 --- a/src/kvirc/kernel/KviIrcConnection.cpp +++ b/src/kvirc/kernel/KviIrcConnection.cpp @@ -1727,7 +1727,7 @@ void KviIrcConnection::joinChannels(const QList< QPair< QString,QString > > &lCh // Sort the list so the channels with passwords come first QList< QPair< QString,QString> > lSorted; - + QPair<QString,QString> oChanAndPass; Q_FOREACH(oChanAndPass,lChannelsAndPasses) { @@ -1744,11 +1744,11 @@ void KviIrcConnection::joinChannels(const QList< QPair< QString,QString > > &lCh while(lSorted.count() > 0) { QPair<QString,QString> oChanAndPass = lSorted.takeFirst(); - + if(!szChans.isEmpty()) szChans.append(','); szChans.append(oChanAndPass.first); - + if(!oChanAndPass.second.isEmpty()) { if(!szPasses.isEmpty()) @@ -1923,7 +1923,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) if(bJoinStdChannels) { QList< QPair< QString,QString > > lChansAndPass; - + if(target()->network()->autoJoinChannelList()) { if(_OUTPUT_VERBOSE) diff --git a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp index aba05539f..978dbd5a2 100644 --- a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp @@ -35,4 +35,3 @@ KviIrcConnectionAntiCtcpFloodData::KviIrcConnectionAntiCtcpFloodData() KviIrcConnectionAntiCtcpFloodData::~KviIrcConnectionAntiCtcpFloodData() { } - diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncData.h b/src/kvirc/kernel/KviIrcConnectionAsyncData.h index af09e70cb..c1ac268e8 100644 --- a/src/kvirc/kernel/KviIrcConnectionAsyncData.h +++ b/src/kvirc/kernel/KviIrcConnectionAsyncData.h @@ -83,4 +83,3 @@ public: }; #endif - diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp index 58ef6729a..57d6ca250 100644 --- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp @@ -38,5 +38,3 @@ KviAsyncWhoisInfo::~KviAsyncWhoisInfo() if(pCallback)delete pCallback; if(pMagic)delete pMagic; } - - diff --git a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp index 0ab64744c..de84181a4 100644 --- a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp @@ -34,4 +34,3 @@ KviIrcConnectionNetsplitDetectorData::KviIrcConnectionNetsplitDetectorData() KviIrcConnectionNetsplitDetectorData::~KviIrcConnectionNetsplitDetectorData() { } - diff --git a/src/kvirc/kernel/KviMain.cpp b/src/kvirc/kernel/KviMain.cpp index f76ea269e..7cf1aefca 100644 --- a/src/kvirc/kernel/KviMain.cpp +++ b/src/kvirc/kernel/KviMain.cpp @@ -376,7 +376,7 @@ int main(int argc, char ** argv) "http://www.kvirc.net", // homepage "https://github.com/kvirc/KVIrc/issues" // bug address (FIXME: this would be an E-MAIL address...) ); - + //fake argc/argv initialization: kde will use argv[0] as out appName in some dialogs // (eg: kdebase/workspace/kwin/killer/killer.cpp) KCmdLineArgs::init(1, &argv[0], pAboutData); @@ -392,7 +392,7 @@ int main(int argc, char ** argv) "???", // *some other text* ???? "http://www.kvirc.net", // homepage "https://github.com/kvirc/KVIrc/issues" // bug address (FIXME: this would be an E-MAIL address...) - ); + ); #endif //!COMPILE_KDE4_SUPPORT #endif diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 81648dab7..609317de8 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -1287,5 +1287,3 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) return false; } - - diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 19afbc9ff..4a0647fe4 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -1108,12 +1108,12 @@ namespace KviTheme // find all the "kvi_bigicon" images that we can find in the main pics directory QString szPicsPath; - + g_pApp->getGlobalKvircDirectory(szPicsPath,KviApplication::Pics); - + QDir d(szPicsPath); QStringList sl = d.entryList(QDir::nameFiltersFromString("kvi_bigicon_*.png"),QDir::Files); - + for(QStringList::Iterator it=sl.begin();it != sl.end();it++) { KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(*it); @@ -1121,7 +1121,7 @@ namespace KviTheme { QString szPixPath = szThemeDirPath; szPixPath += *it; - + if(!KviFileUtils::copyFile(p->path(),szPixPath)) { qDebug("Failed to copy file %s into %s",p->path().toUtf8().data(),szPixPath.toUtf8().data()); @@ -1130,28 +1130,28 @@ namespace KviTheme } } } - + if(!KviFileUtils::makeDir(szThemeDirPath+KVI_SMALLICONS_SUBDIRECTORY)) { options.setLastError(__tr2qs("Failed to create the theme subdirectory")); return false; } - + // We actually need to *save* the small icons since // we have a compatibility mode that can load them from // the old format kvi_smallicon_XY.png multiimage libraries. - + for(int j=0;j<KviIconManager::IconCount;j++) { QPixmap * pix = g_pIconManager->getSmallIcon(j); - + QString szPixPath = szThemeDirPath; szPixPath.append(KVI_SMALLICONS_SUBDIRECTORY); szPixPath.append(KVI_PATH_SEPARATOR_CHAR); szPixPath.append("kcs_"); szPixPath.append(g_pIconManager->getSmallIconName(j)); szPixPath.append(".png"); - + if(!pix->save(szPixPath,"PNG",90)) { qDebug("Failed to save small icon %d into %s",j,szPixPath.toUtf8().data()); diff --git a/src/kvirc/kernel/KviTextIconManager.cpp b/src/kvirc/kernel/KviTextIconManager.cpp index 6373dcd53..1902a6c69 100644 --- a/src/kvirc/kernel/KviTextIconManager.cpp +++ b/src/kvirc/kernel/KviTextIconManager.cpp @@ -346,5 +346,3 @@ void KviTextIconManager::save(const QString & szFileName) ++it; } } - - diff --git a/src/kvirc/kvs/KviKvsAliasManager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp index 01f096ed2..3c0c94b11 100644 --- a/src/kvirc/kvs/KviKvsAliasManager.cpp +++ b/src/kvirc/kvs/KviKvsAliasManager.cpp @@ -72,13 +72,13 @@ bool KviKvsAliasManager::removeNamespace(const QString & szName) lKill.append(it.current()->name()); it.moveNext(); } - + if(lKill.isEmpty()) return false; - + Q_FOREACH(QString szKill,lKill) remove(szKill); - + return true; } diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp index 72e1480c8..06059e995 100644 --- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp @@ -291,13 +291,13 @@ namespace KviKvsCoreCallbackCommands } } } else { - + if(tmp.endsWith("@")) { KVSCCC_pContext->error(__tr2qs_ctx("Found an empty alias name within a namespace","kvs")); return false; } - + KviKvsScript * pScript = new KviKvsScript(*KVSCCC_pCallback); pScript->setName(szName); KviKvsAliasManager::instance()->add(szName,pScript); diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp index 54c363e81..d9c0034b9 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp @@ -1273,7 +1273,7 @@ namespace KviKvsCoreSimpleCommands } else KVSCSC_pContext->warning(__tr2qs_ctx("Invalid color-set specification, using default","kvs")); } else { bool bIsMe = pWnd->connection() && KviQString::equalCI(pWnd->connection()->currentNickName(),szNick); - + switch(pWnd->type()) { case KviWindow::Channel: diff --git a/src/kvirc/kvs/KviKvsModuleInterface.cpp b/src/kvirc/kvs/KviKvsModuleInterface.cpp index 3d3a3c226..d8621b86a 100644 --- a/src/kvirc/kvs/KviKvsModuleInterface.cpp +++ b/src/kvirc/kvs/KviKvsModuleInterface.cpp @@ -193,4 +193,3 @@ void KviKvsModuleInterface::getAllFunctionsCommandsModule(QStringList *list,QStr ++it2; } } - diff --git a/src/kvirc/kvs/KviKvsModuleInterface.h b/src/kvirc/kvs/KviKvsModuleInterface.h index 109fc5e29..49910ba04 100644 --- a/src/kvirc/kvs/KviKvsModuleInterface.h +++ b/src/kvirc/kvs/KviKvsModuleInterface.h @@ -227,4 +227,3 @@ protected: #endif //!_KVI_KVS_MODULEINTERFACE_H_ - diff --git a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp index 995060bf8..2df00abe7 100644 --- a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp +++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp @@ -67,4 +67,3 @@ KviKvsHashElement::~KviKvsHashElement() if(m_pParent) delete m_pParent; } - diff --git a/src/kvirc/kvs/object/KviKvsObjectController.cpp b/src/kvirc/kvs/object/KviKvsObjectController.cpp index d3ba6621d..af2957000 100644 --- a/src/kvirc/kvs/object/KviKvsObjectController.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectController.cpp @@ -255,4 +255,3 @@ void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass) delete pClass; } - diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp index c873ab645..cfa7673c4 100644 --- a/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp @@ -23,4 +23,3 @@ //============================================================================= #include "KviKvsObjectFunctionCall.h" - diff --git a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp index 6273e812f..d852c1d3a 100644 --- a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp @@ -87,4 +87,3 @@ KviKvsTreeNode * KviKvsParser::parseComment() } return 0; } - diff --git a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp index 39a89ab07..d0a520393 100644 --- a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp @@ -626,4 +626,3 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) return op; */ } - diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp index 61ecc9cba..33f29696c 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp @@ -67,4 +67,3 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeLocalVariable::evaluateReadWrite(KviKvs m_szIdentifier ); } - diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp index 1c81bf004..f1ed023f6 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp @@ -84,4 +84,3 @@ bool KviKvsTreeNodeModuleFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c return (*proc)(&call); } - diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp index 54277cc60..a177aee8b 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp @@ -97,4 +97,3 @@ bool KviKvsTreeNodeModuleSimpleCommand::execute(KviKvsRunTimeContext * c) return (*proc)(&call); } - diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp index 5dc4254bb..a49bf1297 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp @@ -55,4 +55,3 @@ bool KviKvsTreeNodeParameterCount::evaluateReadOnly(KviKvsRunTimeContext * c,Kvi pBuffer->setInteger(c->parameterList()->count()); return true; } - diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp index 08550887b..6f8355242 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp @@ -232,4 +232,3 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) return true; } - diff --git a/src/kvirc/sparser/KviIrcMessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp index d40032764..a631fe5be 100644 --- a/src/kvirc/sparser/KviIrcMessage.cpp +++ b/src/kvirc/sparser/KviIrcMessage.cpp @@ -227,4 +227,3 @@ QString* KviIrcMessage::messageTagPtr(const QString& szTag) { if (i == m_ParsedMessageTags.end()) return NULL; return &*i; } - diff --git a/src/kvirc/sparser/KviIrcNumericCodes.h b/src/kvirc/sparser/KviIrcNumericCodes.h index 3df70b38b..d74917c7c 100644 --- a/src/kvirc/sparser/KviIrcNumericCodes.h +++ b/src/kvirc/sparser/KviIrcNumericCodes.h @@ -379,7 +379,7 @@ #define RPL_SASLLOGIN 900 /* :jaguar.test 900 jilles jilles!jilles@localhost.stack.nl jilles :You are now logged in as jilles. */ #define RPL_SASLSUCCESS 903 /* :jaguar.test 903 jilles :SASL authentication successful */ #define RPL_SASLFAILED 904 /* :lindbohm.freenode.net 904 * :SASL authentication failed */ -#define RPL_SASLERROR 905 // :server 905 <nick> :SASL message too long +#define RPL_SASLERROR 905 // :server 905 <nick> :SASL message too long #define RPL_SASLABORT 906 // :server 906 <nick> :SASL authentication aborted #define ERR_SASLALREADY 907 // :server 907 <nick> :You have already completed SASL authentication #define RPL_SASLMECHS 908 // :server 908 <nick> <mechanisms> :are available SASL mechanisms diff --git a/src/kvirc/sparser/KviIrcServerParser.cpp b/src/kvirc/sparser/KviIrcServerParser.cpp index 1b77de582..ba827a53a 100644 --- a/src/kvirc/sparser/KviIrcServerParser.cpp +++ b/src/kvirc/sparser/KviIrcServerParser.cpp @@ -144,4 +144,3 @@ void KviIrcServerParser::parseMessage(const char * message,KviIrcConnection * pC } } } - diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index fce505533..755fa1c02 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -1889,11 +1889,11 @@ void KviIrcServerParser::parseChannelMode(const QString &szNick,const QString &s { bIsMultiMode = true; bShowAsCompact = KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges); - + if(iSingleModes == 1) bIsMultiSingleMode = true; } - + while(*aux) { @@ -2417,4 +2417,4 @@ void KviIrcServerParser::parseLiteralAway(KviIrcMessage *msg) { e->setAway(!awayMsg.isEmpty()); } -}
\ No newline at end of file +} diff --git a/src/kvirc/ui/KviColorSelectionWindow.cpp b/src/kvirc/ui/KviColorSelectionWindow.cpp index 091429c96..5b5770c32 100644 --- a/src/kvirc/ui/KviColorSelectionWindow.cpp +++ b/src/kvirc/ui/KviColorSelectionWindow.cpp @@ -129,4 +129,3 @@ void KviColorWindow::timerEvent(QTimerEvent *) killTimer(m_iTimerId); hide(); } - diff --git a/src/kvirc/ui/KviCtcpPageDialog.cpp b/src/kvirc/ui/KviCtcpPageDialog.cpp index e9f1bb0ab..cad665fd9 100644 --- a/src/kvirc/ui/KviCtcpPageDialog.cpp +++ b/src/kvirc/ui/KviCtcpPageDialog.cpp @@ -138,4 +138,3 @@ void KviCtcpPageDialog::showEvent(QShowEvent *e) QWidget::showEvent(e); center(); } - diff --git a/src/kvirc/ui/KviFileDialog.cpp b/src/kvirc/ui/KviFileDialog.cpp index d663cb4b2..739964278 100644 --- a/src/kvirc/ui/KviFileDialog.cpp +++ b/src/kvirc/ui/KviFileDialog.cpp @@ -254,4 +254,3 @@ bool KviFileDialog::askForOpenFileNames(QStringList & szBuffer, const QString & delete pDialog; return false; } - diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp index a806146c7..afa8915fe 100644 --- a/src/kvirc/ui/KviInput.cpp +++ b/src/kvirc/ui/KviInput.cpp @@ -494,4 +494,3 @@ void KviInput::toggleMultiLine() Experiment with that too :) [/p] */ - diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index 1da6daf10..065ea3af0 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -326,7 +326,7 @@ void KviInputEditor::paintEvent(QPaintEvent *) #if (QT_VERSION >= 0x050000) // In Qt5 QStyle::drawPrimitive seems to always overwrite the background, no matter what. qDrawShadePanel(&p,0,0,width(),height(),palette(),true,1,NULL); - + QRect r(1,1,width()-1,height()-1); #else QStyleOptionFrameV2 option; @@ -377,11 +377,11 @@ bool KviInputEditor::checkWordSpelling(const QString &szWord) return true; } } - + KviKvsVariant bCorrect; KviKvsVariantList params(new KviKvsVariant(szWord)); KviKvsScript::evaluate("$spellchecker.check($0)", NULL, ¶ms, &bCorrect); - + return bCorrect.asBoolean(); #else return true; // assume correct @@ -404,7 +404,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo #ifdef COMPILE_ENCHANT_SUPPORT if(szText.isEmpty()) return; - + const QChar * const pBufferBegin = szText.unicode(); const QChar * p = pBufferBegin; const QChar * e = pBufferBegin + szText.length(); @@ -416,7 +416,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo break; p++; } - + if(p > pBufferBegin) ADD_SPELLCHECKER_BLOCK(QString(pBufferBegin,p-pBufferBegin),0,false,false); @@ -424,7 +424,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo if((p < e) && (p->unicode() == '/')) { const QChar * pCommandBlockBegin = p; - + // a command. p++; // skip spaces @@ -434,9 +434,9 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo break; p++; } - + const QChar * pCommandWordBegin = p; - + // skip command word while(p < e) { @@ -444,11 +444,11 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo break; p++; } - + if(p > pCommandWordBegin) { QString szCommand = QString(pCommandWordBegin,p - pCommandWordBegin).toLower(); - + // common commands that may be spellcheckable static QString szMe("me"); static QString szMsg("msg"); @@ -468,7 +468,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo ADD_SPELLCHECKER_BLOCK(szText,0,false,false); return; } - + } ADD_SPELLCHECKER_BLOCK(QString(pCommandBlockBegin,p-pCommandBlockBegin),pCommandBlockBegin - pBufferBegin,false,false); @@ -536,7 +536,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo p++; } - + if(pWordBegin) { // last word to spellcheck @@ -554,12 +554,12 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString &szText,KviPo QString KviInputEditor::checkSpelling(const QString &szText) { #ifdef COMPILE_ENCHANT_SUPPORT - + KviPointerList<KviInputEditorSpellCheckerBlock> lBuffer; splitTextIntoSpellCheckerBlocks(szText,lBuffer); - + QString szResult; - + for(KviInputEditorSpellCheckerBlock * pBlock = lBuffer.first();pBlock;pBlock = lBuffer.next()) { if(pBlock->bSpellCheckable && (!pBlock->bCorrect)) @@ -571,7 +571,7 @@ QString KviInputEditor::checkSpelling(const QString &szText) szResult.append(pBlock->szText); } } - + return szResult; #else return szText; @@ -591,7 +591,7 @@ void KviInputEditor::drawContents(QPainter * p) m_bCurBold = false; m_bCurUnderline = false; m_bCurSpellingMistake = false; - + if(m_bTextDisplayBufferDirty) { #ifdef COMPILE_ENCHANT_SUPPORT @@ -1131,7 +1131,7 @@ void KviInputEditor::showContextPopup(const QPoint &pos) pAction = g_pInputPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::BigGrin)),__tr2qs("Insert Icon"),this,SLOT(popupTextIconWindow())); pAction->setEnabled(!m_bReadOnly); - + #ifdef COMPILE_ENCHANT_SUPPORT // check if the cursor is in a spell-checkable block @@ -1178,7 +1178,7 @@ void KviInputEditor::showContextPopup(const QPoint &pos) KviInputEditorSpellCheckerBlock * KviInputEditor::findSpellCheckerBlockAtCursor(KviPointerList<KviInputEditorSpellCheckerBlock> &lBlocks) { KviInputEditorSpellCheckerBlock * pCurrentBlock = NULL; - + for(KviInputEditorSpellCheckerBlock * pBlock = lBlocks.first();pBlock;pBlock = lBlocks.next()) { if(m_iCursorPosition <= (pBlock->iStart + pBlock->iLength)) @@ -1218,30 +1218,30 @@ void KviInputEditor::fillSpellCheckerCorrectionsPopup() if(!pCurrentBlock->bSpellCheckable) { pLabel->setText(__tr2qs("Spelling Checker")); - + m_SpellCheckerPopup.addAction(__tr2qs("No Suggestions Available"))->setEnabled(false); } else { pLabel->setText(__tr2qs("Spelling Suggestions for '%1'").arg(pCurrentBlock->szText)); m_SpellCheckerPopup.addAction(pWidgetAction); - + KviKvsVariant aRet; KviKvsVariantList params(new KviKvsVariant(pCurrentBlock->szText)); KviKvsScript::evaluate("$spellchecker.suggestions($0)", NULL, ¶ms, &aRet); - + KviKvsArrayCast aCast; aRet.castToArray(&aCast); KviKvsArray * pArray = aCast.array(); int s = pArray->size(); - + for(int i=0;i<s;i++) { KviKvsVariant * v = pArray->at(i); if(!v) continue; - + QString szWord; v->asString(szWord); @@ -1281,7 +1281,7 @@ void KviInputEditor::spellCheckerPopupCorrectionActionTriggered() return; if(!pSender->inherits("QAction")) return; - + QAction * pAction = (QAction *)pSender; QString szWord = pAction->text(); @@ -1295,7 +1295,7 @@ void KviInputEditor::spellCheckerPopupCorrectionActionTriggered() if(!pCurrentBlock) return; // doh? - + m_iSelectionBegin = pCurrentBlock->iStart; m_iSelectionEnd = pCurrentBlock->iStart + pCurrentBlock->iLength - 1; @@ -3086,4 +3086,3 @@ void KviInputEditor::dummy() { // this function does nothing. check the header file for explanation } - diff --git a/src/kvirc/ui/KviInputEditor.h b/src/kvirc/ui/KviInputEditor.h index b7eeb8e38..fcc44921c 100644 --- a/src/kvirc/ui/KviInputEditor.h +++ b/src/kvirc/ui/KviInputEditor.h @@ -931,7 +931,7 @@ private slots: * \return void */ void zoomDefault(); - + /** * Shows the text icon window at cursor position */ diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp index 57b46852d..edefb3071 100644 --- a/src/kvirc/ui/KviIpEditor.cpp +++ b/src/kvirc/ui/KviIpEditor.cpp @@ -409,4 +409,3 @@ QSize KviIpEditor::sizeHint() const else return QSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); } else return QFrame::sizeHint(); } - diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index da8ddf071..41603837b 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -435,9 +435,9 @@ void KviIrcView::applyOptions() if(KVI_OPTION_UINT(KviOption_uintAutoFlushLogs)) m_iFlushTimer = startTimer(KVI_OPTION_UINT(KviOption_uintAutoFlushLogs)*60*1000); - + // Will do nothing if the view is still empty (i.e. called from the constructor) - reapplyMessageColors(); + reapplyMessageColors(); setFont(KVI_OPTION_FONT(KviOption_fontIrcView)); } @@ -773,7 +773,7 @@ bool KviIrcView::messageShouldGoToMessageView(int iMsgType) // fall down break; } - + return false; } @@ -2817,4 +2817,3 @@ void KviIrcView::scrollToMarker() ensureLineVisible(pLine); } } - diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp index 9ced9badb..1c2ae3384 100644 --- a/src/kvirc/ui/KviIrcView_events.cpp +++ b/src/kvirc/ui/KviIrcView_events.cpp @@ -1066,4 +1066,3 @@ void KviIrcView::wheelEvent(QWheelEvent *e) g_pApp->sendEvent(m_pScrollBar,e); bHere = false; } - diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp index 4440402cb..190dbc6b1 100644 --- a/src/kvirc/ui/KviIrcView_getTextLine.cpp +++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp @@ -1192,7 +1192,7 @@ void KviIrcView::reapplyMessageColors() { unsigned char oldBack = pLine->pChunks[0].colors.back; unsigned char oldFore = pLine->pChunks[0].colors.fore; - + for(unsigned int u=0;u<pLine->uChunkCount;u++) { if((pLine->pChunks[u].colors.back == oldBack) && (pLine->pChunks[u].colors.fore == oldFore)) @@ -1202,7 +1202,7 @@ void KviIrcView::reapplyMessageColors() } } } - + pLine = pLine->pNext; } } diff --git a/src/kvirc/ui/KviIrcView_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp index 3b9f4b1c9..34f758a20 100644 --- a/src/kvirc/ui/KviIrcView_loghandling.cpp +++ b/src/kvirc/ui/KviIrcView_loghandling.cpp @@ -294,4 +294,3 @@ 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."); } - diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index 93825d91d..3a870faca 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -778,7 +778,7 @@ void KviMainWindow::changeEvent(QEvent * e) e->spontaneous() ) { - + if(!trayIcon()) { executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW); @@ -1309,4 +1309,3 @@ void KviMainWindow::setButtonStyle(unsigned int uStyle) } } } - diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp index 042a0d7dc..6e2f92f32 100644 --- a/src/kvirc/ui/KviMaskEditor.cpp +++ b/src/kvirc/ui/KviMaskEditor.cpp @@ -350,4 +350,3 @@ void KviMaskEditor::itemDoubleClicked( QTreeWidgetItem * pItem, int ) } } } - diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp index e5c01a384..ca08147b3 100644 --- a/src/kvirc/ui/KviMenuBar.cpp +++ b/src/kvirc/ui/KviMenuBar.cpp @@ -487,4 +487,3 @@ void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index) connect(p,SIGNAL(destroyed()),this,SLOT(menuDestroyed())); m_pScriptItemList->append(it); } - diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp index f862bac3f..0c9c641be 100644 --- a/src/kvirc/ui/KviModeEditor.cpp +++ b/src/kvirc/ui/KviModeEditor.cpp @@ -440,4 +440,3 @@ inline bool KviModeEditor::modeNeedsParameterOnlyWhenSet(char cMode) return pServerInfo->supportedParameterWhenSetModes().contains(cMode); return false; } - diff --git a/src/kvirc/ui/KviOptionsWidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp index 101039bf9..e68d954e8 100644 --- a/src/kvirc/ui/KviOptionsWidget.cpp +++ b/src/kvirc/ui/KviOptionsWidget.cpp @@ -788,4 +788,3 @@ void KviOptionsWidget::commit() // emit wantToSwitchToAdvancedPage(this); //} - diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index 5faef112e..68f8670d3 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -858,5 +858,3 @@ QByteArray KviQueryWindow::loadLogFile(const QString & szFileName, bool bGzip) return data; } - - diff --git a/src/kvirc/ui/KviScriptButton.cpp b/src/kvirc/ui/KviScriptButton.cpp index f1c119286..6b109b387 100644 --- a/src/kvirc/ui/KviScriptButton.cpp +++ b/src/kvirc/ui/KviScriptButton.cpp @@ -81,4 +81,3 @@ KviWindowScriptButton::KviWindowScriptButton(QWidget * p,KviWindow * wnd,const c KviWindowScriptButton::~KviWindowScriptButton() { } - diff --git a/src/kvirc/ui/KviScriptEditor.cpp b/src/kvirc/ui/KviScriptEditor.cpp index c6bc7d2b6..03376b96e 100644 --- a/src/kvirc/ui/KviScriptEditor.cpp +++ b/src/kvirc/ui/KviScriptEditor.cpp @@ -136,4 +136,3 @@ void KviScriptEditor::destroyInstance(KviScriptEditor * e) editorModuleDestroyScriptEditor(e); } - diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp index f942823ff..6fc27f74b 100644 --- a/src/kvirc/ui/KviSelectors.cpp +++ b/src/kvirc/ui/KviSelectors.cpp @@ -972,4 +972,3 @@ void KviChannelListSelector::removeClicked() lst.setAutoDelete(true); lst.clear(); } - diff --git a/src/kvirc/ui/KviSplashScreen.cpp b/src/kvirc/ui/KviSplashScreen.cpp index a790c5e96..5e4a11dc2 100644 --- a/src/kvirc/ui/KviSplashScreen.cpp +++ b/src/kvirc/ui/KviSplashScreen.cpp @@ -191,4 +191,3 @@ void KviSplashScreen::fadeTimerShot() } } } - diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp index d9b426d3e..df594aa36 100644 --- a/src/kvirc/ui/KviTextIconWindow.cpp +++ b/src/kvirc/ui/KviTextIconWindow.cpp @@ -180,6 +180,3 @@ void KviTextIconWindow::cellSelected(int row, int column) } doHide(); } - - - diff --git a/src/kvirc/ui/KviThemedComboBox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp index cbb403a65..15f1f13ea 100644 --- a/src/kvirc/ui/KviThemedComboBox.cpp +++ b/src/kvirc/ui/KviThemedComboBox.cpp @@ -141,4 +141,3 @@ void KviThemedComboBox::keyPressEvent(QKeyEvent *e) QComboBox::keyPressEvent(e); } - diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp index 574b48e2c..5a2734cf9 100644 --- a/src/kvirc/ui/KviThemedLabel.cpp +++ b/src/kvirc/ui/KviThemedLabel.cpp @@ -121,4 +121,3 @@ void KviThemedLabel::mouseDoubleClickEvent(QMouseEvent *) { emit doubleClicked(); } - diff --git a/src/kvirc/ui/KviThemedLineEdit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp index 8460f1530..37815a110 100644 --- a/src/kvirc/ui/KviThemedLineEdit.cpp +++ b/src/kvirc/ui/KviThemedLineEdit.cpp @@ -142,4 +142,3 @@ void KviThemedLineEdit::paintEvent ( QPaintEvent * event ) QLineEdit::paintEvent(event); } - diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp index 674b8dff2..831a24ae2 100644 --- a/src/kvirc/ui/KviThemedTreeWidget.cpp +++ b/src/kvirc/ui/KviThemedTreeWidget.cpp @@ -88,4 +88,3 @@ void KviThemedTreeWidget::paintEvent(QPaintEvent *e) #endif QTreeWidget::paintEvent(e); } - diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp index 700fc4b93..92756d580 100644 --- a/src/kvirc/ui/KviToolBar.cpp +++ b/src/kvirc/ui/KviToolBar.cpp @@ -160,5 +160,3 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) g_pToolBarContextPopup->popup(QCursor::pos()); } - - diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 82964578b..9f7b11e47 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -700,4 +700,3 @@ QChar KviTopicWidget::getSubstituteChar(unsigned short control_code) break; } } - diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp index 3c910c5a7..c9d6a73e8 100644 --- a/src/kvirc/ui/KviTreeWindowList.cpp +++ b/src/kvirc/ui/KviTreeWindowList.cpp @@ -668,4 +668,3 @@ QSize KviTreeWindowListItemDelegate::sizeHint( const QStyleOptionViewItem &, con ) iHeight = 20; return QSize(treeWidget->viewport()->size().width(), iHeight); } - diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index 2dd0353a9..5b33109ea 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -2478,4 +2478,3 @@ void KviUserListViewArea::wheelEvent(QWheelEvent * e) g_pApp->sendEvent(m_pScrollBar,e); bHere = false; } - diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp index a1e6fdfa5..fa4de8ef3 100644 --- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp +++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp @@ -268,4 +268,3 @@ void KviWebPackageManagementDialog::showEvent(QShowEvent *) } #endif //COMPILE_WEBKIT_SUPPORT - diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index 3bf4a874b..52632e50e 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -1391,4 +1391,3 @@ KviIrcContext * KviWindow::context() } return 0; } - diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp index 3b9f89850..7aa3c5b2f 100644 --- a/src/kvirc/ui/KviWindowListBase.cpp +++ b/src/kvirc/ui/KviWindowListBase.cpp @@ -793,5 +793,3 @@ bool KviClassicWindowList::setIterationPointer(KviWindowListItem * it) { return (m_pButtonList->findRef((const KviWindowListButton *)it) != -1); } - - diff --git a/src/kvirc/ui/KviWindowStack.cpp b/src/kvirc/ui/KviWindowStack.cpp index 86d029a6a..fbc19dd31 100644 --- a/src/kvirc/ui/KviWindowStack.cpp +++ b/src/kvirc/ui/KviWindowStack.cpp @@ -144,7 +144,7 @@ void KviWindowStack::fillWindowPopup() QString szCaption; KviWindow * pWnd; - + QAction * pAction; int idx = 0; @@ -201,11 +201,11 @@ void KviWindowStack::menuActivated(QAction *pAction) if(id > count()) return; - + QWidget * w = widget(id); if(!w) return; - + if(!w->inherits("KviWindow")) return; diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp index a411b5d8c..8079c4cca 100644 --- a/src/modules/about/AboutDialog.cpp +++ b/src/modules/about/AboutDialog.cpp @@ -239,5 +239,3 @@ void AboutDialog::closeButtonPressed() { delete this; } - - diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index c0f68dabf..815d35334 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -268,29 +268,29 @@ namespace AddonFunctions return szDirName; } - + bool checkDirTree(const QString &szDirPath,QString * pszError) { if(pszError) *pszError = ""; - + QDir addon(szDirPath); if(!addon.exists()) { *pszError = __tr2qs_ctx("The selected directory does not exist.","addon"); return false; } - + QFileInfo init(szDirPath + "/install.kvs"); if(!init.exists()) { *pszError = __tr2qs_ctx("The initialization script (install.kvs) does not exist.","addon"); return false; } - + return true; } - + bool pack(AddonInfo &info,QString &szError) { if(!checkDirTree(info.szDirPath,&szError)) @@ -301,7 +301,7 @@ namespace AddonFunctions QString szTmp; szTmp = QDateTime::currentDateTime().toString(Qt::ISODate); - + KviPackageWriter pw; pw.addInfoField("PackageType","AddonPack"); pw.addInfoField("AddonPackVersion",KVI_CURRENT_ADDONS_ENGINE_VERSION); @@ -324,26 +324,26 @@ namespace AddonFunctions QByteArray * pba = new QByteArray(); QBuffer bufferz(pba,0); - + bufferz.open(QIODevice::WriteOnly); pix.save(&bufferz,"PNG"); bufferz.close(); pw.addInfoField("Image",pba); } - + QDir dir(info.szDirPath); QFileInfoList ls = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::Readable | QDir::NoSymLinks | QDir::NoDotAndDotDot); - + if(ls.isEmpty()) { szError = __tr2qs_ctx("The package file list is empty","addon"); return false; } - + for(QFileInfoList::Iterator it = ls.begin();it != ls.end();++it) { const QFileInfo &inf = *it; - + if(inf.isDir()) { if(!pw.addDirectory(inf.absoluteFilePath(),QString("%1/").arg(inf.fileName()))) @@ -351,10 +351,10 @@ namespace AddonFunctions szError = pw.lastError(); return false; } - + continue; } - + // must be a file if(!pw.addFile(inf.absoluteFilePath(),inf.fileName())) { @@ -362,15 +362,15 @@ namespace AddonFunctions return false; } } - - + + // Create the addon package if(info.szSavePath.isEmpty()) { szError = __tr2qs_ctx("Save path is empty","addon"); return false; } - + if(!pw.pack(info.szSavePath)) { szError = pw.lastError(); @@ -379,5 +379,5 @@ namespace AddonFunctions return true; } - + } diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp index 9f56cc320..52faeb280 100644 --- a/src/modules/addon/PackAddonDialog.cpp +++ b/src/modules/addon/PackAddonDialog.cpp @@ -458,4 +458,3 @@ void PackAddonSummaryFilesWidget::showEvent(QShowEvent *) m_pFiles->setPlainText(list.join("\n")); } - diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp index a072e22ac..aa67f3a02 100644 --- a/src/modules/addon/WebAddonInterfaceDialog.cpp +++ b/src/modules/addon/WebAddonInterfaceDialog.cpp @@ -72,4 +72,3 @@ bool WebAddonInterfaceDialog::packageIsInstalled(const QString &szId,const QStri #endif //COMPILE_WEBKIT_SUPPORT - diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index 1496baaff..0be3d5eb8 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -43,4 +43,3 @@ if(UNIX) elseif(WIN32) install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) endif() - diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index ddd54ae5d..1fef5f367 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -150,7 +150,7 @@ bool DccRecvThread::sendAck(int filePos,bool bTolerateErrors) { if(bTolerateErrors) return true; // ignore at all - + // Reported error. If it's EAGAIN or EINTR then no data has been sent. #ifdef COMPILE_SSL_SUPPORT if(m_pSSL) @@ -407,14 +407,14 @@ void DccRecvThread::run() } } else { // Must send the ack... the peer must close the connection - + // We tollerate ack errors if we're in the last 90% of the file. // It might be that we're slow with receiving data but the server // has already closed the connection (buggy server though). - + bool bTolerateErrors = (m_pOpt->uTotalFileSize > 0) && (((quint64)m_pFile->pos()) >= (m_pOpt->uTotalFileSize - (m_pOpt->uTotalFileSize / 10))); - + if(!sendAck(m_pFile->pos(),bTolerateErrors)) break; } diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 82c7a8833..2569dec44 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -930,4 +930,3 @@ KVIRC_MODULE( dialog_module_cleanup, 0 ) - diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 869cb9c89..009770046 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -381,7 +381,6 @@ static bool file_kvs_cmd_mkdir(KviKvsModuleCommandCall * c) { if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("Failed to make the directory '%Q'"),&szDir); - } return !c->switches()->find('e',"error"); } diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp index 9db49d8a9..8ec557058 100644 --- a/src/modules/help/HelpWidget.cpp +++ b/src/modules/help/HelpWidget.cpp @@ -254,4 +254,3 @@ QSize HelpWidget::sizeHint() const QSize s(wdth,m_pTextBrowser->sizeHint().height() + m_pToolBar->sizeHint().height()); return s; } - diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 210547521..745f7ff04 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -334,5 +334,3 @@ void HelpWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs("Help Browser"); } - - diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 42b4a8009..03ea6aae4 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -621,4 +621,3 @@ KVIRC_MODULE( ident_module_cleanup, 0 ) - diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index f86a4a687..e192c234f 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -310,4 +310,3 @@ KVIRC_MODULE( iograph_module_cleanup, 0 ) - diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h index 0a8eb4018..b2edd60ab 100644 --- a/src/modules/iograph/libkviiograph.h +++ b/src/modules/iograph/libkviiograph.h @@ -72,4 +72,3 @@ protected: }; #endif - diff --git a/src/modules/language/detector/build_detector.pl b/src/modules/language/detector/build_detector.pl index 2771427f6..7ac54b276 100755 --- a/src/modules/language/detector/build_detector.pl +++ b/src/modules/language/detector/build_detector.pl @@ -884,4 +884,3 @@ print OUTPUT "*/\n"; print OUTPUT "\n"; close(OUTPUT); - diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 005dfe086..f0e15fa42 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -618,4 +618,3 @@ void ListWindow::applyOptions() m_pInfoLabel->applyOptions(); KviWindow::applyOptions(); } - diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt index 4d838cd67..e7790b13a 100644 --- a/src/modules/logview/CMakeLists.txt +++ b/src/modules/logview/CMakeLists.txt @@ -9,4 +9,3 @@ set(kvilogview_SRCS set(kvi_module_name kvilogview) include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) - diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp index 7842811a8..fcc3c11a9 100644 --- a/src/modules/logview/LogViewWidget.cpp +++ b/src/modules/logview/LogViewWidget.cpp @@ -94,4 +94,3 @@ LogListViewLog::LogListViewLog(QTreeWidgetItem * pPar, LogFile::Type eType, LogF { setText(0,m_pFileData->date().toString("yyyy-MM-dd")); } - diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 353d83dbe..341c3bd89 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -832,5 +832,3 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile) // Close file descriptors log.close(); } - - diff --git a/src/modules/mediaplayer/MpAmipInterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp index cbc2482bd..3ec1ec0a3 100644 --- a/src/modules/mediaplayer/MpAmipInterface.cpp +++ b/src/modules/mediaplayer/MpAmipInterface.cpp @@ -252,7 +252,7 @@ QString MpAmipInterface::mrl() } else { szRet = szFn; } - + if(!szRet.startsWith("http://", Qt::CaseInsensitive)) szRet.prepend("file://"); diff --git a/src/modules/mediaplayer/MpMp3.h b/src/modules/mediaplayer/MpMp3.h index e55b38bc9..577deded1 100644 --- a/src/modules/mediaplayer/MpMp3.h +++ b/src/modules/mediaplayer/MpMp3.h @@ -132,4 +132,3 @@ char *unpad(char *string); int get_first_header(mp3info *mp3,long startpos); //void tagedit_curs(char *filename, int filenum, int fileoutof, id3tag *tag); const char * get_typegenre(int idx); - diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 883bcbb0c..fdf26d342 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -376,4 +376,3 @@ KVIRC_MODULE( mircimport_module_cleanup, 0 ) - diff --git a/src/modules/my/Idle.cpp b/src/modules/my/Idle.cpp index 5159bc7ac..729747d5a 100644 --- a/src/modules/my/Idle.cpp +++ b/src/modules/my/Idle.cpp @@ -129,4 +129,3 @@ void Idle::doCheck() { secondsIdle(secondsIdle()); } - diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index 07a34e523..5e361415a 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -64,7 +64,7 @@ if(CMAKE_RESULT_USING_QT5) qtftp/qftp.cpp qtftp/qurlinfo.cpp ) - + include_directories(qthttp/) include_directories(qtftp/) endif() @@ -72,4 +72,3 @@ endif() set(kvi_module_name kviobjects) include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) - diff --git a/src/modules/objects/KvsObject_buttonGroup.h b/src/modules/objects/KvsObject_buttonGroup.h index a7d44cc91..772cada71 100644 --- a/src/modules/objects/KvsObject_buttonGroup.h +++ b/src/modules/objects/KvsObject_buttonGroup.h @@ -43,4 +43,3 @@ protected: }; #endif //!_CLASS_GROUPBOX_H_ - diff --git a/src/modules/objects/KvsObject_checkBox.cpp b/src/modules/objects/KvsObject_checkBox.cpp index 73009a2f9..1a90aa19e 100644 --- a/src/modules/objects/KvsObject_checkBox.cpp +++ b/src/modules/objects/KvsObject_checkBox.cpp @@ -129,6 +129,3 @@ void KvsObject_checkBox::toggled(bool b) KviKvsVariantList params(new KviKvsVariant(b)); callFunction(this,"toggleEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp index 2d87bd0ba..2aea899f6 100644 --- a/src/modules/objects/KvsObject_colorDialog.cpp +++ b/src/modules/objects/KvsObject_colorDialog.cpp @@ -229,6 +229,3 @@ void KvsObject_colorDialog::slotColorSelected(const QColor &col) KviKvsVariantList params(new KviKvsVariant(pHash)); callFunction(this,"colorSelectedEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp index e712f0bb5..5fe40c13d 100644 --- a/src/modules/objects/KvsObject_comboBox.cpp +++ b/src/modules/objects/KvsObject_comboBox.cpp @@ -358,6 +358,3 @@ void KvsObject_comboBox::slotActivated(int i) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i)); callFunction(this,"activatedEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp index eaa2be091..bd4b4b259 100644 --- a/src/modules/objects/KvsObject_dateTimeEdit.cpp +++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp @@ -207,5 +207,3 @@ void KvsObject_dateTimeEdit::slotDateChanged(const QDate &) KviKvsVariantList *params=0; callFunction(this,"dateChangedEvent",params); } - - diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp index 8b5d30b27..2d56405cd 100644 --- a/src/modules/objects/KvsObject_dialog.cpp +++ b/src/modules/objects/KvsObject_dialog.cpp @@ -87,5 +87,3 @@ KVSO_CLASS_FUNCTION(dialog,setModal) ((QDialog *)widget())->setModal(bEnabled); return true; } - - diff --git a/src/modules/objects/KvsObject_dialog.h b/src/modules/objects/KvsObject_dialog.h index 602de8756..4dc08a8b2 100644 --- a/src/modules/objects/KvsObject_dialog.h +++ b/src/modules/objects/KvsObject_dialog.h @@ -40,4 +40,3 @@ protected: }; #endif // !_CLASS_DIALOG_H_ - diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp index b8cc20676..6a3628856 100644 --- a/src/modules/objects/KvsObject_dockWindow.cpp +++ b/src/modules/objects/KvsObject_dockWindow.cpp @@ -174,5 +174,3 @@ KVSO_CLASS_FUNCTION(dockWindow,dock) else c->warning(__tr2qs_ctx("Invalid dock area specified","objects")); return true; } - - diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp index 2b099afc3..da093e1fc 100644 --- a/src/modules/objects/KvsObject_ftp.cpp +++ b/src/modules/objects/KvsObject_ftp.cpp @@ -336,5 +336,3 @@ KVSO_CLASS_FUNCTION(ftp,stateChangedEvent) emitSignal("stateChanged",c,c->params()); return true; } - - diff --git a/src/modules/objects/KvsObject_groupBox.h b/src/modules/objects/KvsObject_groupBox.h index 4770352a9..7c30705da 100644 --- a/src/modules/objects/KvsObject_groupBox.h +++ b/src/modules/objects/KvsObject_groupBox.h @@ -60,4 +60,3 @@ protected: }; #endif //!_CLASS_GROUPBOX_H_ - diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index b64020ff8..a969a5baf 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -563,4 +563,3 @@ bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c) return true; } #endif - diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp index d59e18921..b0d01c6bf 100644 --- a/src/modules/objects/KvsObject_lineEdit.cpp +++ b/src/modules/objects/KvsObject_lineEdit.cpp @@ -532,7 +532,3 @@ void KvsObject_lineEdit::slottextChanged(const QString &text) KviKvsVariantList params(new KviKvsVariant(text)); callFunction(this,"textChangedEvent",¶ms); } - - - - diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp index bd187f226..5c5fa171c 100644 --- a/src/modules/objects/KvsObject_list.cpp +++ b/src/modules/objects/KvsObject_list.cpp @@ -339,4 +339,3 @@ KVSO_CLASS_FUNCTION(list,count) c->returnValue()->setInteger(m_pDataList->count()); return true; } - diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp index 6dba669c8..e630b2f53 100644 --- a/src/modules/objects/KvsObject_listWidget.cpp +++ b/src/modules/objects/KvsObject_listWidget.cpp @@ -673,5 +673,3 @@ void KvsObject_listWidget::slotItemChanged(QListWidgetItem *item) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item))); callFunction(this,"itemChangedEvent",0,¶ms); } - - diff --git a/src/modules/objects/KvsObject_mainWindow.cpp b/src/modules/objects/KvsObject_mainWindow.cpp index 8f9d62a45..1de990a9f 100644 --- a/src/modules/objects/KvsObject_mainWindow.cpp +++ b/src/modules/objects/KvsObject_mainWindow.cpp @@ -98,4 +98,3 @@ KVSO_CLASS_FUNCTION(mainWindow,setCentralWidget) ((KviTalMainWindow *)widget())->setCentralWidget(((QWidget *)(pObject->object()))); return true; } - diff --git a/src/modules/objects/KvsObject_mainWindow.h b/src/modules/objects/KvsObject_mainWindow.h index 11ad34645..f7dd41470 100644 --- a/src/modules/objects/KvsObject_mainWindow.h +++ b/src/modules/objects/KvsObject_mainWindow.h @@ -43,4 +43,3 @@ protected: #endif //!_CLASS_MAINWINDOW_H_ - diff --git a/src/modules/objects/KvsObject_memoryBuffer.cpp b/src/modules/objects/KvsObject_memoryBuffer.cpp index b960573f4..056c314ae 100644 --- a/src/modules/objects/KvsObject_memoryBuffer.cpp +++ b/src/modules/objects/KvsObject_memoryBuffer.cpp @@ -154,7 +154,3 @@ KVSO_CLASS_FUNCTION(memoryBuffer,saveToFile) } return true; } - - - - diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp index 5c026c661..1cd5963d1 100644 --- a/src/modules/objects/KvsObject_multiLineEdit.cpp +++ b/src/modules/objects/KvsObject_multiLineEdit.cpp @@ -783,5 +783,3 @@ bool KvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *) ((QTextEdit *)widget())->selectAll(); return true; } - - diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp index 72124d318..bedf4f109 100644 --- a/src/modules/objects/KvsObject_painter.cpp +++ b/src/modules/objects/KvsObject_painter.cpp @@ -2097,4 +2097,3 @@ void KvsObject_painter::setInternalPainter(QPainter *p) m_pPainter=p; bDonotdeleteinternalqpainter=true; } - diff --git a/src/modules/objects/KvsObject_painter.h b/src/modules/objects/KvsObject_painter.h index 33b131176..f63b5638e 100644 --- a/src/modules/objects/KvsObject_painter.h +++ b/src/modules/objects/KvsObject_painter.h @@ -129,6 +129,3 @@ private: KviKvsObject * m_pDeviceObject; }; #endif // !_CLASS_PAINTER_H_ - - - diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index 55bf48f40..5d0f468a2 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -706,5 +706,3 @@ void KvsObject_pixmap::frameChanged() KviKvsVariantList *params=0; callFunction(this,"frameChangedEvent",params); } - - diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp index 291b39a90..c884c35de 100644 --- a/src/modules/objects/KvsObject_popupMenu.cpp +++ b/src/modules/objects/KvsObject_popupMenu.cpp @@ -420,5 +420,3 @@ KVSO_CLASS_FUNCTION(popupMenu,activatedEvent) emitSignal("activated",c,c->params()); return true; } - - diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h index ad0fc37c7..385e57f75 100644 --- a/src/modules/objects/KvsObject_popupMenu.h +++ b/src/modules/objects/KvsObject_popupMenu.h @@ -61,4 +61,3 @@ protected slots: }; #endif // !_CLASS_POPUPMENU_H_ - diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp index 4fd235ee7..d16d9af86 100644 --- a/src/modules/objects/KvsObject_process.cpp +++ b/src/modules/objects/KvsObject_process.cpp @@ -316,5 +316,3 @@ void KvsObject_process::slotReadStderr() KviKvsVariantList *params=0; callFunction(this,"readyReadStderrEvent",params); } - - diff --git a/src/modules/objects/KvsObject_progressBar.cpp b/src/modules/objects/KvsObject_progressBar.cpp index 294bcc866..d86f598dc 100644 --- a/src/modules/objects/KvsObject_progressBar.cpp +++ b/src/modules/objects/KvsObject_progressBar.cpp @@ -146,5 +146,3 @@ KVSO_CLASS_FUNCTION(progressBar,percentageVisible) c->returnValue()->setBoolean(((QProgressBar *)widget())->isTextVisible()); return true; } - - diff --git a/src/modules/objects/KvsObject_progressBar.h b/src/modules/objects/KvsObject_progressBar.h index 9b27177e1..c50cf1a04 100644 --- a/src/modules/objects/KvsObject_progressBar.h +++ b/src/modules/objects/KvsObject_progressBar.h @@ -48,4 +48,3 @@ protected: #endif //!_CLASS_PROGRESSBAR_H_ - diff --git a/src/modules/objects/KvsObject_radioButton.cpp b/src/modules/objects/KvsObject_radioButton.cpp index 7d614fa96..fc09fd3b4 100644 --- a/src/modules/objects/KvsObject_radioButton.cpp +++ b/src/modules/objects/KvsObject_radioButton.cpp @@ -138,6 +138,3 @@ void KvsObject_radioButton::toggled(bool b) KviKvsVariantList params(new KviKvsVariant(b)); callFunction(this,"toggleEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_slider.cpp b/src/modules/objects/KvsObject_slider.cpp index 4737818a7..3cd3cbc30 100644 --- a/src/modules/objects/KvsObject_slider.cpp +++ b/src/modules/objects/KvsObject_slider.cpp @@ -293,6 +293,3 @@ void KvsObject_slider::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_slider.h b/src/modules/objects/KvsObject_slider.h index 7474d0db0..628eb1ae9 100644 --- a/src/modules/objects/KvsObject_slider.h +++ b/src/modules/objects/KvsObject_slider.h @@ -61,4 +61,3 @@ protected slots: #endif // !_CLASS_SLIDER_H_ - diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp index 98cb3d217..c1c0def2b 100644 --- a/src/modules/objects/KvsObject_socket.cpp +++ b/src/modules/objects/KvsObject_socket.cpp @@ -746,4 +746,3 @@ KVSO_CLASS_FUNCTION(socket,stateChangedEvent) emitSignal("stateChanged",c,c->params()); return true; } - diff --git a/src/modules/objects/KvsObject_spinBox.cpp b/src/modules/objects/KvsObject_spinBox.cpp index 4c64364dc..8603e524a 100644 --- a/src/modules/objects/KvsObject_spinBox.cpp +++ b/src/modules/objects/KvsObject_spinBox.cpp @@ -260,5 +260,3 @@ void KvsObject_spinBox::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - - diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp index d8e6dc851..225b5de2f 100644 --- a/src/modules/objects/KvsObject_sql.cpp +++ b/src/modules/objects/KvsObject_sql.cpp @@ -483,5 +483,3 @@ KVSO_CLASS_FUNCTION(sql,lastError) c->returnValue()->setString(szError); return true; } - - diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp index 860d34661..63e38ca05 100644 --- a/src/modules/objects/KvsObject_tabWidget.cpp +++ b/src/modules/objects/KvsObject_tabWidget.cpp @@ -473,4 +473,3 @@ void KvsObject_tabWidget::slotTabCloseRequest(int iIndex) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iIndex)); callFunction(this,"tabCloseRequestEvent",¶ms); } - diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp index 796d94694..c66c82cdd 100644 --- a/src/modules/objects/KvsObject_tableWidget.cpp +++ b/src/modules/objects/KvsObject_tableWidget.cpp @@ -891,6 +891,3 @@ QSize KviCellItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QM } return QItemDelegate::sizeHint(option,index); } - - - diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp index 640a3dc58..59092a124 100644 --- a/src/modules/objects/KvsObject_textBrowser.cpp +++ b/src/modules/objects/KvsObject_textBrowser.cpp @@ -148,5 +148,3 @@ KVSO_CLASS_FUNCTION(textBrowser,linkClickedEvent) emitSignal("linkClicked",c,c->params()); return true; } - - diff --git a/src/modules/objects/KvsObject_toolBar.cpp b/src/modules/objects/KvsObject_toolBar.cpp index 1b3367aa5..93c8424c1 100644 --- a/src/modules/objects/KvsObject_toolBar.cpp +++ b/src/modules/objects/KvsObject_toolBar.cpp @@ -111,6 +111,3 @@ KVSO_CLASS_FUNCTION(toolBar,clear) ((QToolBar *)object())->clear(); return true; } - - - diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp index eba314778..421a80278 100644 --- a/src/modules/objects/KvsObject_toolButton.cpp +++ b/src/modules/objects/KvsObject_toolButton.cpp @@ -339,5 +339,3 @@ void KvsObject_toolButton::slotClicked() KviKvsVariantList *params=0; callFunction(this,"clickEvent",params); } - - diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp index dfb8fc01b..fb32adbe3 100644 --- a/src/modules/objects/KvsObject_treeWidget.cpp +++ b/src/modules/objects/KvsObject_treeWidget.cpp @@ -654,4 +654,3 @@ void KviKvsTreeWidget::dropEvent(QDropEvent * e) } } } - diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp index 5c8e08b85..1ef7704ce 100644 --- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp +++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp @@ -427,4 +427,3 @@ KVSO_CLASS_FUNCTION(treeWidgetItem,setPixmap) m_pTreeWidgetItem->setIcon(uCol,QIcon(*pix)); return true; } - diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp index 875daddf6..cf52189a5 100644 --- a/src/modules/objects/KvsObject_vBox.cpp +++ b/src/modules/objects/KvsObject_vBox.cpp @@ -207,4 +207,3 @@ KVSO_CLASS_FUNCTION(vBox,setAlignment) if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; } - diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index 977850d61..9f1fbb6dc 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -2036,6 +2036,3 @@ KVSO_CLASS_FUNCTION(widget,grab) c->returnValue()->setHObject(pObject->handle()); return true; } - - - diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp index 2e8b7bd67..ea0b26ba4 100644 --- a/src/modules/objects/KvsObject_window.cpp +++ b/src/modules/objects/KvsObject_window.cpp @@ -171,5 +171,3 @@ KVSO_CLASS_FUNCTION(window,setCentralWidget) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KvsObject_widget *)ob,((KvsObject_widget *)ob)->widget()); return true; } - - diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp index 8cfe44a25..f8e69fadf 100644 --- a/src/modules/objects/KvsObject_wizard.cpp +++ b/src/modules/objects/KvsObject_wizard.cpp @@ -379,5 +379,3 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } - - diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp index f46559936..349802bd5 100644 --- a/src/modules/objects/KvsObject_workspace.cpp +++ b/src/modules/objects/KvsObject_workspace.cpp @@ -333,4 +333,3 @@ KVSO_CLASS_FUNCTION(workspace,setscrollBarsEnabled) } return true; } - diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp index 16d036669..43f297e8a 100644 --- a/src/modules/objects/KvsObject_wrapper.cpp +++ b/src/modules/objects/KvsObject_wrapper.cpp @@ -261,7 +261,7 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pContext->warning(__tr2qs_ctx("The '!Parent' specifier can't be used as first in the search path","objects")); return false; } - + int iLevels = 1; if(!szName.isEmpty()) { @@ -277,7 +277,7 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * while(iLevels > 0) { pWidget = pWidget->parentWidget(); - + if(!pWidget) { pContext->warning(__tr2qs_ctx("The '!Parent' specifier was applied to a widget that has no parent","objects")); @@ -340,7 +340,7 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString &szClass,con return w; } } - + return NULL; } diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp index f0f05528d..1111a18f7 100644 --- a/src/modules/objects/KvsObject_xmlreader.cpp +++ b/src/modules/objects/KvsObject_xmlreader.cpp @@ -369,5 +369,3 @@ KVSO_CLASS_FUNCTION(xmlReader,lastError) c->returnValue()->setString(m_szLastError); return true; } - - diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index b12ed3f3a..9fe7ae018 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -121,4 +121,3 @@ if (!__pObject)\ return true;\ } #endif - diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp index 5bffb3b4d..33b885580 100644 --- a/src/modules/objects/qthttp/qhttp.cpp +++ b/src/modules/objects/qthttp/qhttp.cpp @@ -2155,7 +2155,7 @@ int QHttp::setUser(const QString &userName, const QString &password) proxying, such as SOCKS5, use QNetworkProxy instead. \note setProxy() has to be called before setHost() for it to take effect. - If setProxy() is called after setHost(), then it will not apply until after + If setProxy() is called after setHost(), then it will not apply until after setHost() is called again. \sa QFtp::setProxy() @@ -2853,7 +2853,7 @@ void QHttpPrivate::_q_slotReadyRead() if (response.statusCode() == 100 && pendingPost) { // if we have pending POST, start sending data otherwise ignore post100ContinueTimer.stop(); - QMetaObject::invokeMethod(q, "_q_continuePost", Qt::QueuedConnection); + QMetaObject::invokeMethod(q, "_q_continuePost", Qt::QueuedConnection); return; } diff --git a/src/modules/objects/qthttp/qringbuffer_p.h b/src/modules/objects/qthttp/qringbuffer_p.h index 72a9f0ec2..ff762fab2 100644 --- a/src/modules/objects/qthttp/qringbuffer_p.h +++ b/src/modules/objects/qthttp/qringbuffer_p.h @@ -373,7 +373,7 @@ public: --tailBuffer; } bufferSize -= qba.length(); - return qba; + return qba; } // append a new buffer to the end diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index d6daf13a7..874cc5298 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -268,7 +268,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) } new QShortcut(Qt::Key_Escape,this,SLOT(close())); - + if(bModal) setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal); } diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp index d80939ba4..92c1b6ae4 100644 --- a/src/modules/options/OptionsInstanceManager.cpp +++ b/src/modules/options/OptionsInstanceManager.cpp @@ -3815,4 +3815,3 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha { return findInstanceEntry(pcName,m_pInstanceTree); } - diff --git a/src/modules/options/OptionsInstanceManager.h b/src/modules/options/OptionsInstanceManager.h index 2c9525ac0..813354c4b 100644 --- a/src/modules/options/OptionsInstanceManager.h +++ b/src/modules/options/OptionsInstanceManager.h @@ -83,4 +83,3 @@ protected slots: }; #endif //__OPTIONS_INSTANCES_H__ - diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp index 1a18aafb0..c352aaef7 100644 --- a/src/modules/options/OptionsWidget_antiSpam.cpp +++ b/src/modules/options/OptionsWidget_antiSpam.cpp @@ -59,5 +59,3 @@ void OptionsWidget_antispam::reenableStuff(bool) m_b3->setEnabled(m_b1->isChecked() || m_b2->isChecked()); m_sl->setEnabled(m_b1->isChecked() || m_b2->isChecked()); } - - diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp index 73b4b5faf..fdc1fd5fe 100644 --- a/src/modules/options/OptionsWidget_avatar.cpp +++ b/src/modules/options/OptionsWidget_avatar.cpp @@ -114,5 +114,3 @@ OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent) OptionsWidget_avatar::~OptionsWidget_avatar() { } - - diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp index 85e919a81..dffa40954 100644 --- a/src/modules/options/OptionsWidget_away.cpp +++ b/src/modules/options/OptionsWidget_away.cpp @@ -68,4 +68,3 @@ void OptionsWidget_away::enableAwayMessage(bool) { m_pAwayMessage->setEnabled(m_pEnableAwayMessage->isChecked()); } - diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index d6c492449..f4e57c8da 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -160,5 +160,3 @@ void OptionsWidget_channelAdvanced::commit() if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7; KviOptionsWidget::commit(); } - - diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp index 886c56f2f..1878981b3 100644 --- a/src/modules/options/OptionsWidget_connection.cpp +++ b/src/modules/options/OptionsWidget_connection.cpp @@ -304,4 +304,3 @@ OptionsWidget_connectionAdvanced::OptionsWidget_connectionAdvanced(QWidget * par OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced() { } - diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp index c452f8f2d..2a0c85034 100644 --- a/src/modules/options/OptionsWidget_ctcp.cpp +++ b/src/modules/options/OptionsWidget_ctcp.cpp @@ -80,5 +80,3 @@ OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent) OptionsWidget_ctcp::~OptionsWidget_ctcp() { } - - diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp index ec87dae40..b3a0fe166 100644 --- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp +++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp @@ -111,5 +111,3 @@ OptionsWidget_ctcpFloodProtection::OptionsWidget_ctcpFloodProtection(QWidget * p OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection() { } - - diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp index a626e649c..d91a3ed83 100644 --- a/src/modules/options/OptionsWidget_dcc.cpp +++ b/src/modules/options/OptionsWidget_dcc.cpp @@ -366,4 +366,3 @@ OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget *p):KviOptionsWidget(p) OptionsWidget_dccVoice::~OptionsWidget_dccVoice() { } - diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp index 1d66c3582..31b828982 100644 --- a/src/modules/options/OptionsWidget_general.cpp +++ b/src/modules/options/OptionsWidget_general.cpp @@ -47,5 +47,3 @@ OptionsWidget_general::OptionsWidget_general(QWidget * parent) OptionsWidget_general::~OptionsWidget_general() { } - - diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index e54bb9204..9d91dddbd 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -1009,5 +1009,3 @@ void IdentityProfileEditor::toggleButton(const QString & szText) m_pBtnOk->setEnabled(bEnabled); } - - diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp index 1381acba8..cdde0cfa6 100644 --- a/src/modules/options/OptionsWidget_ignore.cpp +++ b/src/modules/options/OptionsWidget_ignore.cpp @@ -58,6 +58,3 @@ void OptionsWidget_ignore::enableVerbose(bool) { m_pVerboseIgnore->setEnabled(m_pIgnorePrivmsg->isChecked() || m_pIgnoreNotice->isChecked()); } - - - diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp index 6f76baa28..bd1ab85fc 100644 --- a/src/modules/options/OptionsWidget_input.cpp +++ b/src/modules/options/OptionsWidget_input.cpp @@ -166,4 +166,3 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent) OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures() { } - diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp index 5b693b2dc..2005c91b0 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp +++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp @@ -85,4 +85,3 @@ void OptionsWidget_interfaceFeatures::commit() } } - diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp index e02fe5242..ce56d4567 100644 --- a/src/modules/options/OptionsWidget_irc.cpp +++ b/src/modules/options/OptionsWidget_irc.cpp @@ -82,5 +82,3 @@ OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent) OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced() { } - - diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp index 28b62ca18..a1720a5ad 100644 --- a/src/modules/options/OptionsWidget_ircOutput.cpp +++ b/src/modules/options/OptionsWidget_ircOutput.cpp @@ -105,4 +105,3 @@ void OptionsWidget_ircOutput::commit() 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 46137ce5f..57657d08f 100644 --- a/src/modules/options/OptionsWidget_ircView.cpp +++ b/src/modules/options/OptionsWidget_ircView.cpp @@ -215,4 +215,3 @@ void OptionsWidget_ircViewMarker::commit() KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle)=m_pMarkerStyle->currentIndex(); KviOptionsWidget::commit(); } - diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp index 79d4088c0..708856511 100644 --- a/src/modules/options/OptionsWidget_lag.cpp +++ b/src/modules/options/OptionsWidget_lag.cpp @@ -73,5 +73,3 @@ OptionsWidget_lag::OptionsWidget_lag(QWidget * parent) OptionsWidget_lag::~OptionsWidget_lag() { } - - diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp index f529d1789..9c921159a 100644 --- a/src/modules/options/OptionsWidget_logging.cpp +++ b/src/modules/options/OptionsWidget_logging.cpp @@ -69,6 +69,3 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent) OptionsWidget_logging::~OptionsWidget_logging() { } - - - diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp index 7c85b21e5..4d3dd236e 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.cpp +++ b/src/modules/options/OptionsWidget_mediaTypes.cpp @@ -259,4 +259,3 @@ void OptionsWidget_mediaTypes::commit() } g_pMediaManager->unlock(); } - diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index 26616f78a..016e44d16 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -188,9 +188,9 @@ OptionsWidget_standardColors::OptionsWidget_standardColors(QWidget * parent) addRowSpacer(0,5,3,5); layout()->setRowStretch(5,1); - + QPushButton * pReset = addPushButton(3,6,3,6,__tr2qs_ctx("Reset to Default","options")); - + QObject::connect(pReset,SIGNAL(clicked()),this,SLOT(resetToDefaults())); } @@ -678,4 +678,3 @@ void OptionsWidget_messageColors::load() } } } - diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp index 2bf86a92e..934610763 100644 --- a/src/modules/options/OptionsWidget_nickserv.cpp +++ b/src/modules/options/OptionsWidget_nickserv.cpp @@ -365,4 +365,3 @@ void OptionsWidget_nickServ::commit() } KviOptionsWidget::commit(); } - diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index 280f2e774..701b4090d 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -272,4 +272,3 @@ void OptionsWidget_notifier::toggleNotifierProtocol(bool) #endif } #endif // COMPILE_KDE_SUPPORT - diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp index 1387514c3..8105aaa16 100644 --- a/src/modules/options/OptionsWidget_notify.cpp +++ b/src/modules/options/OptionsWidget_notify.cpp @@ -101,4 +101,3 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent) OptionsWidget_notify::~OptionsWidget_notify() { } - diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp index 4ba10d389..f0878bf69 100644 --- a/src/modules/options/OptionsWidget_protection.cpp +++ b/src/modules/options/OptionsWidget_protection.cpp @@ -41,4 +41,3 @@ OptionsWidget_protection::OptionsWidget_protection(QWidget * parent) OptionsWidget_protection::~OptionsWidget_protection() { } - diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index 9e26501d8..e71444f87 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -359,4 +359,3 @@ void OptionsWidget_proxy::removeCurrent() } } } - diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp index ddfdd227b..dbbe45443 100644 --- a/src/modules/options/OptionsWidget_query.cpp +++ b/src/modules/options/OptionsWidget_query.cpp @@ -114,6 +114,3 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent) OptionsWidget_query::~OptionsWidget_query() { } - - - diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index dce69552a..bc384d83a 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -2111,4 +2111,3 @@ void OptionsWidget_servers::detailsClicked() m_pNetworkDetailsDialog = 0; } } - diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index 6329dd871..0530ebff1 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -352,4 +352,3 @@ OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent) OptionsWidget_sounds::~OptionsWidget_sounds() { } - diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index e6f8f7ab2..351541cef 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -176,7 +176,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) itemDesc->setFlags(itemDesc->flags() & ~Qt::ItemIsEditable); m_pSpellCheckerDictionaries->setItem(row,1,itemDesc); } - + m_pSpellCheckerDictionaries->resizeColumnsToContents(); m_pSpellCheckerDictionaries->resizeRowsToContents(); } @@ -236,4 +236,3 @@ void OptionsWidget_textEncoding::commit() KviKvsScript::run("spellchecker.reloadDictionaries", NULL); #endif } - diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index 897d6b62a..1b811adc8 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -311,4 +311,3 @@ void OptionsWidget_textIcons::commit() } } } - diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp index 669d6e744..2126a5a20 100644 --- a/src/modules/options/OptionsWidget_theme.cpp +++ b/src/modules/options/OptionsWidget_theme.cpp @@ -180,5 +180,3 @@ OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * p OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets() { } - - diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp index b9b2588fe..3d43567a5 100644 --- a/src/modules/options/OptionsWidget_tools.cpp +++ b/src/modules/options/OptionsWidget_tools.cpp @@ -46,4 +46,3 @@ OptionsWidget_tools::OptionsWidget_tools(QWidget * parent) OptionsWidget_tools::~OptionsWidget_tools() { } - diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp index bc0f4d522..8f4d20f44 100644 --- a/src/modules/options/OptionsWidget_topicLabel.cpp +++ b/src/modules/options/OptionsWidget_topicLabel.cpp @@ -44,4 +44,3 @@ OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget *p):KviOptionsWidget( OptionsWidget_topicLabel::~OptionsWidget_topicLabel() { } - diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp index 052663742..a24d4fee6 100644 --- a/src/modules/options/OptionsWidget_tray.cpp +++ b/src/modules/options/OptionsWidget_tray.cpp @@ -105,5 +105,3 @@ void OptionsWidget_tray::setEnabled(bool) g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_HIDE); } } - - diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp index 4a15fc9ff..2a8653ff3 100644 --- a/src/modules/options/OptionsWidget_uparser.cpp +++ b/src/modules/options/OptionsWidget_uparser.cpp @@ -66,5 +66,3 @@ OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent) OptionsWidget_uparser::~OptionsWidget_uparser() { } - - diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp index 0bdd1b329..db72d5679 100644 --- a/src/modules/options/OptionsWidget_userList.cpp +++ b/src/modules/options/OptionsWidget_userList.cpp @@ -249,5 +249,3 @@ OptionsWidget_userListFeatures::OptionsWidget_userListFeatures(QWidget * parent) OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures() { } - - diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp index be0a1eadd..0efe13688 100644 --- a/src/modules/options/OptionsWidget_windowList.cpp +++ b/src/modules/options/OptionsWidget_windowList.cpp @@ -264,4 +264,3 @@ OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * paren OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic() { } - diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 2327f496e..4220eadc6 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -305,7 +305,7 @@ static bool options_kvs_cmd_close(KviKvsModuleCommandCall * c) d->close(); return true; } - + OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szGroup.toUtf8().data()); if(!e) return true; @@ -318,7 +318,7 @@ static bool options_kvs_cmd_close(KviKvsModuleCommandCall * c) return true; // hm? w->deleteLater(); - + return true; } diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index 9a89dafc9..19bab5f81 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -468,4 +468,3 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha EOF ################################################################################# - diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp index 046fed65a..e6d7feda3 100644 --- a/src/modules/package/libkvipackage.cpp +++ b/src/modules/package/libkvipackage.cpp @@ -88,7 +88,7 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) KviKvsHash * pHash = new KviKvsHash(); - + c->returnValue()->setHash(pHash); // Create a random extraction dir @@ -118,17 +118,17 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c) } KviKvsHash * pInfoHash = new KviKvsHash(); - + pHash->set("info",new KviKvsVariant(pInfoHash)); - + QFileInfo inf(szPath); - + pInfoHash->set("path",new KviKvsVariant(szPath)); pInfoHash->set("name",new KviKvsVariant(inf.fileName())); pInfoHash->set("size",new KviKvsVariant((kvs_int_t)inf.size())); KviKvsHash * pMetadataHash = new KviKvsHash(); - + pHash->set("metadata",new KviKvsVariant(pMetadataHash)); KviPointerHashTable<QString,QString> * pInfoFields1 = r.stringInfoFields(); @@ -143,7 +143,7 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c) KviPointerHashTable<QString,QByteArray> * pInfoFields2 = r.binaryInfoFields(); KviPointerHashTableIterator<QString,QByteArray> it2(*pInfoFields2); - + while(it2.current()) { pMetadataHash->set(it2.currentKey(),new KviKvsVariant(QString("<binary data, %1 bytes>").arg(it2.current()->size()))); @@ -151,7 +151,7 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c) } KviKvsArray * pFilesArray = new KviKvsArray(); - + pHash->set("files",new KviKvsVariant(pFilesArray)); QStringList sl = KviFileUtils::getFileListing(szUnpackPath); diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index 717a71cf2..30a785aac 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -791,4 +791,3 @@ void RegisteredUserEntryDialog::editAllPropertiesClicked() } } - diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index 0b56f9234..627e8d598 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -929,5 +929,3 @@ succesfull_import: f.close(); fillList(); } - - diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp index 2b4cd55a8..9eeec84f5 100644 --- a/src/modules/reguser/RegistrationWizard.cpp +++ b/src/modules/reguser/RegistrationWizard.cpp @@ -467,4 +467,3 @@ void RegistrationWizard::notifyCheckToggled(bool) QString dummy; notifyNickChanged(dummy); } - diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp index 0a335ab60..bf031bd73 100644 --- a/src/modules/rijndael/BlowFish.cpp +++ b/src/modules/rijndael/BlowFish.cpp @@ -380,7 +380,7 @@ BlowFish::BlowFish(unsigned char* ucKey, unsigned int keysize, const SBlock& roC for(j=0; j<4; j++) for(int k=0; k<256; ) Encrypt(block), m_auiS[j][k++] = block.m_uil, m_auiS[j][k++] = block.m_uir; - + delete [] aucLocalKey; } diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index 03001c5e2..198411a03 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -1125,4 +1125,3 @@ void SetupWizard::accept() #endif KviTalWizard::accept(); } - diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index ad1365f81..9dcda3a53 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -730,5 +730,3 @@ void SharedFilesWindow::die() // m_pIrcView->setTimestamp(p->timestamp); // m_pIrcView->setShowImages(p->imagesVisible); //} - - diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index ab170402e..314251e78 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -864,4 +864,3 @@ KVIRC_MODULE( snd_module_cleanup, 0 ) - diff --git a/src/modules/socketspy/SocketSpyWindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp index 3d8ac8bd9..75d509b34 100644 --- a/src/modules/socketspy/SocketSpyWindow.cpp +++ b/src/modules/socketspy/SocketSpyWindow.cpp @@ -108,4 +108,3 @@ void SocketSpyWindow::applyOptions() m_pIrcView->applyOptions(); KviWindow::applyOptions(); } - diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp index ed2f6944d..065324ae4 100644 --- a/src/modules/spaste/SlowPasteController.cpp +++ b/src/modules/spaste/SlowPasteController.cpp @@ -133,4 +133,3 @@ void SlowPasteController::pasteClipboard(void) m_pWindow->ownMessage(line); } } - diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index 32691a4d1..4394c0913 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -465,4 +465,3 @@ bool PackThemeDialog::packTheme() return true; } - diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp index 4b4af497c..19e3ede75 100644 --- a/src/modules/theme/SaveThemeDialog.cpp +++ b/src/modules/theme/SaveThemeDialog.cpp @@ -163,7 +163,7 @@ SaveThemeDialog::SaveThemeDialog(QWidget * pParent) ozText += __tr2qs_ctx("Hit the <b>\"Next\"</b> button to continue.","theme"); ozText += "<p>"; - pLayout->addWidget(m_pSaveIconsCheckBox,0,0); + pLayout->addWidget(m_pSaveIconsCheckBox,0,0); pLabel->setText(ozText); pLayout->addWidget(pLabel,1,0); pLayout->setRowStretch(2,1); @@ -323,4 +323,3 @@ bool SaveThemeDialog::saveTheme() return true; } - diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index e0542534e..c1e464049 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -381,7 +381,7 @@ namespace ThemeFunctions g_pMainWindow->showNormal(); return bResult; } - + bool packageThemes( const QString &szPackagePath, @@ -416,15 +416,15 @@ namespace ThemeFunctions szError = __tr2qs_ctx("Failed to load the selected image: please fix it","theme"); return false; } - + if((pix.width() > 300) || (pix.height() > 225)) out = out.fromImage(pix.scaled(300,225,Qt::KeepAspectRatio)); else out=out.fromImage(pix); } - + KviPackageWriter f; - + f.addInfoField("PackageType","ThemePack"); f.addInfoField("ThemePackVersion",KVI_CURRENT_THEME_ENGINE_VERSION); f.addInfoField("Name",szPackageName); @@ -435,7 +435,7 @@ namespace ThemeFunctions // to ensure qt4 will use the default() locale and not the system() one f.addInfoField("Date",QDateTime::currentDateTime().toString(Qt::ISODate)); f.addInfoField("Application","KVIrc " KVI_VERSION "." KVI_SOURCES_DATE); - + if(!out.isNull()) { QByteArray * pba = new QByteArray(); @@ -445,12 +445,12 @@ namespace ThemeFunctions buffer.close(); f.addInfoField("Image",pba); // cool :) [no disk access needed] } - + QString szTmp; - + szTmp.setNum(lThemeInfoList.count()); f.addInfoField("ThemeCount",szTmp); - + int iIdx = 0; for(KviThemeInfo * pInfo = lThemeInfoList.first();pInfo;pInfo = lThemeInfoList.next()) { @@ -464,10 +464,10 @@ namespace ThemeFunctions szError = __tr2qs_ctx("Invalid theme version","theme"); return false; } - + QString szSubdir = pInfo->name() + QString("-") + pInfo->version(); szSubdir.replace(QRegExp("[^a-zA-Z0-9_\\-.][^a-zA-Z0-9_\\-.]*"),"_"); - + szTmp = QString("Theme%1Name").arg(iIdx); f.addInfoField(szTmp,pInfo->name()); szTmp = QString("Theme%1Version").arg(iIdx); @@ -489,7 +489,7 @@ namespace ThemeFunctions { szTmp = QString("Theme%1Screenshot").arg(iIdx); QByteArray * pba = new QByteArray(); - + QBuffer bufferz(pba,0); bufferz.open(QIODevice::WriteOnly); pixScreenshot.save(&bufferz,"PNG"); @@ -504,10 +504,10 @@ namespace ThemeFunctions szError += f.lastError(); return false; } - + iIdx++; } - + if(!f.pack(szPackagePath)) { szError = __tr2qs_ctx("Packaging failed","theme"); @@ -515,8 +515,7 @@ namespace ThemeFunctions szError += f.lastError(); return false; } - + return true; } } - diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index a20c2f7fd..434c9b69d 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -468,7 +468,7 @@ void ThemeManagementDialog::fillThemeBox(bool bBuiltin) for(int i=0;i<slThemes.count();i++) { //qDebug("Installed theme %s builtin %d",slThemes.at(i).toUtf8().data(),bBuiltin); - + KviThemeInfo * inf = new KviThemeInfo(); if(inf->load(slThemes.at(i),bBuiltin ? KviThemeInfo::Builtin : KviThemeInfo::User)) { @@ -556,4 +556,3 @@ void ThemeManagementDialog::tipRequest(QListWidgetItem *,const QPoint &) // pTip->tip(m_pListWidget->visualItemRect(it),szThemeDescription); */ } - diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp index ceb4e9ca0..eb0d1dbed 100644 --- a/src/modules/theme/WebThemeInterfaceDialog.cpp +++ b/src/modules/theme/WebThemeInterfaceDialog.cpp @@ -76,4 +76,3 @@ bool WebThemeInterfaceDialog::packageIsInstalled(const QString &szId,const QStri #endif //COMPILE_WEBKIT_SUPPORT - diff --git a/src/modules/theme/WebThemeInterfaceDialog.h b/src/modules/theme/WebThemeInterfaceDialog.h index dac3efc74..e8e9a1533 100644 --- a/src/modules/theme/WebThemeInterfaceDialog.h +++ b/src/modules/theme/WebThemeInterfaceDialog.h @@ -53,4 +53,3 @@ protected: #endif //_WEBTHEMEINTERFACEDIALOG_H_ - diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp index 46b8d671c..bf26f9116 100644 --- a/src/modules/theme/libkvitheme.cpp +++ b/src/modules/theme/libkvitheme.cpp @@ -307,7 +307,7 @@ static bool theme_kvs_cmd_pack(KviKvsModuleCommandCall * c) kvs_uint_t s = pArray->size(); QStringList lThemeList; - + for(kvs_uint_t i=0;i<s;i++) { KviKvsVariant * v = pArray->at(i); diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 0f02ac47a..0009f2379 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -287,4 +287,3 @@ KVIRC_MODULE( tip_module_cleanup, 0 ) - diff --git a/src/modules/torrent/StatusBarApplet.cpp b/src/modules/torrent/StatusBarApplet.cpp index 5cc64335d..0735371a9 100644 --- a/src/modules/torrent/StatusBarApplet.cpp +++ b/src/modules/torrent/StatusBarApplet.cpp @@ -92,5 +92,3 @@ void StatusBarApplet::update() setText(__tr2qs_ctx("No client selected!", "torrent")); } } - - diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 098a26d77..20b0404dc 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -751,5 +751,3 @@ KVIRC_MODULE( trayicon_module_cleanup, 0 ) - - diff --git a/src/modules/upnp/XmlFunctions.cpp b/src/modules/upnp/XmlFunctions.cpp index 59d79e3fc..bea839ba7 100644 --- a/src/modules/upnp/XmlFunctions.cpp +++ b/src/modules/upnp/XmlFunctions.cpp @@ -124,4 +124,3 @@ QString XmlFunctions::getSource( const QDomNode &node, int indent ) node.save( textStream, indent ); return source; } - diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index c6dbf981b..d036f3947 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -938,4 +938,3 @@ KVIRC_MODULE( url_module_cleanup, 0 ) - |