diff options
| -rw-r--r-- | TODO-Qt4 | 2 | ||||
| -rw-r--r-- | src/modules/about/aboutdialog.cpp | 18 | ||||
| -rw-r--r-- | src/modules/about/libkviabout.cpp | 2 | ||||
| -rw-r--r-- | src/modules/action/libkviaction.cpp | 2 | ||||
| -rw-r--r-- | src/modules/actioneditor/actioneditor.cpp | 67 | ||||
| -rw-r--r-- | src/modules/actioneditor/actioneditor.h | 32 | ||||
| -rw-r--r-- | src/modules/actioneditor/libkviactioneditor.cpp | 5 | ||||
| -rw-r--r-- | src/modules/system/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/modules/system/plugin.h | 2 |
9 files changed, 50 insertions, 82 deletions
@@ -573,8 +573,6 @@ src/kvirc/ui kvi_window.h src/modules - about - action actioneditor addon aliaseditor diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 1688e09e2..7d4d6c268 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -25,18 +25,18 @@ #include "aboutdialog.h" #include "kvi_defaults.h" - #include "kvi_locale.h" #include "kvi_app.h" #include "kvi_fileutils.h" #include "kvi_sourcesdate.h" - -#include <qwidget.h> -#include <qlayout.h> #include <kvi_tal_textedit.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qevent.h> + +#include <QWidget> +#include <QLayout> +#include <QLabel> +#include <QPixmap> +#include <QEvent> +#include <QCloseEvent> extern KviAboutDialog * g_pAboutDialog; /* @@ -135,8 +135,8 @@ KviAboutDialog::KviAboutDialog() if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { szLicense = __tr2qs_ctx("Oops... Can't find the license file...\n" \ - "It MUST be included in the distribution...\n" \ - "Please report to <pragma at kvirc dot net>","about"); + "It MUST be included in the distribution...\n" \ + "Please report to <pragma at kvirc dot net>","about"); } v->setText(szLicense); diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp index 7a076edf5..7b7853223 100644 --- a/src/modules/about/libkviabout.cpp +++ b/src/modules/about/libkviabout.cpp @@ -89,7 +89,7 @@ static bool about_module_can_unload(KviModule * m) KVIRC_MODULE( "KVIrc about dialog", - "2.0.0", + "4.0.0", "Till Bush <buti@geocities.com>\n" \ "Szymon Stefanek <pragma at kvirc dot net>" , "Exports the /about.kvirc command\n", diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index 1eb13f65f..8835ea916 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -523,7 +523,7 @@ static bool action_module_cleanup(KviModule *m) KVIRC_MODULE( "action", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Interface to the system actions", action_module_init, diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 49bce0426..d42cb3af2 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -40,29 +40,26 @@ #include "kvi_action.h" #include "kvi_kvs_useraction.h" #include "kvi_customtoolbarmanager.h" - -#include <qsplitter.h> -#include <qlayout.h> +#include "kvi_valuelist.h" #include "kvi_tal_vbox.h" -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qmessagebox.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qtoolbutton.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qpainter.h> -#ifdef COMPILE_USE_QT4 - #include <q3header.h> -#else - #include <qheader.h> -#endif -#include <qtabwidget.h> #include <kvi_tal_groupbox.h> -#include "kvi_valuelist.h" -#include <qlabel.h> + +#include <QSplitter> +#include <QLayout> +#include <QToolTip> +#include <QPushButton> +#include <QDir> +#include <QMessageBox> +#include <QLineEdit> +#include <QComboBox> +#include <QToolButton> +#include <QCheckBox> +#include <QPainter> +#include <QTabWidget> +#include <QLabel> +#include <q3header.h> +// FIXME: #include <QHeaderView> + extern KviActionEditorWindow * g_pActionEditorWindow; @@ -217,9 +214,9 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed) m_pKeySequenceEdit = new QLineEdit(tab); gl->addMultiCellWidget(m_pKeySequenceEdit,4,5,1,1); QToolTip::add(m_pKeySequenceEdit,__tr2qs("Optional keyboard sequence that will activate this action.<br>" \ - "The sequence should be expressed as a string of up to four key codes separated by commas " \ - "eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>" \ - "Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ...")); + "The sequence should be expressed as a string of up to four key codes separated by commas " \ + "eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>" \ + "Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ...")); l = new QLabel(tab); gl->addMultiCellWidget(l,6,6,0,3); @@ -613,11 +610,6 @@ void KviSingleActionEditor::commit() - - - - - KviActionEditorListView::KviActionEditorListView(QWidget * pParent) : KviTalListView(pParent) { @@ -643,25 +635,13 @@ void KviActionEditorListView::resizeEvent(QResizeEvent * e) - - - - - KviActionEditor::KviActionEditor(QWidget * par) : QWidget(par) { 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); @@ -669,14 +649,9 @@ KviActionEditor::KviActionEditor(QWidget * par) m_pListView = new KviActionEditorListView(box); //m_pListView->setMultiSelection(false); m_pListView->setShowSortIndicator(true); -#ifdef COMPILE_USE_QT4 m_pListView->setFocusPolicy(Qt::StrongFocus); -#else - m_pListView->setFocusPolicy(QWidget::StrongFocus); -#endif connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentChanged(KviTalListViewItem *))); - m_pNewActionButton = new QPushButton(__tr2qs("New Action"),box); connect(m_pNewActionButton,SIGNAL(clicked()),this,SLOT(newAction())); diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h index e62df5565..7c25f84df 100644 --- a/src/modules/actioneditor/actioneditor.h +++ b/src/modules/actioneditor/actioneditor.h @@ -26,11 +26,23 @@ #include "kvi_window.h" -#include <qwidget.h> #include "kvi_tal_listview.h" #include "kvi_styled_controls.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 KviActionData { @@ -64,22 +76,6 @@ public: }; -class QLineEdit; -class QComboBox; -class KviScriptEditor; -class QToolButton; -class QSimpleRichText; -class QPushButton; - -#ifdef COMPILE_USE_QT4 - #include <q3simplerichtext.h> - #define QSimpleRichText Q3SimpleRichText -#else - #include <qsimplerichtext.h> -#endif - - - class KviActionEditorListViewItem : public KviTalListViewItem { public: @@ -111,7 +107,6 @@ protected: virtual void resizeEvent(QResizeEvent * e); }; -class KviActionEditor; class KviSingleActionEditor : public QWidget { @@ -156,7 +151,6 @@ protected slots: void channelQueryOrConsoleWindowCheckToggled(bool); }; -class QSplitter; class KviActionEditor : public QWidget { diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp index ec3ac3ff7..af3252521 100644 --- a/src/modules/actioneditor/libkviactioneditor.cpp +++ b/src/modules/actioneditor/libkviactioneditor.cpp @@ -22,11 +22,12 @@ // //============================================================================= +#include "actioneditor.h" + #include "kvi_module.h" #include "kvi_locale.h" #include "kvi_frame.h" -#include "actioneditor.h" KviActionEditorWindow * g_pActionEditorWindow = 0; @@ -76,7 +77,7 @@ static bool actioneditor_module_cleanup(KviModule *m) KVIRC_MODULE( "ActionEditor", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Editor for the script actions", actioneditor_module_init, diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp index ebebfbb1f..7c888f7fe 100644 --- a/src/modules/system/plugin.cpp +++ b/src/modules/system/plugin.cpp @@ -424,4 +424,4 @@ KviPlugin * KviPluginManager::getPlugin(const QString& szPluginPath) { KviPlugin * p = m_pPluginDict->find(szPluginPath); return p; -}
\ No newline at end of file +} diff --git a/src/modules/system/plugin.h b/src/modules/system/plugin.h index b8727db2a..03e3c9a9a 100644 --- a/src/modules/system/plugin.h +++ b/src/modules/system/plugin.h @@ -77,4 +77,4 @@ class KviPluginManager KviPlugin * getPlugin(const QString& szPluginPath); }; -#endif //_PLUGIN_H_
\ No newline at end of file +#endif //_PLUGIN_H_ |