[yast-commit] r42636 - /branches/tmp/coolo/qt4-port/src/ - YaST Commits

3 Dec 2007

Author: coolo
Date: Mon Dec  3 19:16:24 2007
New Revision: 42636

URL: http://svn.opensuse.org/viewcvs/yast?rev=42636&view=rev
Log:
give duncan something to grep for :)

Modified:
    branches/tmp/coolo/qt4-port/src/CMakeLists.txt
    branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc
    branches/tmp/coolo/qt4-port/src/YQDateField.cc
    branches/tmp/coolo/qt4-port/src/YQDateField.h
    branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc
    branches/tmp/coolo/qt4-port/src/YQFrame.cc
    branches/tmp/coolo/qt4-port/src/YQFrame.h
    branches/tmp/coolo/qt4-port/src/YQIconPool.h
    branches/tmp/coolo/qt4-port/src/YQLabel.cc
    branches/tmp/coolo/qt4-port/src/YQLogView.cc
    branches/tmp/coolo/qt4-port/src/YQLogView.h
    branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc
    branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc
    branches/tmp/coolo/qt4-port/src/YQRadioButton.h

Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeLi...
==============================================================================

--- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original)
+++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Mon Dec  3 19:16:24 2007
@@ -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}

Modified: branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQCheck...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc Mon Dec  3 19:16:24 2007
@@ -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"

Modified: branches/tmp/coolo/qt4-port/src/YQDateField.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDateF...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQDateField.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQDateField.cc Mon Dec  3 19:16:24 2007
@@ -21,7 +21,6 @@
 #include <ycp/y2log.h>
 
 #include <qdatetimeedit.h>
-#include <q3datetimeedit.h>
 #include <QVBoxLayout>
 
 #include "utf8.h"

Modified: branches/tmp/coolo/qt4-port/src/YQDateField.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDateF...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQDateField.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQDateField.h Mon Dec  3 19:16:24 2007
@@ -21,9 +21,10 @@
 #define YQDateField_h
 
 #include <QFrame>
+#include <Qt3Support/Q3DateEdit>
+
 #include "YDateField.h"
 
-class Q3DateEdit;
 class YQWidgetCaption;
 
 

Modified: branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDownl...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc Mon Dec  3 19:16:24 2007
@@ -18,7 +18,6 @@
 
 
 #include <qlabel.h>
-#include <q3progressbar.h>
 #include <qtimer.h>
 #define y2log_component "qt-ui"
 #include <ycp/y2log.h>

Modified: branches/tmp/coolo/qt4-port/src/YQFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFrame...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQFrame.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQFrame.cc Mon Dec  3 19:16:24 2007
@@ -22,7 +22,6 @@
 #include "YQUI.h"
 #include "utf8.h"
 //Added by qt3to4:
-#include <q3frame.h>
 
 using std::max;
 

Modified: branches/tmp/coolo/qt4-port/src/YQFrame.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFrame...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQFrame.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQFrame.h Mon Dec  3 19:16:24 2007
@@ -20,9 +20,9 @@
 #ifndef YQFrame_h
 #define YQFrame_h
 
-#include <Qt3Support/q3groupbox.h>
 
 #include "YFrame.h"
+#include <Qt3Support/Q3GroupBox>
 
 class QWidget;
 

Modified: branches/tmp/coolo/qt4-port/src/YQIconPool.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIconP...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQIconPool.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQIconPool.h Mon Dec  3 19:16:24 2007
@@ -21,7 +21,7 @@
 #define YQIconPool_h
 
 #include <qpixmap.h>
-#include <q3ptrdict.h>
+#include <Qt3Support/Q3PtrDict>
 
 class YQIconPool
 {

Modified: branches/tmp/coolo/qt4-port/src/YQLabel.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLabel...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQLabel.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQLabel.cc Mon Dec  3 19:16:24 2007
@@ -25,7 +25,6 @@
 #include "YQApplication.h"
 #include "YQLabel.h"
 //Added by qt3to4:
-#include <q3frame.h>
 #include <qlabel.h>
 
 

Modified: branches/tmp/coolo/qt4-port/src/YQLogView.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogVi...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQLogView.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQLogView.cc Mon Dec  3 19:16:24 2007
@@ -19,7 +19,6 @@
 
 #include <qlabel.h>
 #include <qstyle.h>
-#include <q3multilineedit.h>
 #include <QVBoxLayout>
 #define y2log_component "qt-ui"
 #include <ycp/y2log.h>

Modified: branches/tmp/coolo/qt4-port/src/YQLogView.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogVi...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQLogView.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQLogView.h Mon Dec  3 19:16:24 2007
@@ -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

Modified: branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMulti...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc Mon Dec  3 19:16:24 2007
@@ -17,7 +17,6 @@
 /-*/
 
 
-#include <q3multilineedit.h>
 #include <QVBoxLayout>
 #include <QTextEdit>
 #include <qlabel.h>

Modified: branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMulti...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc Mon Dec  3 19:16:24 2007
@@ -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 @@
 	{
 	    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 @@
 	{
 	    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 @@
     const QBrush & color = palette().foreground();
     painter.setBrush( color );
     // painter.setBrush( NoBrush );
-    
+
 
     // Draw upper marker triangle
 

Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadio...
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQRadioButton.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQRadioButton.h Mon Dec  3 19:16:24 2007
@@ -20,9 +20,8 @@
 #ifndef YQRadioButton_h
 #define YQRadioButton_h
 
-#include <q3groupbox.h>
 #include "YRadioButton.h"
-
+#include <Qt3Support/Q3GroupBox>
 
 
 class QRadioButton;

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r42636 - /branches/tmp/coolo/qt4-port/src/

coolo＠svn.opensuse.org

tags

participants (1)