diff options
Diffstat (limited to 'src/modules')
24 files changed, 151 insertions, 286 deletions
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index d42cb3af2..91d02dc96 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -58,7 +58,7 @@ #include <QTabWidget> #include <QLabel> #include <q3header.h> -// FIXME: #include <QHeaderView> +// FIXME: Qt4 #include <QHeaderView> extern KviActionEditorWindow * g_pActionEditorWindow; @@ -303,24 +303,17 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) "the active window is a dcc chat")); gl->addMultiCellWidget(m_pWindowDccChatCheck,10,10,1,3); - - l = new QLabel(tab); gl->addMultiCellWidget(l,11,11,0,3); - gl->setColStretch(3,1); gl->setRowStretch(11,1); tw->addTab(tab,__tr2qs("Flags")); - - - tw->setCurrentPage(0); g->setRowStretch(2,1); g->setColStretch(1,1); - KviPointerHashTableIterator<QString,KviActionCategory> it(*(KviActionManager::instance()->categories())); while(KviActionCategory * ac = it.current()) { @@ -609,7 +602,6 @@ void KviSingleActionEditor::commit() } - KviActionEditorListView::KviActionEditorListView(QWidget * pParent) : KviTalListView(pParent) { @@ -624,7 +616,6 @@ KviActionEditorListView::~KviActionEditorListView() { } - void KviActionEditorListView::resizeEvent(QResizeEvent * e) { KviTalListView::resizeEvent(e); @@ -634,7 +625,6 @@ void KviActionEditorListView::resizeEvent(QResizeEvent * e) } - KviActionEditor::KviActionEditor(QWidget * par) : QWidget(par) { @@ -805,15 +795,15 @@ void KviActionEditor::newAction() szDes.append("\")"); KviActionData * ad = new KviActionData(szName, - QString::null, - szVis, - szDes, - KviActionManager::categoryGeneric()->name(), - QString::null, - QString::null, - 0, - QString::null, - 0); + QString::null, + szVis, + szDes, + KviActionManager::categoryGeneric()->name(), + QString::null, + QString::null, + 0, + QString::null, + 0); KviActionEditorListViewItem * lvi = new KviActionEditorListViewItem(m_pListView,ad); ad->m_pItem = lvi; @@ -892,7 +882,6 @@ void KviActionEditor::commit() } - KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm) : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"actioneditor",0) { @@ -947,7 +936,6 @@ void KviActionEditorWindow::cancelClicked() close(); } - QPixmap * KviActionEditorWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_SCRIPTACTION); @@ -960,7 +948,6 @@ void KviActionEditorWindow::resizeEvent(QResizeEvent *e) m_pBase->setGeometry(0,height() - hght,width(),hght); } - void KviActionEditorWindow::getConfigGroupName(KviStr &szName) { szName = "actioneditor"; diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h index 7c25f84df..a8ce3b96a 100644 --- a/src/modules/actioneditor/actioneditor.h +++ b/src/modules/actioneditor/actioneditor.h @@ -25,23 +25,22 @@ //============================================================================= #include "kvi_window.h" - -#include "kvi_tal_listview.h" #include "kvi_styled_controls.h" +#include "kvi_tal_listview.h" #include <QWidget> #include <q3simplerichtext.h> #define QSimpleRichText Q3SimpleRichText -class KviActionEditorListViewItem; -class KviScriptEditor; -class KviActionEditor; class QLineEdit; class QComboBox; class QToolButton; class QSimpleRichText; class QPushButton; class QSplitter; +class KviActionEditorListViewItem; +class KviScriptEditor; +class KviActionEditor; class KviActionData diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp index af3252521..fdc5cfed1 100644 --- a/src/modules/actioneditor/libkviactioneditor.cpp +++ b/src/modules/actioneditor/libkviactioneditor.cpp @@ -46,7 +46,7 @@ KviActionEditorWindow * g_pActionEditorWindow = 0; */ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall * c) -{ +{ if(!g_pActionEditorWindow) { g_pActionEditorWindow = new KviActionEditorWindow(c->window()->frame()); @@ -56,6 +56,7 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall * c) g_pActionEditorWindow->setFocus(); return true; } + static bool actioneditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m,"open",actioneditor_kvs_cmd_open); diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 91f86d206..b74df2bea 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -40,16 +40,16 @@ #include "kvi_cmdformatter.h" #include "kvi_module.h" #include "kvi_valuelist.h" - -#include <qsplitter.h> -#include <qlayout.h> #include "kvi_tal_vbox.h" -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qmessagebox.h> -#include <qinputdialog.h> -#include <qregexp.h> + +#include <QSplitter> +#include <QLayout> +#include <QToolTip> +#include <QPushButton> +#include <QDir> +#include <QMessageBox> +#include <QInputDialog> +#include <QRegExp> extern KviAliasEditorWindow * g_pAliasEditorWindow; extern KviModule * g_pAliasEditorModule; @@ -75,7 +75,6 @@ QString KviAliasEditorListViewItem::key(int column,bool bAsc) const return ret; } - void KviAliasEditorListViewItem::setName(const QString &szName) { m_szName = szName; @@ -206,17 +205,11 @@ KviAliasEditor::KviAliasEditor(QWidget * par) m_pLastEditedItem = 0; m_pLastClickedItem = 0; m_szDir = QDir::homeDirPath(); - QGridLayout * l = new QGridLayout(this,1,1,2,2); -#ifdef COMPILE_USE_QT4 m_pSplitter = new QSplitter(Qt::Horizontal,this); m_pSplitter->setOpaqueResize(false); -#else - m_pSplitter = new QSplitter(QSplitter::Horizontal,this); -#endif - l->addWidget(m_pSplitter,0,0); KviTalVBox * box = new KviTalVBox(m_pSplitter); @@ -292,7 +285,6 @@ KviAliasListViewItem * KviAliasEditor::getAliasItem(const QString &szName) return it; } - void KviAliasEditor::splitFullAliasOrNamespaceName(const QString &szFullName,QStringList &lNamespaces,QString &szName) { lNamespaces = QStringList::split("::",szFullName); @@ -410,7 +402,6 @@ bool KviAliasEditor::itemExists(KviTalListViewItem *pSearchFor,KviTalListViewIte return itemExists(pSearchFor,pSearchAt->nextSibling()); } - void KviAliasEditor::itemPressed(KviTalListViewItem *it,const QPoint &pnt,int col) { m_pContextPopup->clear(); @@ -429,7 +420,6 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const QPoint &pnt,int co __tr2qs("Add Namespace"), this,SLOT(newNamespace())); - bool bHasItems = m_pListView->firstChild() != 0; bool bHasSelected = hasSelectedItems(m_pListView->firstChild()); @@ -441,7 +431,6 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const QPoint &pnt,int co this,SLOT(removeSelectedItems())); m_pContextPopup->setItemEnabled(id,bHasSelected); - m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( @@ -477,8 +466,6 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const QPoint &pnt,int co this,SLOT(slotCollapseNamespaces())); m_pContextPopup->setItemEnabled(id,bHasItems); - - m_pContextPopup->popup(pnt); } @@ -518,6 +505,7 @@ void KviAliasEditor::slotFind() recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)m_pListView->firstChild()); } + void KviAliasEditor::slotFindWord(const QString &szSearch) { m_pEditor->setFindText(szSearch); @@ -525,6 +513,7 @@ void KviAliasEditor::slotFindWord(const QString &szSearch) recursiveSearchReplace(szSearch,(KviAliasEditorListViewItem *)m_pListView->firstChild()); } + void KviAliasEditor::recursiveCollapseNamespaces(KviAliasEditorListViewItem * it) { if(!it)return; @@ -541,14 +530,11 @@ void KviAliasEditor::slotCollapseNamespaces() recursiveCollapseNamespaces((KviAliasEditorListViewItem *)m_pListView->firstChild()); } - void KviAliasEditor::slotReplaceAll(const QString &before,const QString &after) { recursiveSearchReplace(before,(KviAliasEditorListViewItem *)m_pListView->firstChild(),true,after); } - - void KviAliasEditor::getExportAliasBuffer(QString &buffer,KviAliasListViewItem * it) { QString szBuf = it->buffer(); @@ -562,7 +548,6 @@ void KviAliasEditor::getExportAliasBuffer(QString &buffer,KviAliasListViewItem * buffer += "\n"; } - void KviAliasEditor::exportAll() { exportAliases(false); @@ -572,6 +557,7 @@ void KviAliasEditor::exportSelectedSepFiles() { exportAliases (true,true); } + void KviAliasEditor::exportSelected() { exportAliases(true); @@ -627,6 +613,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi g_pAliasEditorModule->unlock(); } + void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) { saveLastEditedItem(); @@ -638,7 +625,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) appendAliasItems(&l,(KviAliasEditorListViewItem *)(m_pListView->firstChild()),bSelectedOnly); if (bSingleFiles) - { + { exportSelectionInSinglesFiles(&l); return; @@ -664,7 +651,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles) } QString szName = m_szDir; - + if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; QString szFile; g_pAliasEditorModule->lock(); @@ -999,7 +986,6 @@ void KviAliasEditor::openParentItems(KviTalListViewItem * it) } } - void KviAliasEditor::selectOneItem(KviTalListViewItem * it,KviTalListViewItem *pStartFrom) { if(!pStartFrom)return; @@ -1009,7 +995,6 @@ void KviAliasEditor::selectOneItem(KviTalListViewItem * it,KviTalListViewItem *p selectOneItem(it,pStartFrom->nextSibling()); } - void KviAliasEditor::activateItem(KviTalListViewItem * it) { openParentItems(it); @@ -1017,7 +1002,6 @@ void KviAliasEditor::activateItem(KviTalListViewItem * it) m_pListView->setCurrentItem(it); } - void KviAliasEditor::newAlias() { if(m_pLastClickedItem) @@ -1098,6 +1082,7 @@ bool KviAliasEditor::namespaceExists(QString &szFullItemName) } return false; } + void KviAliasEditor::renameItem() { if(!m_pLastEditedItem)return; @@ -1123,9 +1108,9 @@ void KviAliasEditor::renameItem() { g_pAliasEditorModule->lock(); QMessageBox::information(this, - __tr2qs("Alias already exists"), - __tr2qs("This name is already in use. Please choose another one."), - __tr2qs("Ok, Let me try again...")); + __tr2qs("Alias already exists"), + __tr2qs("This name is already in use. Please choose another one."), + __tr2qs("Ok, Let me try again...")); g_pAliasEditorModule->unlock(); return; } @@ -1135,9 +1120,9 @@ void KviAliasEditor::renameItem() { g_pAliasEditorModule->lock(); QMessageBox::information(this, - __tr2qs("Namespace already exists"), - __tr2qs("This name is already in use. Please choose another one."), - __tr2qs("Ok, let me try again...")); + __tr2qs("Namespace already exists"), + __tr2qs("This name is already in use. Please choose another one."), + __tr2qs("Ok, let me try again...")); g_pAliasEditorModule->unlock(); return; } @@ -1263,7 +1248,6 @@ void KviAliasEditor::recursiveCommit(KviAliasEditorListViewItem * it) recursiveCommit((KviAliasEditorListViewItem *)(it->nextSibling())); } - void KviAliasEditor::commit() { saveLastEditedItem(); @@ -1274,7 +1258,6 @@ void KviAliasEditor::commit() g_pApp->saveAliases(); } - void KviAliasEditor::getUniqueItemName(KviAliasEditorListViewItem *item,QString &buffer,KviAliasEditorListViewItem::Type eType) { QString ret; @@ -1322,8 +1305,6 @@ void KviAliasEditor::getUniqueItemName(KviAliasEditorListViewItem *item,QString } - - KviAliasEditorWindow::KviAliasEditorWindow(KviFrame * lpFrm) : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"aliaseditor",0) { @@ -1375,7 +1356,6 @@ void KviAliasEditorWindow::cancelClicked() close(); } - QPixmap * KviAliasEditorWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS); @@ -1388,20 +1368,16 @@ void KviAliasEditorWindow::resizeEvent(QResizeEvent *e) m_pBase->setGeometry(0,height() - hght,width(),hght); } - void KviAliasEditorWindow::getConfigGroupName(KviStr &szName) { szName = "aliaseditor"; } - void KviAliasEditorWindow::saveProperties(KviConfig *cfg) { m_pEditor->saveProperties(cfg); } - - void KviAliasEditorWindow::loadProperties(KviConfig *cfg) { m_pEditor->loadProperties(cfg); diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h index 193d66df1..b0f095e0f 100644 --- a/src/modules/aliaseditor/aliaseditor.h +++ b/src/modules/aliaseditor/aliaseditor.h @@ -27,16 +27,16 @@ #include "kvi_window.h" #include "kvi_string.h" #include "kvi_pointerlist.h" - - -#include <qwidget.h> -#include "kvi_tal_listview.h" -#include <qlineedit.h> #include "kvi_tal_popupmenu.h" -#include <qstringlist.h> -#include <qpushbutton.h> -#include <qlabel.h> +#include "kvi_tal_listview.h" +#include <QWidget> +#include <QLineEdit> +#include <QStringList> +#include <QPushButton> +#include <QLabel> + +class QSplitter; class KviScriptEditor; class KviAliasNamespaceListViewItem; @@ -98,7 +98,6 @@ public: void setCursorPosition(const QPoint &cPos){ m_cPos = cPos; }; }; -class QSplitter; class KviAliasEditor : public QWidget { diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp index 6dfc7a293..565d8c7f0 100644 --- a/src/modules/aliaseditor/libkvialiaseditor.cpp +++ b/src/modules/aliaseditor/libkvialiaseditor.cpp @@ -22,11 +22,13 @@ // //========================================================================================== +#include "aliaseditor.h" + #include "kvi_module.h" #include "kvi_locale.h" #include "kvi_frame.h" -#include "aliaseditor.h" + KviAliasEditorWindow * g_pAliasEditorWindow = 0; KviModule * g_pAliasEditorModule = 0; @@ -46,7 +48,7 @@ KviModule * g_pAliasEditorModule = 0; */ static bool aliaseditor_kvs_cmd_open(KviKvsModuleCommandCall * c) -{ +{ if(!g_pAliasEditorWindow) { g_pAliasEditorWindow = new KviAliasEditorWindow(c->window()->frame()); @@ -80,7 +82,7 @@ static bool aliaseditor_module_cleanup(KviModule *m) KVIRC_MODULE( "AliasEditor", // module name - "2.0.0", // module version + "4.0.0", // module version "Copyright (C) 2002-2005 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Editor for the script aliases", aliaseditor_module_init, diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index c3c60fa83..335a526f0 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -34,7 +34,6 @@ #include "kvi_iconmanager.h" #include "kvi_avatar.h" #include "kvi_ircuserdb.h" - #include "kvi_ircconnection.h" #include "kvi_ircconnectionuserinfo.h" #include "kvi_console.h" @@ -45,14 +44,14 @@ #include "kvi_out.h" #include "kvi_ircmask.h" #include "kvi_qcstring.h" - -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qmessagebox.h> -#include <qtimer.h> -#include <qlabel.h> #include "kvi_tal_hbox.h" -#include <qlayout.h> + +#include <QLineEdit> +#include <QPushButton> +#include <QMessageBox> +#include <QTimer> +#include <QLabel> +#include <QLayout> static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0; extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; @@ -444,7 +443,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c) */ static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c) -{ +{ QString szNick; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("nick",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick) @@ -488,7 +487,7 @@ static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c) */ static bool avatar_kvs_fnc_path(KviKvsModuleFunctionCall * c) -{ +{ QString szNick; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("path",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick) @@ -575,7 +574,7 @@ static bool avatar_module_cleanup(KviModule *m) KVIRC_MODULE( "Avatar", - "1.0.0", + "4.0.0", "Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", "Avatar manipulation routines", avatar_module_init, diff --git a/src/modules/avatar/libkviavatar.h b/src/modules/avatar/libkviavatar.h index 21a870d04..eb5c01278 100644 --- a/src/modules/avatar/libkviavatar.h +++ b/src/modules/avatar/libkviavatar.h @@ -26,7 +26,8 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qdialog.h> + +#include <QDialog> class QLineEdit; class KviIrcConnection; diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index a42833d0b..c588bdbee 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -1593,12 +1593,10 @@ static bool chan_module_init(KviModule * m) KVSM_REGISTER_FUNCTION(m,"ismeowner",chan_kvs_fnc_ismeowner); KVSM_REGISTER_FUNCTION(m,"isdead",chan_kvs_fnc_isdead); KVSM_REGISTER_FUNCTION(m,"getflag",chan_kvs_fnc_getflag); - KVSM_REGISTER_FUNCTION(m,"usermodelevel",chan_kvs_fnc_usermodelevel); KVSM_REGISTER_FUNCTION(m,"userjointime",chan_kvs_fnc_userjointime);// KVSM_REGISTER_FUNCTION(m,"userlastactiontime",chan_kvs_fnc_userlastactiontime); KVSM_REGISTER_FUNCTION(m,"mode",chan_kvs_fnc_mode); - KVSM_REGISTER_FUNCTION(m,"key",chan_kvs_fnc_key); KVSM_REGISTER_FUNCTION(m,"limit",chan_kvs_fnc_limit); KVSM_REGISTER_FUNCTION(m,"users",chan_kvs_fnc_users); @@ -1621,10 +1619,9 @@ static bool chan_module_cleanup(KviModule *m) return true; } - KVIRC_MODULE( "Chan", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)"\ " (C) 2002 Juanjo Alvarez (juanjux at yahoo dot es)", "Scripting interface for the channel management", diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 8025d6c19..aa3a916f0 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -28,26 +28,25 @@ #include "kvi_options.h" #include "kvi_selectors.h" #include "kvi_app.h" - #include "kvi_string.h" #include "kvi_iconmanager.h" #include "kvi_console.h" #include "kvi_regchan.h" #include "kvi_kvs_script.h" - -#include <qlabel.h> -#include <qlineedit.h> #include "kvi_tal_listview.h" #include <kvi_tal_groupbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#ifdef COMPILE_USE_QT4 - #include <q3header.h> -#else - #include <qheader.h> -#endif -#include <qevent.h> + +#include <QLabel> +#include <QLineEdit> +#include <QLayout> +#include <QCheckBox> +#include <QPushButton> +#include <QEvent> +#include <QCloseEvent> + +// FIXME: Qt4 #include <QHeaderView> +#include <q3header.h> + extern KviChannelsJoinWindow * g_pChannelsWindow; extern QRect g_rectChannelsJoinGeometry; @@ -92,18 +91,12 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name) g->addMultiCellWidget(m_pGroupBox,1,1,0,1); - m_pJoinButton = new QPushButton(__tr2qs("&Join"),this); // Join on return pressed m_pJoinButton->setDefault(true); connect(m_pJoinButton,SIGNAL(clicked()),this,SLOT(joinClicked())); -#ifdef COMPILE_USE_QT4 g->addMultiCellWidget(m_pJoinButton,2,2,0,1,Qt::AlignHCenter); -#else - g->addMultiCellWidget(m_pJoinButton,2,2,0,1,AlignHCenter); -#endif - m_pShowAtStartupCheck = new KviStyledCheckBox(__tr2qs("Show this window after connecting"),this); m_pShowAtStartupCheck->setChecked(KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc)); @@ -193,8 +186,6 @@ void KviChannelsJoinWindow::fillListView() ++it; } } - - } void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it) @@ -216,7 +207,6 @@ void KviChannelsJoinWindow::itemDoubleClicked(KviTalListViewItem * it) joinClicked(); } - void KviChannelsJoinWindow::editTextChanged(const QString &) { enableJoin(); @@ -290,13 +280,14 @@ void KviChannelsJoinWindow::itemDoubleClicked(KviTalListBoxItem * it) void KviChannelsJoinWindow::editReturnPressed() { joinClicked(); -} +} void KviChannelsJoinWindow::closeEvent(QCloseEvent *e) { e->ignore(); delete this; } + #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_channelsjoinwindow.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h index 27bf5cddf..57080ca6e 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.h +++ b/src/modules/channelsjoin/channelsjoinwindow.h @@ -25,16 +25,16 @@ #define _CHANNELSJOIN_H_ #include "kvi_window.h" #include "kvi_string.h" +#include "kvi_styled_controls.h" +#include "kvi_tal_listview.h" -#include <qdialog.h> +#include <QDialog> -class KviConsole; -class KviTalGroupBox; class QPushButton; class QLineEdit; +class KviConsole; +class KviTalGroupBox; -#include "kvi_styled_controls.h" -#include "kvi_tal_listview.h" class KviChannelsJoinWindow : public QDialog { @@ -66,5 +66,5 @@ protected slots: // void whoClicked(); // void namesClicked(); }; - + #endif //_CHANNELSJOINSWINDOW_H_ diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp index e89c44afa..dd1847385 100644 --- a/src/modules/channelsjoin/libkvichannelsjoin.cpp +++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp @@ -22,15 +22,15 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // //============================================================================= -#include "kvi_module.h" - #include "channelsjoinwindow.h" + +#include "kvi_module.h" #include "kvi_window.h" #include "kvi_frame.h" #include "kvi_locale.h" #include "kvi_config.h" -#include <qsplitter.h> +#include <QSplitter> KviChannelsJoinWindow * g_pChannelsWindow = 0; QRect g_rectChannelsJoinGeometry; @@ -62,8 +62,6 @@ static bool channelsjoin_kvs_cmd_open(KviKvsModuleCommandCall * c) g_pChannelsWindow->setFocus(); return true; - - } static bool channelsjoin_module_init(KviModule * m) @@ -98,7 +96,7 @@ static bool channelsjoin_module_can_unload(KviModule *m) KVIRC_MODULE( "ChannelsJoin", - "0.0.3", + "4.0.0", "Copyright (C) 2001-2006 Juan Jos��varez (juanjux@yahoo.es), Alexey (wizard@opendoor.ru)", "Window to join channels in a GUI", channelsjoin_module_init, diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp index e724c0372..e01ec36a1 100644 --- a/src/modules/clock/libkviclock.cpp +++ b/src/modules/clock/libkviclock.cpp @@ -20,21 +20,18 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // - #include "libkviclock.h" + #include "kvi_module.h" #include "kvi_console.h" #include "kvi_options.h" #include "kvi_frame.h" #include "kvi_locale.h" - #include "kvi_pointerlist.h" -#include <qbitmap.h> -#include <qtooltip.h> -#include <qpainter.h> - - +#include <QBitmap> +#include <QToolTip> +#include <QPainter> //#include <X11/Xlib.h> #include <time.h> @@ -244,7 +241,7 @@ static bool clock_module_can_unload(KviModule *m) KVIRC_MODULE( "Clock", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Clock toolbar applet", clock_module_init, diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp index d14137336..9c962baff 100644 --- a/src/modules/config/libkviconfig.cpp +++ b/src/modules/config/libkviconfig.cpp @@ -28,7 +28,6 @@ #include "kvi_fileutils.h" #include "kvi_app.h" #include "kvi_locale.h" - #include "kvi_pointerhashtable.h" static KviPointerHashTable<QString,KviConfig> * g_pConfigDict = 0; @@ -856,7 +855,7 @@ static bool config_module_init(KviModule * m) static bool config_module_cleanup(KviModule *m) { delete g_pConfigDict; - g_pConfigDict = 0; + g_pConfigDict = 0; return true; } @@ -867,7 +866,7 @@ static bool config_module_can_unload(KviModule *m) KVIRC_MODULE( "Config", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Config file system for KVIrc", config_module_init, diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index 889a9593b..6f3851c38 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -22,7 +22,7 @@ // //============================================================================= -//#warning: FIXME: Incomplete documentation ('seealso', 'example', etc) +//#warning: FIXME: Incomplete documentation ('example', etc) #include "kvi_module.h" #include "kvi_locale.h" @@ -31,7 +31,6 @@ #include "kvi_frame.h" #include "kvi_console.h" #include "kvi_app.h" - #include "kvi_ircserver.h" #include "kvi_irccontext.h" #include "kvi_ircconnection.h" @@ -391,7 +390,7 @@ static bool context_module_cleanup(KviModule *m) KVIRC_MODULE( "context", - "1.0.0", + "4.0.0", "Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)", "Irc Context Related Functions", context_module_init, diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 38f418578..c7c8d3f10 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -25,21 +25,6 @@ #include "libkvidialog.h" -#include <qmessagebox.h> -#include <qlayout.h> -#include "kvi_tal_hbox.h" -#include <qlineedit.h> -#ifdef COMPILE_USE_QT4 - #include <q3multilineedit.h> - #define QMultiLineEdit Q3MultiLineEdit - #include <qdesktopwidget.h> -#else - #include <qmultilineedit.h> -#endif -#include <qevent.h> -#include <qlabel.h> -#include <qpushbutton.h> - #include "kvi_locale.h" #include "kvi_module.h" #include "kvi_modulemanager.h" @@ -50,6 +35,19 @@ #include "kvi_iconmanager.h" #include "kvi_kvs_script.h" #include "kvi_msgbox.h" +#include "kvi_tal_hbox.h" + +#include <QMessageBox> +#include <QLayout> +#include <QLineEdit> +#include <QLabel> +#include <QPushButton> +#include <QDesktopWidget> +#include <QEvent> +#include <QCloseEvent> + +#include <q3multilineedit.h> +#define QMultiLineEdit Q3MultiLineEdit static KviPointerList<QWidget> * g_pDialogModuleDialogList; @@ -74,9 +72,6 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox( KviKvsCallbackObject("dialog.message",pWindow,szCode,pMagicParams,0) { g_pDialogModuleDialogList->append(this); -#ifndef COMPILE_USE_QT4 - setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); -#endif QPixmap * pix = g_pIconManager->getImage(szIcon); @@ -194,7 +189,6 @@ static bool dialog_kvs_cmd_message(KviKvsModuleCallbackCommandCall * c) } - KviKvsCallbackTextInput::KviKvsCallbackTextInput( const QString &szCaption, const QString &szLabel, @@ -381,7 +375,6 @@ void KviKvsCallbackTextInput::showEvent(QShowEvent *e) } - /* @doc: dialog.textinput @type: @@ -476,10 +469,6 @@ static bool dialog_kvs_cmd_textinput(KviKvsModuleCallbackCommandCall * c) -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - -// New KVS KviKvsCallbackFileDialog::KviKvsCallbackFileDialog( const QString &szCaption, const QString &szInitialSelection, @@ -623,11 +612,6 @@ static bool dialog_kvs_cmd_file(KviKvsModuleCallbackCommandCall * c) } - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - -// New KVS KviKvsCallbackImageDialog::KviKvsCallbackImageDialog( const QString &szCaption, const QString &szInitialSelection, @@ -870,12 +854,6 @@ static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterLi That's REAL programming. */ - - - - - - static bool dialog_module_init(KviModule * m) { g_pDialogModuleDialogList = new KviPointerList<QWidget>; @@ -908,7 +886,7 @@ static bool dialog_module_can_unload(KviModule *m) KVIRC_MODULE( "KVIrc script dialogs", - "1.0.0", + "4.0.0", "Szymon Stefanek <pragma at kvirc dot net>" , "Adds the /dialog.* commands functionality\n", dialog_module_init , diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h index c48c2ac9f..db737e05c 100644 --- a/src/modules/dialog/libkvidialog.h +++ b/src/modules/dialog/libkvidialog.h @@ -28,15 +28,11 @@ #include "kvi_parameterlist.h" #include "kvi_filedialog.h" #include "kvi_imagedialog.h" - #include "kvi_kvs_callbackobject.h" -#include <qmessagebox.h> -#include <qdialog.h> - - +#include <QMessageBox> +#include <QDialog> -// New KVS class KviKvsCallbackMessageBox : public QMessageBox, public KviKvsCallbackObject { Q_OBJECT @@ -57,9 +53,6 @@ protected slots: }; - - -// New KVS class KviKvsCallbackTextInput : public QDialog, public KviKvsCallbackObject { Q_OBJECT @@ -93,8 +86,6 @@ protected slots: }; - -// New KVS class KviKvsCallbackFileDialog : public KviFileDialog, public KviKvsCallbackObject { Q_OBJECT @@ -112,7 +103,6 @@ protected: }; -// New KVS class KviKvsCallbackImageDialog : public KviImageDialog, public KviKvsCallbackObject { Q_OBJECT diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 001ba9f82..3d7c88487 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -29,13 +29,12 @@ #include "kvi_app.h" #include "kvi_options.h" #include "kvi_qcstring.h" - #include "kvi_kvs_arraycast.h" - -#include <qfileinfo.h> #include "kvi_file.h" -#include <qdir.h> -#include <qtextstream.h> + +#include <QFileInfo> +#include <QDir> +#include <QTextStream> /* @doc: file.copy @@ -501,9 +500,6 @@ static bool file_kvs_fnc_allSizes(KviKvsModuleFunctionCall * c) } c->returnValue()->setArray(a); - - - return true; } @@ -629,11 +625,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c) return true; } -#ifdef COMPILE_USE_QT4 QFlags<QDir::Filter> iFlags = 0; -#else - int iFlags = 0; -#endif if(szFlags.isEmpty())iFlags = QDir::Dirs | QDir::Files | QDir::NoSymLinks | QDir::Readable | QDir::Writable | QDir::Executable | QDir::Hidden | QDir::System; else { if(szFlags.find('d',false) != -1)iFlags |= QDir::Dirs; @@ -645,11 +637,8 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c) if(szFlags.find('h',false) != -1)iFlags |= QDir::Hidden; if(szFlags.find('s',false) != -1)iFlags |= QDir::System; } -#ifdef COMPILE_USE_QT4 + QFlags<QDir::SortFlag> iSort = 0; -#else - int iSort = 0; -#endif if(szFlags.isEmpty())iSort = QDir::Unsorted; else { if(szFlags.find('n',false) != -1)iSort |= QDir::Name; @@ -802,8 +791,6 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c) [fnc]$file.read[/fnc], [cmd]file.writeLines[/cmd], [fnc]$lf[/fnc] */ - - static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) { QString szName; @@ -899,7 +886,6 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) */ - static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c) { QString szFile,szFlags; @@ -1206,7 +1192,6 @@ static bool file_kvs_fnc_extractfilename(KviKvsModuleFunctionCall * c) } - static bool file_module_init(KviModule * m) { @@ -1223,9 +1208,7 @@ static bool file_module_init(KviModule * m) KVSM_REGISTER_FUNCTION(m,"exists",file_kvs_fnc_exists); KVSM_REGISTER_FUNCTION(m,"type",file_kvs_fnc_type); KVSM_REGISTER_FUNCTION(m,"size",file_kvs_fnc_size); - KVSM_REGISTER_FUNCTION(m,"allsizes",file_kvs_fnc_allSizes); - KVSM_REGISTER_FUNCTION(m,"fixpath",file_kvs_fnc_fixpath); KVSM_REGISTER_FUNCTION(m,"ps",file_kvs_fnc_ps); KVSM_REGISTER_FUNCTION(m,"read",file_kvs_fnc_read); @@ -1239,7 +1222,6 @@ static bool file_module_init(KviModule * m) KVSM_REGISTER_FUNCTION(m,"ls",file_kvs_fnc_ls); KVSM_REGISTER_FUNCTION(m,"readLines",file_kvs_fnc_readLines); - return true; } @@ -1250,7 +1232,7 @@ static bool file_module_cleanup(KviModule *m) KVIRC_MODULE( "File", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Interface to the file system", file_module_init, diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 5a768da47..e69405877 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -35,23 +35,22 @@ #include "kvi_themedlabel.h" #include "kvi_input.h" #include "kvi_qstring.h" - -#include <qsplitter.h> -#include <qtooltip.h> #include "kvi_tal_hbox.h" -#ifdef COMPILE_USE_QT4 - #include <q3header.h> -#else - #include <qheader.h> -#endif -#include <qpainter.h> -#include <qmessagebox.h> -#include <qclipboard.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qlabel.h> -#include <qfontmetrics.h> -#include <qevent.h> + +#include <QSplitter> +#include <QToolTip> +#include <QPainter> +#include <QMessageBox> +#include <QClipboard> +#include <QFileInfo> +#include <QFile> +#include <QLabel> +#include <QFontMetrics> +#include <QEvent> +#include <QKeyEvent> + +// FIXME: Qt4 #include <QHeaderView> +#include <q3header.h> #ifdef COMPILE_KDE_SUPPORT #include <kurl.h> @@ -227,7 +226,6 @@ void KviFileTransferWindow::fontChange(const QFont &oldFont) KviWindow::fontChange(oldFont); } - void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt) { KviFileTransferItem * it = (KviFileTransferItem *)m_pListView->itemAt(pnt); @@ -275,8 +273,7 @@ void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t) void KviFileTransferWindow::doubleClicked(KviTalListViewItem *it,const QPoint &pnt,int col) { - if(it) - openLocalFile(); + if(it) openLocalFile(); } void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col) @@ -293,7 +290,6 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoi int id; - if(it) { KviFileTransferItem * i = (KviFileTransferItem *)it; @@ -463,9 +459,8 @@ void KviFileTransferWindow::openLocalFileTerminal() int idx = tmp.findRev("/"); if(idx == -1)return; tmp = tmp.left(idx); - tmp.append("\""); -/*FIX ME " this is not a solution ...because if the drive isn't system's drive the command - 'cd' naturaly doesn't work"*/ + tmp.append("\""); + // FIXME: this is not a solution ...because if the drive isn't system's drive the command 'cd' naturaly doesn't work tmp.prepend("cmd.exe /k cd \""); system(tmp.local8Bit().data()); #else //COMPILE_ON_WINDOWS @@ -508,7 +503,6 @@ void KviFileTransferWindow::deleteLocalFile() __tr2qs_ctx("OK","filetransferwindow")); } - void KviFileTransferWindow::openLocalFile() { //-| Grifisx & Noldor |- @@ -579,14 +573,7 @@ void KviFileTransferWindow::copyLocalFileToClipboard() if(!t)return; QString tmp = t->localFileName(); if(tmp.isEmpty())return; -#ifdef COMPILE_USE_QT4 - QApplication::clipboard()->setText(tmp); -#else - QApplication::clipboard()->setSelectionMode(false); QApplication::clipboard()->setText(tmp); - QApplication::clipboard()->setSelectionMode(true); - QApplication::clipboard()->setText(tmp); -#endif } void KviFileTransferWindow::openLocalFileFolder() @@ -626,7 +613,6 @@ void KviFileTransferWindow::openLocalFileFolder() #endif //!COMPILE_ON_WINDOWS } - void KviFileTransferWindow::heartbeat() { if(m_pListView->childCount() < 1)return; diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h index 7c79dcf7d..76fd64273 100644 --- a/src/modules/filetransferwindow/filetransferwindow.h +++ b/src/modules/filetransferwindow/filetransferwindow.h @@ -32,13 +32,12 @@ #include "kvi_moduleextension.h" #include "kvi_filetransfer.h" #include "kvi_dynamictooltip.h" - #include "kvi_tal_listview.h" #include "kvi_tal_popupmenu.h" -#include <qtoolbutton.h> -#include <qtimer.h> -#include <qpixmap.h> +#include <QToolButton> +#include <QTimer> +#include <QPixmap> class KviFileTransferItem : public KviTalListViewItem @@ -98,7 +97,6 @@ protected slots: void clearTerminated(); void clearAll(); void tipRequest(KviDynamicToolTip * tip,const QPoint &pnt); - void openLocalFile(); void openLocalFileWith(); void copyLocalFileToClipboard(); diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index 33cd2e107..898a7462b 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -21,18 +21,16 @@ // //================================================================================== -#include "kvi_module.h" - - #include "filetransferwindow.h" +#include "kvi_module.h" #include "kvi_app.h" #include "kvi_frame.h" #include "kvi_window.h" #include "kvi_locale.h" #include "kvi_iconmanager.h" -#include <qsplitter.h> +#include <QSplitter> KviFileTransferWindow * g_pFileTransferWindow = 0; @@ -100,7 +98,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio */ static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c) -{ +{ KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME); if(d) @@ -130,7 +128,6 @@ static bool filetransferwindow_module_init(KviModule * m) KVSM_REGISTER_SIMPLE_COMMAND(m,"open",filetransferwindow_kvs_cmd_open); - return true; } @@ -151,7 +148,7 @@ static bool filetransferwindow_module_can_unload(KviModule *m) KVIRC_MODULE( "FileTransferWindow", - "1.0.0", + "4.0.0", "Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net)", "Links window extension", filetransferwindow_module_init, diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index bbc1dcfd8..0d412e202 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -31,11 +31,10 @@ #include "kvi_netutils.h" #include "kvi_kvs_eventtriggers.h" #include "kvi_console.h" - #include "kvi_kvs_script.h" - #include "kvi_tal_popupmenu.h" -#include <qpainter.h> + +#include <QPainter> static KviPointerList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0; static QPixmap * g_pHttpIcon = 0; @@ -489,4 +488,3 @@ bool KviHttpFileTransfer::startDownload() #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_httpfiletransfer.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES - diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h index 88dea71d6..95b1408d3 100644 --- a/src/modules/http/httpfiletransfer.h +++ b/src/modules/http/httpfiletransfer.h @@ -27,11 +27,10 @@ #include "kvi_filetransfer.h" #include "kvi_http.h" #include "kvi_time.h" - #include "kvi_kvs_variant.h" -#include <qstringlist.h> -#include <qtimer.h> +#include <QStringList> +#include <QTimer> class QPainter; class KviTalPopupMenu; @@ -61,7 +60,6 @@ private: bool m_bNoOutput; QTimer * m_pAutoCleanTimer; - QString m_szCompletionCallback; public: KviHttpRequest * request(){ return m_pHttpRequest; }; @@ -94,11 +92,8 @@ protected slots: void contactingHost(const QString &ipandport); void receivedResponse(const QString &response); void connectionEstabilished(); - void abort(); - void autoClean(); }; - #endif //!_HTTPFILETRANSFER_H_ diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp index 63553b8b8..017107422 100644 --- a/src/modules/http/libkvihttp.cpp +++ b/src/modules/http/libkvihttp.cpp @@ -22,10 +22,10 @@ // //================================================================================== +#include "httpfiletransfer.h" + #include "kvi_module.h" #include "kvi_string.h" - - #include "kvi_app.h" #include "kvi_locale.h" #include "kvi_filedialog.h" @@ -33,9 +33,6 @@ #include "kvi_error.h" #include "kvi_cmdformatter.h" -#include "httpfiletransfer.h" - - static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback) { if(szUrl.isEmpty()) @@ -290,7 +287,6 @@ static bool http_kvs_cmd_asyncGet(KviKvsModuleCallbackCommandCall * c) return http_kvs_complete_get(c,szUrl,szFileName,c->callback()->code()); } - static bool http_module_init(KviModule * m) { KviHttpFileTransfer::init(); @@ -314,7 +310,7 @@ static bool http_module_can_unload(KviModule *m) KVIRC_MODULE( "Http", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "HTTP interface for KVIrc", http_module_init, |