From ff52df42ac31ca20675b1b41d2a862cd6a426302 Mon Sep 17 00:00:00 2001
From: Elvio Basello
Date: Tue, 29 Apr 2008 20:11:01 +0000
Subject: removed useless class; fixed cmake/automake rules; little fixes
 around

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1625 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 TODO-Qt4                             |  6 ----
 src/kvilib/CMakeLists.txt            |  2 --
 src/kvilib/build/Makefile.am         |  3 --
 src/kvilib/core/kvi_qcstring.h       |  2 +-
 src/kvilib/tal/kvi_tal_grid.cpp      | 64 ------------------------------------
 src/kvilib/tal/kvi_tal_grid.h        | 47 --------------------------
 src/kvilib/tal/kvi_tal_tabdialog.cpp |  1 -
 src/kvirc/ui/kvi_query.cpp           | 11 ++++---
 src/kvirc/ui/kvi_query.h             |  2 --
 9 files changed, 7 insertions(+), 131 deletions(-)
 delete mode 100644 src/kvilib/tal/kvi_tal_grid.cpp
 delete mode 100644 src/kvilib/tal/kvi_tal_grid.h

diff --git a/TODO-Qt4 b/TODO-Qt4
index 8945340fd..97f704108 100644
--- a/TODO-Qt4
+++ b/TODO-Qt4
@@ -6,11 +6,7 @@ os simply they're still the old unchecked kvirc3 files.
 PLEASE KEEP THIS FILE UPDATED!
 
 src/kvilib
-src/kvilib/core
-	kvi_qcstring.h
-	kvi_valuelist.h
 src/kvilib/ext
-	kvi_accel.h
 	kvi_crypt.cpp
 	kvi_crypt.h
 	kvi_dcophelper.cpp
@@ -26,8 +22,6 @@ src/kvilib/system
 	kvi_thread.cpp
 	kvi_thread.h
 src/kvilib/tal
-	kvi_tal_grid.cpp
-	kvi_tal_grid.h
 	kvi_tal_groupbox.h
 	kvi_tal_iconview.cpp
 	kvi_tal_iconview.h
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index a46764e2d..b3634d30e 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -81,7 +81,6 @@ SET(kvilib_MOC_HDRS
 	system/kvi_time.h
 	tal/kvi_tal_popupmenu.h
 	tal/kvi_tal_application.h
-	tal/kvi_tal_grid.h
 	tal/kvi_tal_groupbox.h
 	tal/kvi_tal_hbox.h
 	tal/kvi_tal_iconview.h
@@ -171,7 +170,6 @@ SET(kvilib_SRCS
 	system/kvi_time.cpp
 	tal/kvi_tal_application.cpp
 	tal/kvi_tal_filedialog.cpp
-	tal/kvi_tal_grid.cpp
 	tal/kvi_tal_groupbox.cpp
 	tal/kvi_tal_hbox.cpp
 	tal/kvi_tal_iconview.cpp
diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index 867d4879f..b36a0d3a2 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -80,7 +80,6 @@ libkvilib4_la_SOURCES = \
 	../system/kvi_time.cpp \
 	../tal/kvi_tal_application.cpp \
 	../tal/kvi_tal_filedialog.cpp \
-	../tal/kvi_tal_grid.cpp \
 	../tal/kvi_tal_groupbox.cpp \
 	../tal/kvi_tal_hbox.cpp \
 	../tal/kvi_tal_iconview.cpp \
@@ -181,7 +180,6 @@ headers_HEADERS = \
 	../tal/kvi_tal_filedialog.h \
 	../tal/kvi_tal_filedialog_kde.h \
 	../tal/kvi_tal_filedialog_qt.h \
-	../tal/kvi_tal_grid.h \
 	../tal/kvi_tal_groupbox.h \
 	../tal/kvi_tal_hbox.h \
 	../tal/kvi_tal_iconview.h \
@@ -251,7 +249,6 @@ headers_HEADERS = \
 ../tal/kvi_tal_menubar.cpp: ../tal/kvi_tal_menubar_qt.moc
 ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_kde.moc
 ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_qt.moc
-../tal/kvi_tal_grid.cpp: ../tal/kvi_tal_grid.moc
 ../tal/kvi_tal_groupbox.cpp: ../tal/kvi_tal_groupbox.moc
 ../tal/kvi_tal_hbox.cpp: ../tal/kvi_tal_hbox.moc
 ../tal/kvi_tal_vbox.cpp: ../tal/kvi_tal_vbox.moc
diff --git a/src/kvilib/core/kvi_qcstring.h b/src/kvilib/core/kvi_qcstring.h
index a7fff6f34..d51edfea0 100644
--- a/src/kvilib/core/kvi_qcstring.h
+++ b/src/kvilib/core/kvi_qcstring.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 
-#include <QByteArray> // includes <qbytearray.h>
+#include <QByteArray>
 #define KviQCString QByteArray
 
 #endif //!_KVI_QCSTRING_H_
diff --git a/src/kvilib/tal/kvi_tal_grid.cpp b/src/kvilib/tal/kvi_tal_grid.cpp
deleted file mode 100644
index a499b2fa9..000000000
--- a/src/kvilib/tal/kvi_tal_grid.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//=============================================================================
-//
-//   File : kvi_tal_grid.cpp
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   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. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#define __KVILIB__
-#include "kvi_tal_grid.h"
- 
-#include <QWidget>
-#include <QLayout>
-#include <QChildEvent>
-
- 
-KviTalGrid::KviTalGrid(int n,Qt::Orientation orient,QWidget * pParent)
-: QWidget(pParent)
-{
-	if (orient==Qt::Horizontal)
-		m_pLayout=new QHBoxLayout(this);
-	else m_pLayout= new QVBoxLayout(this);
-	m_pLayout->setSpacing(0);
-	m_pLayout->setMargin(0);
-	setLayout(m_pLayout);
-}
-void KviTalGrid::childEvent(QChildEvent * e)
-{
-	if(!e->child()->isWidgetType()) return;
-	if(e->child()->parent() != this) return;
-
-	switch(e->type())
-	{
-		case QEvent::ChildAdded:
-			m_pLayout->addWidget((QWidget *)(e->child()));
-			break;
-		case QEvent::ChildRemoved:
-			m_pLayout->removeWidget((QWidget *)(e->child()));
-			break;
-		default:
-			break;
-	}
-}
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "kvi_tal_grid.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/kvilib/tal/kvi_tal_grid.h b/src/kvilib/tal/kvi_tal_grid.h
deleted file mode 100644
index af2ea0e90..000000000
--- a/src/kvilib/tal/kvi_tal_grid.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _KVI_TAL_GRID_H_
-#define _KVI_TAL_GRID_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_grid.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   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. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
- 
-
- 
-#include <QWidget>
-#include <QLayout>
-
-class KVILIB_API KviTalGrid : public QWidget
-{
-	Q_OBJECT
-public:
-	KviTalGrid(int n,Qt::Orientation orient,QWidget * pParent = 0);
-	~KviTalGrid(){};
-protected:
-virtual void childEvent(QChildEvent * e);
-QLayout *m_pLayout;
-};
- 
-#endif // _KVI_TAL_GRID_H_
- 
\ No newline at end of file
diff --git a/src/kvilib/tal/kvi_tal_tabdialog.cpp b/src/kvilib/tal/kvi_tal_tabdialog.cpp
index a7f4ea976..6bbd306b3 100644
--- a/src/kvilib/tal/kvi_tal_tabdialog.cpp
+++ b/src/kvilib/tal/kvi_tal_tabdialog.cpp
@@ -29,7 +29,6 @@
 #include <QDialog>
 #include <QTabWidget>
 #include <QGridLayout>
-#include <QTabWidget>
 #include <QPushButton>
 
 KviTalTabDialog::KviTalTabDialog(QWidget * pParent,const char * name,bool bModal)
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index dc0562b11..f29552a8b 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -78,11 +78,12 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick)
 
 	// The button box on the right
 	//KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box");
-	m_pButtonGrid= (QFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox);
+	m_pButtonGrid= (QFrame*) new KviTalHBox(m_pButtonBox);
 	
 	createTextEncodingButton(m_pButtonGrid);
 
-	m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pSplitter->setObjectName("main_splitter");
 	m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 	//m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter);
@@ -151,8 +152,8 @@ QString KviQuery::getInfoLabelTipText()
 		{
 		
 			txt = "<html>" \
-					"<body>" \
-						"<table width=\"100%\">";
+				"<body>" \
+				"<table width=\"100%\">";
 		
 			txt +=          START_TABLE_BOLD_ROW;
 			txt += __tr2qs("Query target:");
@@ -170,7 +171,7 @@ QString KviQuery::getInfoLabelTipText()
 			
 			txt += tmp;
 			
-			txt +=          "</td></tr>";
+			txt += "</td></tr>";
 			
 			if(e->hasServer())
 			{
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index da6be85e8..9b83d0c07 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -31,12 +31,10 @@
 #include "kvi_userlistview.h"
 #include "kvi_themedlabel.h"
 #include "kvi_pointerhashtable.h"
-#include "kvi_tal_grid.h"
 
 class KviConsole;
 class KviConfig;
 class KviWindowToolPageButton;
-class QSplitter;
 
 #define KVI_QUERY_FLAG_DEAD 1
 
-- 
cgit v1.3.1-10-gc9f91