diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/filetransferwindow/filetransferwindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/notifier/notifierwindowtab.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/modules/objects/class_combobox.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_ftp.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 2 | ||||
| -rw-r--r-- | src/modules/perlcore/libkviperlcore.cpp | 8 |
7 files changed, 15 insertions, 14 deletions
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 753053f1a..9b159b375 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -355,7 +355,7 @@ KviFileTransferItem * KviFileTransferWindow::findItem(KviFileTransfer * t) void KviFileTransferWindow::transferRegistered(KviFileTransfer * t) { - KviFileTransferItem * it = new KviFileTransferItem(m_pTableWidget,t); + new KviFileTransferItem(m_pTableWidget,t); //t->setDisplayItem(it); } diff --git a/src/modules/notifier/notifierwindowtab.cpp b/src/modules/notifier/notifierwindowtab.cpp index ce92d49cd..d2727f88a 100644 --- a/src/modules/notifier/notifierwindowtab.cpp +++ b/src/modules/notifier/notifierwindowtab.cpp @@ -123,7 +123,7 @@ void KviNotifierWindowTab::mouseDoubleClickEvent(QMouseEvent *) { m_pWnd->frame()->raise(); m_pWnd->frame()->setFocus(); - m_pWnd->frame()->setWindowState(m_pWnd->frame()->windowState() & ~Qt::WindowMinimized | Qt::WindowActive); + m_pWnd->frame()->setWindowState((m_pWnd->frame()->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); if(!m_pWnd->frame()->isVisible()) m_pWnd->frame()->show(); } diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index 9c251d71f..65c8b466b 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -11,7 +11,7 @@ SET(kviobjects_MOC_HDRS class_button.h class_checkbox.h class_combobox.h - class_datetimeedit.h + class_datetimeedit.h class_dockwindow.h class_ftp.h class_http.h @@ -27,14 +27,13 @@ SET(kviobjects_MOC_HDRS class_socket.h class_spinbox.h class_tabwidget.h - class_tablewidget.h + class_tablewidget.h class_tbrowser.h class_toolbutton.h class_treewidget.h class_widget.h class_window.h class_wizard.h - class_sql.h ) SET(kviobjects_SRCS @@ -43,7 +42,7 @@ SET(kviobjects_SRCS class_buttongroup.cpp class_checkbox.cpp class_combobox.cpp - class_datetimeedit.cpp + class_datetimeedit.cpp class_dialog.cpp class_dockwindow.cpp class_file.cpp @@ -71,7 +70,7 @@ SET(kviobjects_SRCS class_socket.cpp class_spinbox.cpp class_tabwidget.cpp - class_tablewidget.cpp + class_tablewidget.cpp class_tbrowser.cpp class_toolbar.cpp class_toolbutton.cpp @@ -84,7 +83,7 @@ SET(kviobjects_SRCS class_workspace.cpp class_wrapper.cpp class_xmlreader.cpp - class_sql.cpp + class_sql.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 558002711..60d88d032 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -303,6 +303,8 @@ KVSO_CLASS_FUNCTION(combobox,setCurrentItem) } KVSO_CLASS_FUNCTION(combobox,popup) { + Q_UNUSED(c); + if(widget()) ((QComboBox *)widget())->showPopup(); return true; diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index 2e17c7aed..db9e93b76 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -243,7 +243,7 @@ void KviKvsObject_ftp::slotReadyRead () { } -void KviKvsObject_ftp::slotRawCommandReply (int replyCode, const QString & detail) +void KviKvsObject_ftp::slotRawCommandReply (int , const QString & ) { } diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index ff3cfeb3d..bd534bbe2 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -461,7 +461,7 @@ static bool objects_kvs_fnc_classAllHandlers(KviKvsModuleFunctionCall * c) KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(* pClass->getHandlers()); KviKvsHash* pHash = new KviKvsHash(); c->returnValue()->setHash(pHash); - while(KviKvsObjectFunctionHandler * t = it.current()) + while(it.current()) { QString szCode; KviKvsObjectFunctionHandler *handler=pClass->lookupFunctionHandler(it.currentKey()); diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index 98bdecb86..2c286b255 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -346,7 +346,7 @@ static void perlcore_destroy_all_interpreters() #endif // COMPILE_PERL_SUPPORT -static bool perlcore_module_ctrl(KviModule * m,const char * cmd,void * param) +static bool perlcore_module_ctrl(KviModule *,const char * cmd,void * param) { #ifdef COMPILE_PERL_SUPPORT if(kvi_strEqualCS(cmd,KVI_PERLCORECTRLCOMMAND_EXECUTE)) @@ -383,7 +383,7 @@ static bool perlcore_module_ctrl(KviModule * m,const char * cmd,void * param) return false; } -static bool perlcore_module_init(KviModule * m) +static bool perlcore_module_init(KviModule *) { #ifdef COMPILE_PERL_SUPPORT g_pInterpreters = new KviPointerHashTable<QString,KviPerlInterpreter>(17,false); @@ -398,7 +398,7 @@ static bool perlcore_module_init(KviModule * m) #endif // !COMPILE_PERL_SUPPORT } -static bool perlcore_module_cleanup(KviModule * m) +static bool perlcore_module_cleanup(KviModule *) { #ifdef COMPILE_PERL_SUPPORT perlcore_destroy_all_interpreters(); @@ -409,7 +409,7 @@ static bool perlcore_module_cleanup(KviModule * m) return true; } -static bool perlcore_module_can_unload(KviModule * m) +static bool perlcore_module_can_unload(KviModule *) { #ifdef COMPILE_PERL_SUPPORT return (g_pInterpreters->count() == 0); |
