From 587bce2650fa41fc3868225f9526d0c5adf86647 Mon Sep 17 00:00:00 2001
From: uwolfer <uwolfer@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 29 Nov 2005 13:08:53 +0000
Subject: [PATCH] less Q3 (remove a lot of unused Q3 headers, port small
 things)

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@484116 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kopete/libkopete/avdevice/videodevicepool.h       | 1 -
 kopete/libkopete/knotification.cpp                | 2 --
 kopete/libkopete/knotifydialog.cpp                | 4 ----
 kopete/libkopete/kopeteaccountmanager.cpp         | 2 --
 kopete/libkopete/kopeteaway.cpp                   | 3 +--
 kopete/libkopete/kopeteaway.h                     | 1 -
 kopete/libkopete/kopetechatsession.h              | 2 --
 kopete/libkopete/kopetecontact.cpp                | 5 ++---
 kopete/libkopete/kopetecontact.h                  | 3 +--
 kopete/libkopete/kopetecontactlist.cpp            | 1 -
 kopete/libkopete/kopetecontactlist.h              | 1 -
 kopete/libkopete/kopetemessage.h                  | 1 -
 kopete/libkopete/kopetexsl.cpp                    | 1 -
 kopete/libkopete/private/kopeteviewmanager.h      | 1 -
 kopete/libkopete/ui/accountselector.cpp           | 1 -
 kopete/libkopete/ui/addressbookselectordialog.cpp | 4 ++--
 kopete/libkopete/ui/addressbookselectorwidget.cpp | 1 -
 kopete/libkopete/ui/contactaddednotifydialog.cpp  | 3 ---
 kopete/libkopete/ui/kopetefileconfirmdialog.cpp   | 1 -
 kopete/libkopete/ui/kopetelistviewitem.cpp        | 1 -
 kopete/libkopete/ui/kopeteview.h                  | 1 -
 kopete/libkopete/ui/metacontactselectorwidget.cpp | 3 ---
 22 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h
index 35e7e8c5b..081911bbd 100644
--- a/kopete/libkopete/avdevice/videodevicepool.h
+++ b/kopete/libkopete/avdevice/videodevicepool.h
@@ -18,7 +18,6 @@
 #ifndef KOPETE_AVVIDEODEVICE_H
 #define KOPETE_AVVIDEODEVICE_H
 
-#include <q3valuevector.h>
 #include <iostream>
 
 
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index 75539517b..064b96cea 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -44,9 +44,7 @@
 #include <QMap>
 #include <QPixmap>
 #include <dcopclient.h>
-#include <q3cstring.h>
 #include <qpointer.h>
-#include <q3stylesheet.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qtabwidget.h>
diff --git a/kopete/libkopete/knotifydialog.cpp b/kopete/libkopete/knotifydialog.cpp
index e6f7a1fe5..d5370d0a1 100644
--- a/kopete/libkopete/knotifydialog.cpp
+++ b/kopete/libkopete/knotifydialog.cpp
@@ -40,12 +40,8 @@
 #include "knotification.h"
 
 #include <qcheckbox.h>
-#include <q3groupbox.h>
-#include <q3header.h>
 #include <qlabel.h>
-#include <q3listview.h>
 #include <qlayout.h>
-#include <q3ptrlist.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtooltip.h>
diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index 358fab3ba..4b6122aba 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -21,8 +21,6 @@
 #include <qapplication.h>
 #include <qregexp.h>
 #include <qtimer.h>
-//Added by qt3to4:
-#include <Q3PtrList>
 
 #include <kconfig.h>
 #include <kdebug.h>
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index 70d9d8d80..c77a5429a 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -32,8 +32,7 @@
 #include <kconfig.h>
 #include <qtimer.h>
 #include <QTime>
-//Added by qt3to4:
-#include <Q3PtrList>
+
 #include <kapplication.h>
 
 #include <klocale.h>
diff --git a/kopete/libkopete/kopeteaway.h b/kopete/libkopete/kopeteaway.h
index ba4788dfa..5bfb080ee 100644
--- a/kopete/libkopete/kopeteaway.h
+++ b/kopete/libkopete/kopeteaway.h
@@ -21,7 +21,6 @@
 
 #include <qstring.h>
 #include <qobject.h>
-#include <q3valuelist.h>
 
 #include "kopeteawaydialog.h"
 #include "kopete_export.h"
diff --git a/kopete/libkopete/kopetechatsession.h b/kopete/libkopete/kopetechatsession.h
index 590da2ade..c11ad1765 100644
--- a/kopete/libkopete/kopetechatsession.h
+++ b/kopete/libkopete/kopetechatsession.h
@@ -24,8 +24,6 @@
 #define __KOPETECHATSESSION_H__
 
 #include <qobject.h>
-#include <q3ptrlist.h>
-#include <q3valuelist.h>
 
 #include <kxmlguiclient.h>
 
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index cd3352acc..419b7c875 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -20,7 +20,6 @@
 #include "kopetecontact.h"
 
 #include <qapplication.h>
-#include <Q3PtrList>
 #include <Q3StyleSheet>
 
 #include <kdebug.h>
@@ -51,7 +50,7 @@
 #include <qlabel.h>
 #include <qimage.h>
 #include <qmime.h>
-#include <q3vbox.h>
+#include <kvbox.h>
 #include <klistview.h>
 #include <qcheckbox.h>
 
@@ -264,7 +263,7 @@ void Contact::changeMetaContact()
 	KDialogBase *moveDialog = new KDialogBase( Kopete::UI::Global::mainWidget(), "moveDialog", true, i18n( "Move Contact" ),
 		KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true );
 
-	Q3VBox *w = new Q3VBox( moveDialog );
+	KVBox *w = new KVBox( moveDialog );
 	w->setSpacing( KDialog::spacingHint() );
 	Kopete::UI::MetaContactSelectorWidget *selector = new Kopete::UI::MetaContactSelectorWidget(w);
 	selector->setLabelMessage(i18n( "Select the meta contact to which you want to move this contact:" ));
diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h
index 4f5b386c0..2d324aa6d 100644
--- a/kopete/libkopete/kopetecontact.h
+++ b/kopete/libkopete/kopetecontact.h
@@ -21,8 +21,7 @@
 #define __KOPETECONTACT_H__
 
 #include <qobject.h>
-//Added by qt3to4:
-#include <Q3PtrList>
+
 #include <kurl.h>
 #include <kdemacros.h>
 #include "kopeteglobal.h"
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index 73d127ebd..34fa4a7fb 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -25,7 +25,6 @@
 #include <qtimer.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PtrList>
 
 #include <kapplication.h>
 #include <kabc/stdaddressbook.h>
diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h
index 0649662b2..a1201ebe2 100644
--- a/kopete/libkopete/kopetecontactlist.h
+++ b/kopete/libkopete/kopetecontactlist.h
@@ -20,7 +20,6 @@
 #define KOPETECONTACTLIST_H__
 
 #include <qobject.h>
-#include <q3ptrlist.h>
 #include <QList>
 
 #include "kopete_export.h"
diff --git a/kopete/libkopete/kopetemessage.h b/kopete/libkopete/kopetemessage.h
index 738c60930..89edb6939 100644
--- a/kopete/libkopete/kopetemessage.h
+++ b/kopete/libkopete/kopetemessage.h
@@ -21,7 +21,6 @@
 
 #include "kopetecontact.h"
 
-#include <q3ptrlist.h>
 #include <qstring.h>
 #include <qdom.h>
 #include <qcolor.h>
diff --git a/kopete/libkopete/kopetexsl.cpp b/kopete/libkopete/kopetexsl.cpp
index edb3dfde1..4e92e515e 100644
--- a/kopete/libkopete/kopetexsl.cpp
+++ b/kopete/libkopete/kopetexsl.cpp
@@ -34,7 +34,6 @@
 
 #include <qregexp.h>
 #include <q3signal.h>
-#include <q3stylesheet.h>
 #include <qthread.h>
 #include <qevent.h>
 #include <qmutex.h>
diff --git a/kopete/libkopete/private/kopeteviewmanager.h b/kopete/libkopete/private/kopeteviewmanager.h
index ccf3241d4..3e33ce6a8 100644
--- a/kopete/libkopete/private/kopeteviewmanager.h
+++ b/kopete/libkopete/private/kopeteviewmanager.h
@@ -29,7 +29,6 @@ namespace Kopete
 }
 
 class KopeteView;
-class Q3TextEdit;
 
 struct KopeteViewManagerPrivate;
 
diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index 3b8fa517e..a01a2ec19 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -24,7 +24,6 @@
 #include <qpixmap.h>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <Q3PtrList>
 
 #include <kdebug.h>
 #include <klistview.h>
diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp
index 0100b35e8..1ee149d23 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbookselectordialog.cpp
@@ -21,7 +21,7 @@
 #include <kdialogbase.h>
 #include <qdialog.h>
 #include <q3listview.h>
-#include <q3vbox.h>
+#include <kvbox.h>
 #include <klocale.h>
 #include <kdialog.h>
 
@@ -32,7 +32,7 @@ namespace UI
 
 AddressBookSelectorDialog::AddressBookSelectorDialog(const QString &title, const QString &message, const QString &preSelectUid, QWidget *parent, const char *name, bool modal ) : KDialogBase(parent, name, modal, title, Help|Ok|Cancel, Ok, true )
 {
-	Q3VBox *vbox=new Q3VBox(this);
+	KVBox *vbox=new KVBox(this);
 	m_addressBookSelectorWidget= new AddressBookSelectorWidget(vbox);
 	m_addressBookSelectorWidget->setLabelMessage(message);	
 
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 85b141975..a6e12b683 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -41,7 +41,6 @@
 #include <klistviewsearchline.h>
 #include <qlabel.h>
 #include <qtooltip.h>
-#include <q3whatsthis.h>
 
 #include "addressbookselectorwidget.h"
 #include <addresseeitem.h>
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index 6302454ec..76bc3673c 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -16,11 +16,8 @@
 #include "contactaddednotifydialog.h"
 
 
-#include <q3vbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
-#include <q3groupbox.h>
-#include <q3stylesheet.h>
 #include <qapplication.h>
 
 #include <klocale.h>
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index d3095cdf3..adcb50b9e 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -15,7 +15,6 @@
     *************************************************************************
 */
 
-#include <q3textedit.h>
 //Added by qt3to4:
 #include <QCloseEvent>
 
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index 073935f51..a728d866c 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -32,7 +32,6 @@
 #include <qapplication.h>
 #include <qpixmap.h>
 #include <qpainter.h>
-#include <q3ptrlist.h>
 #include <qrect.h>
 #include <qtimer.h>
 #include <q3header.h>
diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h
index 330d27c02..5f13066a1 100644
--- a/kopete/libkopete/ui/kopeteview.h
+++ b/kopete/libkopete/ui/kopeteview.h
@@ -20,7 +20,6 @@
 #define KOPETEVIEW_H
 
 #include "kopetemessage.h"
-#include <q3valuelist.h>
 #include "kopete_export.h"
 
 namespace Kopete
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index ba4372858..a11bbc8cc 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -18,15 +18,12 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qtooltip.h>
-#include <q3whatsthis.h>
-#include <q3vbox.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qlayout.h>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <Q3PtrList>
 #include <QBoxLayout>
 
 #include <kapplication.h>
-- 
2.11.4.GIT