From 3e40ba08f9b39c83d61d709d2babc23b95ee1147 Mon Sep 17 00:00:00 2001
From: coolo <coolo@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Date: Mon, 3 Dec 2007 18:16:24 +0000
Subject: [PATCH] give duncan something to grep for :)

git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/coolo/qt4-port@42636 e0cc52ee-31ee-0310-8b87-e83c4596d67c
---
 src/CMakeLists.txt          |  2 +-
 src/YQCheckBoxFrame.cc      |  1 -
 src/YQDateField.cc          |  1 -
 src/YQDateField.h           |  3 ++-
 src/YQDownloadProgress.cc   |  1 -
 src/YQFrame.cc              |  1 -
 src/YQFrame.h               |  2 +-
 src/YQIconPool.h            |  2 +-
 src/YQLabel.cc              |  1 -
 src/YQLogView.cc            |  1 -
 src/YQLogView.h             |  2 +-
 src/YQMultiLineEdit.cc      |  1 -
 src/YQMultiProgressMeter.cc | 11 ++++-------
 src/YQRadioButton.h         |  3 +--
 14 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38b63a2..d8c7c57 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_QT3SUPPORT_INCLUDE_DIR} "${CMAKE_SOURCE_DIR}/src/pkg" )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/src/pkg" )
 
 ADD_DEFINITIONS(
 -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS}
diff --git a/src/YQCheckBoxFrame.cc b/src/YQCheckBoxFrame.cc
index f507add..95338d5 100644
--- a/src/YQCheckBoxFrame.cc
+++ b/src/YQCheckBoxFrame.cc
@@ -21,7 +21,6 @@
 #include <ycp/y2log.h>
 #include <qcheckbox.h>
 //Added by qt3to4:
-#include <q3frame.h>
 #include <Q3GroupBox>
 #include <qevent.h>
 #include "YQUI.h"
diff --git a/src/YQDateField.cc b/src/YQDateField.cc
index 9c80ae8..b08045c 100644
--- a/src/YQDateField.cc
+++ b/src/YQDateField.cc
@@ -21,7 +21,6 @@
 #include <ycp/y2log.h>
 
 #include <qdatetimeedit.h>
-#include <q3datetimeedit.h>
 #include <QVBoxLayout>
 
 #include "utf8.h"
diff --git a/src/YQDateField.h b/src/YQDateField.h
index 68dd5e9..2d975d0 100644
--- a/src/YQDateField.h
+++ b/src/YQDateField.h
@@ -21,9 +21,10 @@
 #define YQDateField_h
 
 #include <QFrame>
+#include <Qt3Support/Q3DateEdit>
+
 #include "YDateField.h"
 
-class Q3DateEdit;
 class YQWidgetCaption;
 
 
diff --git a/src/YQDownloadProgress.cc b/src/YQDownloadProgress.cc
index b9bab6a..6c426a5 100644
--- a/src/YQDownloadProgress.cc
+++ b/src/YQDownloadProgress.cc
@@ -18,7 +18,6 @@
 
 
 #include <qlabel.h>
-#include <q3progressbar.h>
 #include <qtimer.h>
 #define y2log_component "qt-ui"
 #include <ycp/y2log.h>
diff --git a/src/YQFrame.cc b/src/YQFrame.cc
index 47efcfd..f3694a9 100644
--- a/src/YQFrame.cc
+++ b/src/YQFrame.cc
@@ -22,7 +22,6 @@
 #include "YQUI.h"
 #include "utf8.h"
 //Added by qt3to4:
-#include <q3frame.h>
 
 using std::max;
 
diff --git a/src/YQFrame.h b/src/YQFrame.h
index 9674fb4..dd8664c 100644
--- a/src/YQFrame.h
+++ b/src/YQFrame.h
@@ -20,9 +20,9 @@
 #ifndef YQFrame_h
 #define YQFrame_h
 
-#include <Qt3Support/q3groupbox.h>
 
 #include "YFrame.h"
+#include <Qt3Support/Q3GroupBox>
 
 class QWidget;
 
diff --git a/src/YQIconPool.h b/src/YQIconPool.h
index f845fe0..04ad6d1 100644
--- a/src/YQIconPool.h
+++ b/src/YQIconPool.h
@@ -21,7 +21,7 @@
 #define YQIconPool_h
 
 #include <qpixmap.h>
-#include <q3ptrdict.h>
+#include <Qt3Support/Q3PtrDict>
 
 class YQIconPool
 {
diff --git a/src/YQLabel.cc b/src/YQLabel.cc
index dba5f25..44c519b 100644
--- a/src/YQLabel.cc
+++ b/src/YQLabel.cc
@@ -25,7 +25,6 @@
 #include "YQApplication.h"
 #include "YQLabel.h"
 //Added by qt3to4:
-#include <q3frame.h>
 #include <qlabel.h>
 
 
diff --git a/src/YQLogView.cc b/src/YQLogView.cc
index 77faefc..88cc598 100644
--- a/src/YQLogView.cc
+++ b/src/YQLogView.cc
@@ -19,7 +19,6 @@
 
 #include <qlabel.h>
 #include <qstyle.h>
-#include <q3multilineedit.h>
 #include <QVBoxLayout>
 #define y2log_component "qt-ui"
 #include <ycp/y2log.h>
diff --git a/src/YQLogView.h b/src/YQLogView.h
index 673b4e5..6f1f283 100644
--- a/src/YQLogView.h
+++ b/src/YQLogView.h
@@ -21,11 +21,11 @@
 #define YQLogView_h
 
 #include <QFrame>
+#include <Qt3Support/Q3MultiLineEdit>
 
 #include "YLogView.h"
 
 class YQWidgetCaption;
-class Q3MultiLineEdit;
 
 
 class YQLogView : public QFrame, public YLogView
diff --git a/src/YQMultiLineEdit.cc b/src/YQMultiLineEdit.cc
index bb668b6..a031085 100644
--- a/src/YQMultiLineEdit.cc
+++ b/src/YQMultiLineEdit.cc
@@ -17,7 +17,6 @@
 /-*/
 
 
-#include <q3multilineedit.h>
 #include <QVBoxLayout>
 #include <QTextEdit>
 #include <qlabel.h>
diff --git a/src/YQMultiProgressMeter.cc b/src/YQMultiProgressMeter.cc
index 3eb7f38..83f5724 100644
--- a/src/YQMultiProgressMeter.cc
+++ b/src/YQMultiProgressMeter.cc
@@ -21,10 +21,7 @@
 #include <ycp/y2log.h>
 
 #include <qevent.h>
-//Added by qt3to4:
-#include <q3pointarray.h>
-#include <qevent.h>
-#include <qevent.h>
+#include <Qt3Support/Q3PointArray>
 
 #include "YQUI.h"
 #include "YQMultiProgressMeter.h"
@@ -260,7 +257,7 @@ void YQMultiProgressMeter::drawSegment( int segment,
 	{
 	    Q3PointArray points( 4 );
 	    int p=0;
-    
+
 	    points.setPoint( p++, offset + fillStart,	border + fillHeight );
 	    points.setPoint( p++, offset + fillStart, 	border + thickness - fillHeight );
 	    points.setPoint( p++, offset + length, 	border + thickness - indent );
@@ -277,7 +274,7 @@ void YQMultiProgressMeter::drawSegment( int segment,
 	{
 	    Q3PointArray points( 4 );
 	    int p=0;
-    
+
 	    points.setPoint( p++, offset, 		border + thickness );
 	    points.setPoint( p++, offset, 		border );
 	    points.setPoint( p++, offset + fillStart,	border + fillHeight );
@@ -334,7 +331,7 @@ void YQMultiProgressMeter::drawMarkers( QPainter & painter, int offset, int thic
     const QBrush & color = palette().foreground();
     painter.setBrush( color );
     // painter.setBrush( NoBrush );
-    
+
 
     // Draw upper marker triangle
 
diff --git a/src/YQRadioButton.h b/src/YQRadioButton.h
index 362b077..fd55d2a 100644
--- a/src/YQRadioButton.h
+++ b/src/YQRadioButton.h
@@ -20,9 +20,8 @@
 #ifndef YQRadioButton_h
 #define YQRadioButton_h
 
-#include <q3groupbox.h>
 #include "YRadioButton.h"
-
+#include <Qt3Support/Q3GroupBox>
 
 
 class QRadioButton;
-- 
2.39.2