ported some modules

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1423 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 11 insertions, 18 deletions

diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp
index a90b88c47..6cff8c06c 100644
--- a/src/modules/toolbareditor/libkvitoolbareditor.cpp
+++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp
@@ -23,10 +23,9 @@
 //=============================================================================
 
 #include "toolbareditor.h"
-#include "kvi_module.h"
 
+#include "kvi_module.h"
 #include "kvi_locale.h"
-
 #include "kvi_frame.h"
 #include "kvi_actionmanager.h"
 #include "kvi_config.h"
@@ -86,7 +85,7 @@ static bool toolbareditor_module_cleanup(KviModule *m)
 
 KVIRC_MODULE(
 	"ToolbarEditor",                                                 // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Editor for the scriptable toolbars",
 	toolbareditor_module_init,
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index e9b8bbf90..b2de12304 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -115,7 +115,6 @@ void KviTrashcanLabel::dragEnterEvent(QDragEnterEvent * e)
 }
 
 
-
 KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId,const QString &szLabel,const QString &szIconId)
 : QDialog(p)
 {
@@ -187,8 +186,6 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
 	
 	g->setRowStretch(0,1);
 	g->setColStretch(2,1);
-
-
 }
 
 KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog()
@@ -223,7 +220,6 @@ void KviCustomToolBarPropertiesDialog::iconButtonClicked()
 	iconSelected(s);
 }
 
-
 void KviCustomToolBarPropertiesDialog::labelTextChanged(const QString &s)
 {
 	if(m_szOriginalId.isEmpty())
@@ -233,7 +229,6 @@ void KviCustomToolBarPropertiesDialog::labelTextChanged(const QString &s)
 	}
 }
 
-
 void KviCustomToolBarPropertiesDialog::okClicked()
 {
 	if(m_szLabel.isEmpty())
@@ -362,7 +357,6 @@ void KviCustomizeToolBarsDialog::showEvent(QShowEvent * e)
 //	move(x,y);
 }
 
-
 void KviCustomizeToolBarsDialog::deleteToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
@@ -451,7 +445,6 @@ void KviCustomizeToolBarsDialog::exportToolBar()
 	{
 		QMessageBox::warning(this,__tr2qs("Write Failed - KVIrc"),__tr2qs("Unable to write to the toolbar file."),__tr2qs("OK"));
 	}
-
 }
 
 void KviCustomizeToolBarsDialog::renameToolBar()
@@ -532,4 +525,3 @@ void KviCustomizeToolBarsDialog::closeEvent(QCloseEvent * e)
 	e->ignore();
 	delete this;
 }
-
diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/toolbareditor.h
index fe4623e96..c99354950 100644
--- a/src/modules/toolbareditor/toolbareditor.h
+++ b/src/modules/toolbareditor/toolbareditor.h
@@ -25,14 +25,19 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qdialog.h>
-#include <qcolor.h>
 
+#include <QWidget>
+#include <QLabel>
+#include <QDialog>
+#include <QColor>
+
+class QTimer;
+class QLineEdit;
+class QPushButton;
 class QPushButton;
 class KviActionDrawer;
 
+
 class KviCustomizeToolBarsDialog : public QDialog
 {
 	Q_OBJECT
@@ -62,8 +67,6 @@ protected slots:
 	void currentToolBarChanged();
 };
 
-class QLineEdit;
-class QPushButton;
 
 class KviCustomToolBarPropertiesDialog : public QDialog
 {
@@ -95,7 +98,6 @@ protected:
 	void iconSelected(const QString &szIconId);
 };
 
-class QTimer;
 
 class KviTrashcanLabel : public QLabel
 {