removed useless KviTalScrollView class and windowstate header

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

10 files changed, 18 insertions, 169 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index c1332b8c8..97dcd5881 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -32,7 +32,6 @@ SET(kvilib_MOC_HDRS
 	tal/kvi_tal_mainwindow.h
 	tal/kvi_tal_menubar.h
 	tal/kvi_tal_popupmenu.h
-	tal/kvi_tal_scrollview.h
 	tal/kvi_tal_splitter.h
 	tal/kvi_tal_tabdialog.h
 	tal/kvi_tal_tablewidget.h
@@ -110,7 +109,6 @@ SET(kvilib_SRCS
 	tal/kvi_tal_mainwindow.cpp
 	tal/kvi_tal_menubar.cpp
 	tal/kvi_tal_popupmenu.cpp
-	tal/kvi_tal_scrollview.cpp
 	tal/kvi_tal_tabdialog.cpp
 	tal/kvi_tal_tablewidget.cpp
 	tal/kvi_tal_toolbar.cpp
diff --git a/src/kvilib/tal/kvi_tal_scrollview.cpp b/src/kvilib/tal/kvi_tal_scrollview.cpp
deleted file mode 100644
index 8bb7f6c00..000000000
--- a/src/kvilib/tal/kvi_tal_scrollview.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//=============================================================================
-//
-//   File : kvi_tal_scrollview.cpp
-//   Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2008 Alessandro Carbone (elfonol at gmail dot com)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-#include "kvi_tal_scrollview.h"
-
-int KviTalScrollView::childX(QWidget * child)
-{
-	return child->x();
-}
-
-int KviTalScrollView::childY(QWidget * child)
-{
-	return child->y();
-}
-
-void KviTalScrollView::moveChild(QWidget * child, int x, int y)
-{
-	child->move(x,y);
-}
-
-void KviTalScrollView::resizeContents(int w, int h)
-{
-	viewport()->resize(w,h);
-}
-
-void KviTalScrollView::addChild(QWidget * child, int x, int y)
-{
-	child->setParent(this);
-	child->move(x,y);
-}
-
-int KviTalScrollView::visibleWidth()
-{
-	return width();
-}
-
-int KviTalScrollView::visibleHeight()
-{
-	return height();
-}
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "kvi_tal_scrollview.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvilib/tal/kvi_tal_scrollview.h b/src/kvilib/tal/kvi_tal_scrollview.h
deleted file mode 100644
index 2320854f0..000000000
--- a/src/kvilib/tal/kvi_tal_scrollview.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _KVI_TAL_SCROLLVIEW_H_
-#define _KVI_TAL_SCROLLVIEW_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_scrollview.h
-//   Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2008 Alessandro Carbone (elfonol at gmail dot com)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <QScrollArea>
-
-class KVILIB_API KviTalScrollView : public QScrollArea
-{
-	Q_OBJECT
-public:
-	KviTalScrollView(QWidget * pParent)
-	: QScrollArea(pParent) {};
-	virtual ~KviTalScrollView() {};
-	int childX(QWidget * child);
-	int childY(QWidget * child);
-	void moveChild(QWidget * child, int x,int y);
-	void resizeContents(int w, int h);
-	void addChild(QWidget * child, int x, int y);
-	int visibleWidth();
-	int visibleHeight();
-};
-
-#endif // _KVI_TAL_SCROLLVIEW_QT_H_
diff --git a/src/kvilib/tal/kvi_tal_windowstate.h b/src/kvilib/tal/kvi_tal_windowstate.h
deleted file mode 100644
index 7b2c1f177..000000000
--- a/src/kvilib/tal/kvi_tal_windowstate.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _KVI_TAL_WINDOWSTATE_H_
-#define _KVI_TAL_WINDOWSTATE_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_windowstate.h
-//   Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2008 Alessandro Carbone (elfonol at gmail dot com)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#define QT_WINDOWSTATE_FLAGS Qt::WindowState
-
-#define QT_WINDOWSTATE_MAXIMIZED Qt::WindowMaximized
-#define QT_WINDOWSTATE_MINIMIZED Qt::WindowMinimized
-
-#endif // _KVI_TAL_WINDOWSTATE_H_
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index 6e2a8c827..9058a5840 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -33,7 +33,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
-#include "kvi_tal_scrollview.h"
+//#include "kvi_tal_scrollview.h"
 
 #include <QWidget>
 #include <QFrame>
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index d12603324..c3c3ae99c 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -32,8 +32,8 @@
 #include "kvi_channel.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_toolwindows_container.h"
-#include "kvi_tal_scrollview.h"
 
+#include <QScrollArea>
 #include <QLayout>
 #include <QLabel>
 
@@ -69,9 +69,9 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 
 	setFocusPolicy(Qt::ClickFocus);
 
-	KviTalScrollView *pScrollView = new KviTalScrollView(this);
-	pScrollView->viewport()->setBackgroundRole(QPalette::Background);
-	pMasterLayout->addWidget(pScrollView,0,0);
+	QScrollArea * pScrollArea = new QScrollArea(this);
+	pScrollArea->viewport()->setBackgroundRole(QPalette::Background);
+	pMasterLayout->addWidget(pScrollArea,0,0);
 
 	pMasterLayout->setRowStretch(1,1);
 	QPushButton * b;
@@ -81,7 +81,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 	pMasterLayout->addWidget(b,1,0);
 	connect(b,SIGNAL(clicked()),this,SLOT(commit()));
 
-	QWidget * pBackground = new QWidget(pScrollView->viewport());
+	QWidget * pBackground = new QWidget(pScrollArea->viewport());
 
 	QGridLayout *g = new QGridLayout(pBackground);
 
@@ -197,7 +197,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 	g->setRowStretch(i,1);
 	g->setColumnStretch(2,1);
 
-	pScrollView->setWidget(pBackground);
+	pScrollArea->setWidget(pBackground);
 }
 
 KviModeEditor::~KviModeEditor()
diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h
index 20a21d6aa..aae14c343 100644
--- a/src/kvirc/ui/kvi_modeeditor.h
+++ b/src/kvirc/ui/kvi_modeeditor.h
@@ -49,14 +49,14 @@ public:
 	KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const QString &mode,const QString &key,const QString &limit);
 	~KviModeEditor();
 protected: // fields
-	QString m_szMode;
-	QString m_szKey;
-	QString m_szLimit;
+	QString                     m_szMode;
+	QString                     m_szKey;
+	QString                     m_szLimit;
 	KviPointerList<QCheckBox> * m_pCheckBoxes;
-	QCheckBox * m_pLimitBox;
-	QLineEdit * m_pLimitEdit;
-	QCheckBox * m_pKeyBox;
-	QLineEdit * m_pKeyEdit;
+	QCheckBox                 * m_pLimitBox;
+	QLineEdit                 * m_pLimitEdit;
+	QCheckBox                 * m_pKeyBox;
+	QLineEdit                 * m_pKeyEdit;
 signals:
 	void setMode(const char *);
 	void done();
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index ba971b716..cad878b13 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -263,7 +263,7 @@ void KviPasswordLineEdit::setText(const QString& text){
 }
 
 KviPixmapPreview::KviPixmapPreview(QWidget * par)
-: KviTalScrollView(par)
+: QScrollArea(par)
 {
 	m_pLabPixmap = new QLabel;
 	setWidget(m_pLabPixmap);
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index 7c6815844..b5934dadc 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -31,10 +31,10 @@
 #include "kvi_pixmap.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
-#include "kvi_tal_scrollview.h"
 #include "kvi_tal_listwidget.h"
-#include <QTreeWidget>
 
+#include <QTreeWidget>
+#include <QScrollArea>
 #include <QCheckBox>
 #include <QLineEdit>
 #include <QLabel>
@@ -149,7 +149,7 @@ protected slots:
 	void checkToggled(int state);
 };
 
-class KVIRC_API KviPixmapPreview : public KviTalScrollView
+class KVIRC_API KviPixmapPreview : public QScrollArea
 {
 	Q_OBJECT
 public:
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 56f1849bf..9ac75705b 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -44,7 +44,6 @@
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_groupbox.h"
-#include "kvi_tal_scrollview.h"
 
 #include <QScrollBar>
 #include <QLayout>