From e227679b0af3687acf9292953edbb0ebeab19df9 Mon Sep 17 00:00:00 2001 From: Matt Ullman Date: Sun, 18 Oct 2015 05:16:18 -0400 Subject: 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 --- src/modules/about/AboutDialog.cpp | 2 -- src/modules/addon/AddonFunctions.cpp | 34 +++++++++++----------- src/modules/addon/PackAddonDialog.cpp | 1 - src/modules/addon/WebAddonInterfaceDialog.cpp | 1 - src/modules/dcc/CMakeLists.txt | 1 - src/modules/dcc/DccFileTransfer.cpp | 8 ++--- src/modules/dialog/libkvidialog.cpp | 1 - src/modules/file/libkvifile.cpp | 1 - src/modules/help/HelpWidget.cpp | 1 - src/modules/help/HelpWindow.cpp | 2 -- src/modules/ident/libkviident.cpp | 1 - src/modules/iograph/libkviiograph.cpp | 1 - src/modules/iograph/libkviiograph.h | 1 - src/modules/language/detector/build_detector.pl | 1 - src/modules/list/ListWindow.cpp | 1 - src/modules/logview/CMakeLists.txt | 1 - src/modules/logview/LogViewWidget.cpp | 1 - src/modules/logview/LogViewWindow.cpp | 2 -- src/modules/mediaplayer/MpAmipInterface.cpp | 2 +- src/modules/mediaplayer/MpMp3.h | 1 - src/modules/mircimport/libkvimircimport.cpp | 1 - src/modules/my/Idle.cpp | 1 - src/modules/objects/CMakeLists.txt | 3 +- src/modules/objects/KvsObject_buttonGroup.h | 1 - src/modules/objects/KvsObject_checkBox.cpp | 3 -- src/modules/objects/KvsObject_colorDialog.cpp | 3 -- src/modules/objects/KvsObject_comboBox.cpp | 3 -- src/modules/objects/KvsObject_dateTimeEdit.cpp | 2 -- src/modules/objects/KvsObject_dialog.cpp | 2 -- src/modules/objects/KvsObject_dialog.h | 1 - src/modules/objects/KvsObject_dockWindow.cpp | 2 -- src/modules/objects/KvsObject_ftp.cpp | 2 -- src/modules/objects/KvsObject_groupBox.h | 1 - src/modules/objects/KvsObject_http.cpp | 1 - src/modules/objects/KvsObject_lineEdit.cpp | 4 --- src/modules/objects/KvsObject_list.cpp | 1 - src/modules/objects/KvsObject_listWidget.cpp | 2 -- src/modules/objects/KvsObject_mainWindow.cpp | 1 - src/modules/objects/KvsObject_mainWindow.h | 1 - src/modules/objects/KvsObject_memoryBuffer.cpp | 4 --- src/modules/objects/KvsObject_multiLineEdit.cpp | 2 -- src/modules/objects/KvsObject_painter.cpp | 1 - src/modules/objects/KvsObject_painter.h | 3 -- src/modules/objects/KvsObject_pixmap.cpp | 2 -- src/modules/objects/KvsObject_popupMenu.cpp | 2 -- src/modules/objects/KvsObject_popupMenu.h | 1 - src/modules/objects/KvsObject_process.cpp | 2 -- src/modules/objects/KvsObject_progressBar.cpp | 2 -- src/modules/objects/KvsObject_progressBar.h | 1 - src/modules/objects/KvsObject_radioButton.cpp | 3 -- src/modules/objects/KvsObject_slider.cpp | 3 -- src/modules/objects/KvsObject_slider.h | 1 - src/modules/objects/KvsObject_socket.cpp | 1 - src/modules/objects/KvsObject_spinBox.cpp | 2 -- src/modules/objects/KvsObject_sql.cpp | 2 -- src/modules/objects/KvsObject_tabWidget.cpp | 1 - src/modules/objects/KvsObject_tableWidget.cpp | 3 -- src/modules/objects/KvsObject_textBrowser.cpp | 2 -- src/modules/objects/KvsObject_toolBar.cpp | 3 -- src/modules/objects/KvsObject_toolButton.cpp | 2 -- src/modules/objects/KvsObject_treeWidget.cpp | 1 - src/modules/objects/KvsObject_treeWidgeteItem.cpp | 1 - src/modules/objects/KvsObject_vBox.cpp | 1 - src/modules/objects/KvsObject_widget.cpp | 3 -- src/modules/objects/KvsObject_window.cpp | 2 -- src/modules/objects/KvsObject_wizard.cpp | 2 -- src/modules/objects/KvsObject_workspace.cpp | 1 - src/modules/objects/KvsObject_wrapper.cpp | 6 ++-- src/modules/objects/KvsObject_xmlreader.cpp | 2 -- src/modules/objects/object_macros.h | 1 - src/modules/objects/qthttp/qhttp.cpp | 4 +-- src/modules/objects/qthttp/qringbuffer_p.h | 2 +- src/modules/options/OptionsDialog.cpp | 2 +- src/modules/options/OptionsInstanceManager.cpp | 1 - src/modules/options/OptionsInstanceManager.h | 1 - src/modules/options/OptionsWidget_antiSpam.cpp | 2 -- src/modules/options/OptionsWidget_avatar.cpp | 2 -- src/modules/options/OptionsWidget_away.cpp | 1 - src/modules/options/OptionsWidget_channel.cpp | 2 -- src/modules/options/OptionsWidget_connection.cpp | 1 - src/modules/options/OptionsWidget_ctcp.cpp | 2 -- .../options/OptionsWidget_ctcpFloodProtection.cpp | 2 -- src/modules/options/OptionsWidget_dcc.cpp | 1 - src/modules/options/OptionsWidget_general.cpp | 2 -- src/modules/options/OptionsWidget_identity.cpp | 2 -- src/modules/options/OptionsWidget_ignore.cpp | 3 -- src/modules/options/OptionsWidget_input.cpp | 1 - .../options/OptionsWidget_interfaceFeatures.cpp | 1 - src/modules/options/OptionsWidget_irc.cpp | 2 -- src/modules/options/OptionsWidget_ircOutput.cpp | 1 - src/modules/options/OptionsWidget_ircView.cpp | 1 - src/modules/options/OptionsWidget_lag.cpp | 2 -- src/modules/options/OptionsWidget_logging.cpp | 3 -- src/modules/options/OptionsWidget_mediaTypes.cpp | 1 - src/modules/options/OptionsWidget_message.cpp | 5 ++-- src/modules/options/OptionsWidget_nickserv.cpp | 1 - src/modules/options/OptionsWidget_notifier.cpp | 1 - src/modules/options/OptionsWidget_notify.cpp | 1 - src/modules/options/OptionsWidget_protection.cpp | 1 - src/modules/options/OptionsWidget_proxy.cpp | 1 - src/modules/options/OptionsWidget_query.cpp | 3 -- src/modules/options/OptionsWidget_servers.cpp | 1 - src/modules/options/OptionsWidget_sound.cpp | 1 - src/modules/options/OptionsWidget_textEncoding.cpp | 3 +- src/modules/options/OptionsWidget_textIcons.cpp | 1 - src/modules/options/OptionsWidget_theme.cpp | 2 -- src/modules/options/OptionsWidget_tools.cpp | 1 - src/modules/options/OptionsWidget_topicLabel.cpp | 1 - src/modules/options/OptionsWidget_tray.cpp | 2 -- src/modules/options/OptionsWidget_uparser.cpp | 2 -- src/modules/options/OptionsWidget_userList.cpp | 2 -- src/modules/options/OptionsWidget_windowList.cpp | 1 - src/modules/options/libkvioptions.cpp | 4 +-- src/modules/options/mkcreateinstanceproc.sh | 1 - src/modules/package/libkvipackage.cpp | 14 ++++----- src/modules/reguser/RegisteredUserEntryDialog.cpp | 1 - src/modules/reguser/RegisteredUsersDialog.cpp | 2 -- src/modules/reguser/RegistrationWizard.cpp | 1 - src/modules/rijndael/BlowFish.cpp | 2 +- src/modules/setup/SetupWizard.cpp | 1 - .../sharedfileswindow/SharedFilesWindow.cpp | 2 -- src/modules/snd/libkvisnd.cpp | 1 - src/modules/socketspy/SocketSpyWindow.cpp | 1 - src/modules/spaste/SlowPasteController.cpp | 1 - src/modules/theme/PackThemeDialog.cpp | 1 - src/modules/theme/SaveThemeDialog.cpp | 3 +- src/modules/theme/ThemeFunctions.cpp | 29 +++++++++--------- src/modules/theme/ThemeManagementDialog.cpp | 3 +- src/modules/theme/WebThemeInterfaceDialog.cpp | 1 - src/modules/theme/WebThemeInterfaceDialog.h | 1 - src/modules/theme/libkvitheme.cpp | 2 +- src/modules/tip/libkvitip.cpp | 1 - src/modules/torrent/StatusBarApplet.cpp | 2 -- src/modules/trayicon/libkvitrayicon.cpp | 2 -- src/modules/upnp/XmlFunctions.cpp | 1 - src/modules/url/libkviurl.cpp | 1 - 136 files changed, 60 insertions(+), 252 deletions(-) (limited to 'src/modules') 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 * pInfoFields1 = r.stringInfoFields(); @@ -143,7 +143,7 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c) KviPointerHashTable * pInfoFields2 = r.binaryInfoFields(); KviPointerHashTableIterator it2(*pInfoFields2); - + while(it2.current()) { pMetadataHash->set(it2.currentKey(),new KviKvsVariant(QString("").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 \"Next\" button to continue.","theme"); ozText += "

"; - 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;iload(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;iat(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 ) - -- cgit v1.3.1-10-gc9f91