[yast-commit] r39717 - in /branches/tmp/sh/qt4-port/qt: ./ src/ src/pkg/

Author: sh-sh-sh Date: Thu Jul 26 15:47:28 2007 New Revision: 39717 URL: http://svn.opensuse.org/viewcvs/yast?rev=39717&view=rev Log: Initial port to Qt4 Removed: branches/tmp/sh/qt4-port/qt/src/qxembed.cc branches/tmp/sh/qt4-port/qt/src/qxembed.h Modified: branches/tmp/sh/qt4-port/qt/Makefile.cvs branches/tmp/sh/qt4-port/qt/acinclude.m4 branches/tmp/sh/qt4-port/qt/configure.in.in branches/tmp/sh/qt4-port/qt/src/Makefile.am branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.cc branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.h branches/tmp/sh/qt4-port/qt/src/QY2CharValidator.cc branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.cc branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.h branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.cc branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.h branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.cc branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.h branches/tmp/sh/qt4-port/qt/src/QY2LayoutUtils.cc branches/tmp/sh/qt4-port/qt/src/QY2ListView.cc branches/tmp/sh/qt4-port/qt/src/QY2ListView.h branches/tmp/sh/qt4-port/qt/src/QY2Settings.cc branches/tmp/sh/qt4-port/qt/src/QY2Settings.h branches/tmp/sh/qt4-port/qt/src/YQCheckBox.cc branches/tmp/sh/qt4-port/qt/src/YQCheckBox.h branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.cc branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.h branches/tmp/sh/qt4-port/qt/src/YQColoredLabel.cc branches/tmp/sh/qt4-port/qt/src/YQComboBox.cc branches/tmp/sh/qt4-port/qt/src/YQComboBox.h branches/tmp/sh/qt4-port/qt/src/YQDate.cc branches/tmp/sh/qt4-port/qt/src/YQDate.h branches/tmp/sh/qt4-port/qt/src/YQDialog.cc branches/tmp/sh/qt4-port/qt/src/YQDialog.h branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.cc branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.h branches/tmp/sh/qt4-port/qt/src/YQDumbTab.cc branches/tmp/sh/qt4-port/qt/src/YQDumbTab.h branches/tmp/sh/qt4-port/qt/src/YQFrame.cc branches/tmp/sh/qt4-port/qt/src/YQFrame.h branches/tmp/sh/qt4-port/qt/src/YQGenericButton.cc branches/tmp/sh/qt4-port/qt/src/YQGenericButton.h branches/tmp/sh/qt4-port/qt/src/YQIconPool.cc branches/tmp/sh/qt4-port/qt/src/YQIconPool.h branches/tmp/sh/qt4-port/qt/src/YQImage.cc branches/tmp/sh/qt4-port/qt/src/YQImage.h branches/tmp/sh/qt4-port/qt/src/YQIntField.cc branches/tmp/sh/qt4-port/qt/src/YQIntField.h branches/tmp/sh/qt4-port/qt/src/YQLabel.cc branches/tmp/sh/qt4-port/qt/src/YQLogView.cc branches/tmp/sh/qt4-port/qt/src/YQLogView.h branches/tmp/sh/qt4-port/qt/src/YQMenuButton.cc branches/tmp/sh/qt4-port/qt/src/YQMenuButton.h branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.cc branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.h branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.cc branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.h branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.h branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.cc branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.h branches/tmp/sh/qt4-port/qt/src/YQProgressBar.cc branches/tmp/sh/qt4-port/qt/src/YQProgressBar.h branches/tmp/sh/qt4-port/qt/src/YQPushButton.cc branches/tmp/sh/qt4-port/qt/src/YQRadioButton.cc branches/tmp/sh/qt4-port/qt/src/YQRadioButton.h branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.cc branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.h branches/tmp/sh/qt4-port/qt/src/YQRichText.cc branches/tmp/sh/qt4-port/qt/src/YQRichText.h branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.cc branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.h branches/tmp/sh/qt4-port/qt/src/YQSlider.cc branches/tmp/sh/qt4-port/qt/src/YQSlider.h branches/tmp/sh/qt4-port/qt/src/YQTable.cc branches/tmp/sh/qt4-port/qt/src/YQTable.h branches/tmp/sh/qt4-port/qt/src/YQTextEntry.cc branches/tmp/sh/qt4-port/qt/src/YQTextEntry.h branches/tmp/sh/qt4-port/qt/src/YQTime.cc branches/tmp/sh/qt4-port/qt/src/YQTime.h branches/tmp/sh/qt4-port/qt/src/YQTree.cc branches/tmp/sh/qt4-port/qt/src/YQTree.h branches/tmp/sh/qt4-port/qt/src/YQUI.h branches/tmp/sh/qt4-port/qt/src/YQUI_builtins.cc branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc branches/tmp/sh/qt4-port/qt/src/YQUI_widgets.cc branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc branches/tmp/sh/qt4-port/qt/src/YQWizard.cc branches/tmp/sh/qt4-port/qt/src/YQWizard.h branches/tmp/sh/qt4-port/qt/src/YQWizardButton.cc branches/tmp/sh/qt4-port/qt/src/pkg/Makefile.am branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgChangesDialog.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionDialog.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgLangList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgProductDialog.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelDescriptionView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTechnicalDetailsView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.h branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.cc branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.h branches/tmp/sh/qt4-port/qt/src/utf8.h branches/tmp/sh/qt4-port/qt/yast2-qt.spec.in Modified: branches/tmp/sh/qt4-port/qt/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/Makefile.cvs?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/Makefile.cvs (original) +++ branches/tmp/sh/qt4-port/qt/Makefile.cvs Thu Jul 26 15:47:28 2007 @@ -5,7 +5,7 @@ LIB = $(shell y2tool get-lib) configure: all - ./configure --libdir=/usr/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) + ./configure --libdir=/usr/$(LIB) all: y2tool y2autoconf Modified: branches/tmp/sh/qt4-port/qt/acinclude.m4 URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/acinclude.m4?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/acinclude.m4 (original) +++ branches/tmp/sh/qt4-port/qt/acinclude.m4 Thu Jul 26 15:47:28 2007 @@ -4,7 +4,7 @@ dnl See file COPYING for license dnl dnl Author: Stefan Hundhammer -dnl Updated: 2001-12-14 +dnl Updated: 2007-07-25 dnl @@ -14,11 +14,11 @@ AC_DEFUN([AC_MIN_QT_VERSION], [ AC_MSG_CHECKING([for Qt $2 or higher]) -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$QTDIR/include" +dnl save_CFLAGS="$CFLAGS" +dnl CFLAGS="$CFLAGS -I$QTDIR/include" AC_TRY_COMPILE([ -#include +#include ], [ #if QT_VERSION < $1 @@ -29,9 +29,26 @@ [AC_MSG_ERROR([Qt $2 or higher required! Check whether the Qt base packages and the Qt development packages -are installed and QTDIR is set correctly. +are installed! ])] ) -CFLAGS="$save_CFLAGS" +dnl CFLAGS="$save_CFLAGS" ]) + +dnl AC_QTDIRS +dnl Sets up directories for Qt +AC_DEFUN([AC_QTDIRS], +MOC=/usr/bin/moc +QT_INCLUDEDIR=/usr/include/Qt +QT_LIBDIR=/usr/lib +QT_SHAREDIR=/usr/share/qt4 +QT_TRANSLATIONSDIR=${QT_SHAREDIR}/translations +QT_PLUGINDIR=/usr/lib/qt4/plugins +AC_SUBST(MOC) +AC_SUBST(QT_INCLUDEDIR) +AC_SUBST(QT_LIBDIR) +AC_SUBST(QT_SHAREDIR) +AC_SUBST(QT_TRANSLATIONSDIR) +AC_SUBST(QT_PLUGINDIR) +) \ No newline at end of file Modified: branches/tmp/sh/qt4-port/qt/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/configure.in.in?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/configure.in.in (original) +++ branches/tmp/sh/qt4-port/qt/configure.in.in Thu Jul 26 15:47:28 2007 @@ -7,14 +7,15 @@ ## some common checks @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-PROGRAM@ -@YAST2-CHECKS-QT@ +@YAST2-CHECKS-QT4@ ## special stuff -AC_MIN_QT_VERSION(301,3.01) +AC_MIN_QT_VERSION(0x040201,4.2.1) +AC_QTDIRS AC_MSG_CHECKING([X font directory]) -#ugh, /etc/YaST2/XVersion is in yast2.rpm which is only built after us -#so let's hardcode, like in the spec file anyway +# /etc/YaST2/XVersion is in yast2.rpm which is only built after us +# so let's hardcode like in the spec file anyway case "$x_includes" in *X11R6*) Xfontsdir=$prefix/X11R6/lib/X11/fonts ;; *) Xfontsdir=$prefix/share/fonts ;; Modified: branches/tmp/sh/qt4-port/qt/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/Makefile.am?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/Makefile.am (original) +++ branches/tmp/sh/qt4-port/qt/src/Makefile.am Thu Jul 26 15:47:28 2007 @@ -5,19 +5,16 @@ SUBDIRS = pkg AM_CXXFLAGS = -DY2LOG=\"ui-qt\" \ + -DQT3_SUPPORT \ -DQT_THREAD_SUPPORT \ -DLOCALEDIR=\"${localedir}\" \ - -DQT_LOCALEDIR=\"$(QTDIR)/translations\" \ + -DQT_LOCALEDIR=\"$(QT_TRANSLATIONSDIR)\" \ -DICONDIR=\"${themedir}/current\" \ -DTHEMEDIR=\"${themedir}/current\" \ - -DHELPIMAGEDIR=\"${imagedir}\" \ -DLANG_FONTS_FILE=\"${lang_fontsdir}/lang_fonts\" \ - -DQTLIBDIR=\"$(QTLIBDIR)\" \ + -DQTLIBDIR=\"$(QT_LIBDIR)\" \ -fmessage-length=0 - -MOC = $(QTDIR)/bin/moc - serversdir = $(execcompdir)/servers lang_fontsdir=$(ydatadir) @@ -31,15 +28,9 @@ libpy2qt_la_LIBADD = \ -L$(libdir) -lyui \ - -L$(QTLIBDIR) -lqt-mt \ + -L$(QT_LIBDIR) -lQt3Support \ -lX11 -lXext -lSM -lICE -# libpy2qt_la_LIBADD = \ -# -Lpkg -ly2qt_pkg \ -# -L$(libdir) -lyui \ -# -L$(QTLIBDIR) -lqt-mt \ -# -lX11 -lXext -lSM -lICE - # noinst_LTLIBRARIES = liby2qt.la # liby2qt_la_LDFLAGS = -version-info 2:0 # liby2qt_la_LIBADD = $(libpy2qt_la_LIBADD) @@ -107,8 +98,7 @@ QY2CharValidator.cc \ QY2ListView.cc \ QY2Settings.cc \ - QY2LayoutUtils.cc \ - qxembed.cc + QY2LayoutUtils.cc @@ -169,8 +159,7 @@ QY2DiskUsageList.moc \ QY2FloppyMountDialog.moc \ QY2CharValidator.moc \ - QY2ListView.moc \ - qxembed.moc + QY2ListView.moc YQUI_core.o YQUI_core.lo: YQUI.moc @@ -224,7 +213,6 @@ QY2FloppyMountDialog.o QY2FloppyMountDialog.lo: QY2FloppyMountDialog.cc QY2CharValidator.o QY2CharValidator.lo: QY2CharValidator.moc QY2ListView.o QY2ListView.lo: QY2ListView.moc -qxembed.o qxembed.lo: qxembed.moc @@ -275,12 +263,10 @@ QY2CharValidator.moc: QY2CharValidator.h QY2ListView.moc: QY2ListView.h -qxembed.moc: qxembed.h - %.moc: %.h $(MOC) $< -o $@ CLEANFILES = *.moc -INCLUDES = -I$(srcdir)/pkg -I$(QTDIR)/include -I$(includedir) -I$(includedir)/yui +INCLUDES = -I$(srcdir)/pkg -I$(QT_INCLUDEDIR) -I$(includedir) -I$(includedir)/yui Modified: branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.cc Thu Jul 26 15:47:28 2007 @@ -22,6 +22,8 @@ #include #include #include "QY2BarGraph.h" +//Added by qt3to4: +#include using std::max; @@ -40,10 +42,10 @@ QY2BarGraph::QY2BarGraph( QWidget * parent, const char * name ) - : QFrame( parent, name ) + : Q3Frame( parent, name ) { setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - setFrameStyle( QFrame::Panel | QFrame::Sunken ); + setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken ); setLineWidth(2); setMidLineWidth(2); } @@ -146,7 +148,7 @@ // Fill the segment p->setBrush( segmentBackgroundColor(i) ); - p->setPen( NoPen ); + p->setPen( Qt::NoPen ); p->drawRect( x_off, y_off, segWidth+2, segHeight+2 ); @@ -157,7 +159,7 @@ if ( i < segments()-1 ) { - p->setPen( SolidLine ); + p->setPen( Qt::SolidLine ); p->setPen( segmentBackgroundColor( i).light().light() ); p->drawLine( x_off + segWidth-2, y_off, @@ -172,7 +174,7 @@ // Draw the label - p->setPen( SolidLine ); + p->setPen( Qt::SolidLine ); p->setPen( segmentForegroundColor(i) ); QString txt = _labels[i]; @@ -184,7 +186,7 @@ y_off + LabelVerticalMargin, segWidth - 2 * LabelHorizontalMargin + 1, segHeight - 2 * LabelVerticalMargin + 1, - AlignCenter, txt ); + Qt::AlignCenter, txt ); // Prepare for the next segment Modified: branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.h (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2BarGraph.h Thu Jul 26 15:47:28 2007 @@ -23,14 +23,13 @@ #ifndef QY2BarGraph_h #define QY2BarGraph_h -#include -#include +#include #include <vector> using std::vector; -class QY2BarGraph : public QFrame +class QY2BarGraph : public Q3Frame { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/QY2CharValidator.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2CharValidator.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2CharValidator.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2CharValidator.cc Thu Jul 26 15:47:28 2007 @@ -52,7 +52,7 @@ // There might be more than one new character - the user might have copied // some longer text via the X clipboard. - for ( unsigned i=0; i < fieldContents.length(); i++ ) + for ( int i=0; i < fieldContents.length(); i++ ) { if ( ! validChars().contains( fieldContents[i] ) ) return QValidator::Invalid; Modified: branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.cc Thu Jul 26 15:47:28 2007 @@ -19,10 +19,12 @@ /-*/ -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include @@ -38,34 +40,34 @@ QY2ComboTabWidget::QY2ComboTabWidget( const QString & label, QWidget * parent, const char * name ) - : QVBox( parent, name ) + : Q3VBox( parent, name ) { - setFrameStyle( QFrame::Panel | QFrame::Raised ); + setFrameStyle( Q3Frame::Panel | Q3Frame::Raised ); setLineWidth(2); setMidLineWidth(2); setSpacing( SPACING ); setMargin ( MARGIN ); - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert combo_label = new QLabel( label, hbox ); - CHECK_PTR( combo_label ); + Q_CHECK_PTR( combo_label ); combo_box = new QComboBox( hbox ); - CHECK_PTR( combo_box ); + Q_CHECK_PTR( combo_box ); combo_label->setBuddy( combo_box ); combo_box->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert connect( combo_box, SIGNAL( activated( int ) ), this, SLOT ( showPage ( int ) ) ); - widget_stack = new QWidgetStack( this ); - CHECK_PTR( widget_stack ); + widget_stack = new Q3WidgetStack( this ); + Q_CHECK_PTR( widget_stack ); } @@ -123,7 +125,7 @@ // Search the dict for this page - QIntDictIterator<QWidget> it( pages ); + Q3IntDictIterator<QWidget> it( pages ); while ( it.current() ) { Modified: branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.h (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2ComboTabWidget.h Thu Jul 26 15:47:28 2007 @@ -23,13 +23,13 @@ #ifndef QY2ComboTabWidget_h #define QY2ComboTabWidget_h -#include +#include #include -#include +#include class QComboBox; class QLabel; -class QWidgetStack; +class Q3WidgetStack; class QWidget; @@ -37,7 +37,7 @@ * This widget is very much like a QTabWidget, but it uses a combo box above * the tab pages rather than a ( scrolled ) one-line row of tabs. **/ -class QY2ComboTabWidget : public QVBox +class QY2ComboTabWidget : public Q3VBox { Q_OBJECT @@ -98,8 +98,8 @@ QComboBox * combo_box; QLabel * combo_label; - QWidgetStack * widget_stack; - QIntDict<QWidget> pages; + Q3WidgetStack * widget_stack; + Q3IntDict<QWidget> pages; }; #endif // QY2ComboTabWidget_h Modified: branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.cc Thu Jul 26 15:47:28 2007 @@ -62,7 +62,7 @@ } saveColumnWidths(); - setSelectionMode( QListView::NoSelection ); + setSelectionMode( Q3ListView::NoSelection ); } @@ -167,7 +167,7 @@ * +1 if this > other **/ int -QY2DiskUsageListItem::compare( QListViewItem * otherListViewItem, +QY2DiskUsageListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -241,7 +241,7 @@ // Intentionally bypassing the direct parent class method, use the grandparent's: // Don't let QY2ListViewItem::_textColor / _backgroundColor interfere with our colors. - QListViewItem::paintCell( painter, cg, column, width, alignment ); + Q3ListViewItem::paintCell( painter, cg, column, width, alignment ); } } @@ -276,7 +276,7 @@ QPen pen( painter->pen() ); pen.setWidth(0); painter->setPen( pen ); - painter->setBrush( NoBrush ); + painter->setBrush( Qt::NoBrush ); fillWidth = (int) ( ( w - 2 * penWidth ) * percent / 100.0 ); Modified: branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2DiskUsageList.h Thu Jul 26 15:47:28 2007 @@ -180,7 +180,7 @@ * confused which one to use. **/ void setText( int column, const QString & text ) - { QListViewItem::setText( column, text ); } + { Q3ListViewItem::setText( column, text ); } /** * Set a column text via FSize. @@ -196,7 +196,7 @@ * * Reimplemented from QY2ListViewItem. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.cc Thu Jul 26 15:47:28 2007 @@ -24,6 +24,9 @@ #include "QY2FloppyMountDialog.h" #include "QY2LayoutUtils.h" +#include +#include +#include #include "YQi18n.h" #ifndef NO_YAST2_ENVIRONMENT @@ -36,16 +39,16 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #define SPACING 2 // between subwidgets @@ -67,7 +70,7 @@ , _floppyMounted( false ) , _wantExistingFile( false ) { - QHBox * hbox; + Q3HBox * hbox; QLabel * label; QPushButton * button; @@ -84,51 +87,51 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this, // parent + Q3VBoxLayout * layout = new Q3VBoxLayout( this, // parent 8, // margin SPACING ); // spacing - CHECK_PTR( layout ); + Q_CHECK_PTR( layout ); // Headline label = new QLabel( "<b>" + headline + "</b>", this ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); layout->addWidget( label ); // Radio box for device ( hard disk / floppy ) - QVButtonGroup * bgroup = new QVButtonGroup( _( "Device" ), this ); - CHECK_PTR( bgroup ); + Q3VButtonGroup * bgroup = new Q3VButtonGroup( _( "Device" ), this ); + Q_CHECK_PTR( bgroup ); bgroup->setRadioButtonExclusive( true ); layout->addWidget( bgroup ); _useHardDisk = new QRadioButton( _( "&Hard Disk" ), bgroup ); - CHECK_PTR( _useHardDisk ); + Q_CHECK_PTR( _useHardDisk ); _useHardDisk->setChecked( ! startWithFloppy ); _useFloppy = new QRadioButton( _( "&Floppy" ), bgroup ); - CHECK_PTR( _useFloppy ); + Q_CHECK_PTR( _useFloppy ); _useFloppy->setChecked( startWithFloppy ); // Box for floppy parameters - hbox = new QHBox( bgroup ); - CHECK_PTR( hbox ); + hbox = new Q3HBox( bgroup ); + Q_CHECK_PTR( hbox ); addHSpacing( hbox, 25 ); - _floppyParams = new QFrame( hbox ); - CHECK_PTR( _floppyParams ); - _floppyParams->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + _floppyParams = new Q3Frame( hbox ); + Q_CHECK_PTR( _floppyParams ); + _floppyParams->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken ); - QGridLayout * grid = new QGridLayout( _floppyParams, // parent + Q3GridLayout * grid = new Q3GridLayout( _floppyParams, // parent 2, // rows 2, // cols MARGIN, // margin SPACING ); // spacing - CHECK_PTR( grid ); + Q_CHECK_PTR( grid ); grid->setColStretch( 0, 0 ); // label column - dont' stretch grid->setColStretch( 1, 1 ); // input field ( combo box ) column may stretch as desired @@ -136,11 +139,11 @@ // Input field + caption for "Floppy Device" label = new QLabel( _( "Floppy &Device:" ), _floppyParams ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); grid->addWidget( label, 0, 0 ); _floppyDeviceField = new QComboBox( _floppyParams ); - CHECK_PTR( _floppyDeviceField ); + Q_CHECK_PTR( _floppyDeviceField ); grid->addWidget( _floppyDeviceField, 0, 1 ); _floppyDeviceField->setEditable( true ); _floppyDeviceField->setAutoCompletion( true ); @@ -152,11 +155,11 @@ // Input field + caption for "Mount Point" label = new QLabel( _( "&Mount Point:" ), _floppyParams ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); grid->addWidget( label, 1, 0 ); _floppyMountPointField = new QComboBox( _floppyParams ); - CHECK_PTR( _floppyMountPointField ); + Q_CHECK_PTR( _floppyMountPointField ); grid->addWidget( _floppyMountPointField, 1, 1 ); _floppyMountPointField->setEditable( true ); _floppyMountPointField->setAutoCompletion( true ); @@ -172,8 +175,8 @@ // HBox for path field, its caption and the "Browse..." button - hbox = new QHBox( this ); - CHECK_PTR( hbox ); + hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); layout->addWidget( hbox ); @@ -182,10 +185,10 @@ // Input field for path label = new QLabel( _( "&Path:" ), hbox ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); _pathField = new QLineEdit( startWith, hbox ); - CHECK_PTR( _pathField ); + Q_CHECK_PTR( _pathField ); _pathField->setMinimumSize( 300, _pathField->sizeHint().height() ); label->setBuddy( _pathField ); @@ -194,7 +197,7 @@ addHSpacing( hbox ); button = new QPushButton( _( "Bro&wse..." ), hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); connect( button, SIGNAL( clicked() ), this, SLOT ( browse() ) ); @@ -202,8 +205,8 @@ // Button box - hbox = new QHBox( this ); - CHECK_PTR( hbox ); + hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); layout->addWidget( hbox ); @@ -214,7 +217,7 @@ // "OK" button button = new QPushButton( _( "&OK" ), hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), @@ -226,7 +229,7 @@ // "Cancel" button button = new QPushButton( _( "&Cancel" ), hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); connect( button, SIGNAL( clicked() ), this, SLOT ( reject() ) ); @@ -300,7 +303,7 @@ if ( _wantExistingFile ) { - filename = QFileDialog::getOpenFileName( startWith, + filename = Q3FileDialog::getOpenFileName( startWith, _filter, this, // parent _( "Select File" ) ); // caption @@ -308,7 +311,7 @@ } else { - filename = QFileDialog::getSaveFileName( startWith, + filename = Q3FileDialog::getSaveFileName( startWith, _filter, this, // parent _( "Select File" ) ); // caption @@ -357,7 +360,7 @@ while ( true ) { - qApp->setOverrideCursor( waitCursor ); + qApp->setOverrideCursor( Qt::waitCursor ); int result = system( (const char *) command ); qApp->restoreOverrideCursor(); Modified: branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.h (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2FloppyMountDialog.h Thu Jul 26 15:47:28 2007 @@ -25,11 +25,10 @@ #include - class QRadioButton; class QComboBox; class QLineEdit; -class QFrame; +class Q3Frame; /** @@ -146,7 +145,7 @@ QRadioButton * _useHardDisk; QRadioButton * _useFloppy; - QFrame * _floppyParams; + Q3Frame * _floppyParams; QComboBox * _floppyDeviceField; QComboBox * _floppyMountPointField; QLineEdit * _pathField; Modified: branches/tmp/sh/qt4-port/qt/src/QY2LayoutUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2LayoutUtils.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2LayoutUtils.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2LayoutUtils.cc Thu Jul 26 15:47:28 2007 @@ -44,7 +44,7 @@ QWidget * addVSpacing( QWidget * parent, int height ) { QWidget * spacer = new QWidget( parent ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); spacer->setFixedHeight( height ); return spacer; @@ -54,7 +54,7 @@ QWidget * addHSpacing( QWidget * parent, int width ) { QWidget * spacer = new QWidget( parent ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); spacer->setFixedWidth( width ); return spacer; Modified: branches/tmp/sh/qt4-port/qt/src/QY2ListView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2ListView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2ListView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2ListView.cc Thu Jul 26 15:47:28 2007 @@ -20,22 +20,25 @@ #include -#include +#include #include "QY2ListView.h" +#include QY2ListView::QY2ListView( QWidget * parent ) - : QListView( parent ) + : Q3ListView( parent ) , _mousePressedItem(0) , _mousePressedCol( -1 ) - , _mousePressedButton( NoButton ) + , _mousePressedButton( Qt::NoButton ) , _nextSerial(0) , _mouseButton1PressedInHeader( false ) , _finalSizeChangeExpected( false ) { - QListView::setShowToolTips( false ); + Q3ListView::setShowToolTips( false ); +#if FIXME_TOOLTIP _toolTip = new QY2ListViewToolTip( this ); +#endif if ( header() ) header()->installEventFilter( this ); @@ -47,15 +50,17 @@ QY2ListView::~QY2ListView() { +#if FIXME_TOOLTIP if ( _toolTip ) delete _toolTip; +#endif } void QY2ListView::selectSomething() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -75,7 +80,7 @@ void QY2ListView::clear() { - QListView::clear(); + Q3ListView::clear(); restoreColumnWidths(); } @@ -83,7 +88,7 @@ void QY2ListView::updateItemStates() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -100,7 +105,7 @@ void QY2ListView::updateItemData() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -115,7 +120,7 @@ QString -QY2ListView::toolTip( QListViewItem * listViewItem, int column ) +QY2ListView::toolTip( Q3ListViewItem * listViewItem, int column ) { if ( ! listViewItem ) return QString::null; @@ -176,7 +181,7 @@ void QY2ListView::contentsMousePressEvent( QMouseEvent * ev ) { - QListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); + Q3ListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); if ( item && item->isEnabled() ) { @@ -192,14 +197,14 @@ } // Call base class method - QListView::contentsMousePressEvent( ev ); + Q3ListView::contentsMousePressEvent( ev ); } void QY2ListView::contentsMouseReleaseEvent( QMouseEvent * ev ) { - QListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); + Q3ListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); if ( item && item->isEnabled() && item == _mousePressedItem ) { @@ -218,17 +223,17 @@ _mousePressedItem = 0; _mousePressedCol = -1; - _mousePressedButton = NoButton; + _mousePressedButton = Qt::NoButton; // Call base class method - QListView::contentsMouseReleaseEvent( ev ); + Q3ListView::contentsMouseReleaseEvent( ev ); } void QY2ListView::contentsMouseDoubleClickEvent( QMouseEvent * ev ) { - QListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); + Q3ListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); if ( item && item->isEnabled() ) { @@ -240,10 +245,10 @@ _mousePressedItem = 0; _mousePressedCol = -1; - _mousePressedButton = NoButton; + _mousePressedButton = Qt::NoButton; // Call base class method - QListView::contentsMouseDoubleClickEvent( ev ); + Q3ListView::contentsMouseDoubleClickEvent( ev ); } @@ -299,7 +304,7 @@ } } - return QListView::eventFilter( obj, event ); + return Q3ListView::eventFilter( obj, event ); } @@ -317,17 +322,17 @@ QY2ListViewItem::QY2ListViewItem( QY2ListView * parentListView, const QString & text, bool sortByInsertionSequence ) - : QListViewItem( parentListView, text ) + : Q3ListViewItem( parentListView, text ) , _sortByInsertionSequence( sortByInsertionSequence ) { _serial = parentListView->nextSerial(); } -QY2ListViewItem::QY2ListViewItem( QListViewItem * parentItem, +QY2ListViewItem::QY2ListViewItem( Q3ListViewItem * parentItem, const QString & text, bool sortByInsertionSequence ) - : QListViewItem( parentItem, text ) + : Q3ListViewItem( parentItem, text ) , _sortByInsertionSequence( sortByInsertionSequence ) { _serial = 0; @@ -353,7 +358,7 @@ * +1 if this > other **/ int -QY2ListViewItem::compare( QListViewItem * otherListViewItem, +QY2ListViewItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -381,7 +386,7 @@ } - return QListViewItem::compare( otherListViewItem, col, ascending ); + return Q3ListViewItem::compare( otherListViewItem, col, ascending ); } @@ -397,7 +402,7 @@ if ( _textColor.isValid() ) cg.setColor( QColorGroup::Text, _textColor ); if ( _backgroundColor.isValid() ) cg.setColor( QColorGroup::Base, _backgroundColor ); - QListViewItem::paintCell( painter, cg, column, width, alignment ); + Q3ListViewItem::paintCell( painter, cg, column, width, alignment ); } @@ -407,9 +412,9 @@ QY2CheckListItem::QY2CheckListItem( QY2ListView * parentListView, const QString & text, - QCheckListItem::Type type, + Q3CheckListItem::Type type, bool sortByInsertionSequence ) - : QCheckListItem( parentListView, text, type ) + : Q3CheckListItem( parentListView, text, type ) , _sortByInsertionSequence( sortByInsertionSequence ) { _serial = 0; @@ -419,11 +424,11 @@ } -QY2CheckListItem::QY2CheckListItem( QListViewItem * parentItem, +QY2CheckListItem::QY2CheckListItem( Q3ListViewItem * parentItem, const QString & text, - QCheckListItem::Type type, + Q3CheckListItem::Type type, bool sortByInsertionSequence ) - : QCheckListItem( parentItem, text, type ) + : Q3CheckListItem( parentItem, text, type ) , _sortByInsertionSequence( sortByInsertionSequence ) { _serial = 0; @@ -438,11 +443,11 @@ } -QY2CheckListItem::QY2CheckListItem( QCheckListItem * parentItem, +QY2CheckListItem::QY2CheckListItem( Q3CheckListItem * parentItem, const QString & text, - QCheckListItem::Type type, + Q3CheckListItem::Type type, bool sortByInsertionSequence ) - : QCheckListItem( parentItem, text, type ) + : Q3CheckListItem( parentItem, text, type ) , _sortByInsertionSequence( sortByInsertionSequence ) { _serial = 0; @@ -471,7 +476,7 @@ * +1 if this > other **/ int -QY2CheckListItem::compare( QListViewItem * otherListViewItem, +QY2CheckListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -500,7 +505,7 @@ } - return QListViewItem::compare( otherListViewItem, col, ascending ); + return Q3ListViewItem::compare( otherListViewItem, col, ascending ); } @@ -516,15 +521,16 @@ if ( _textColor.isValid() ) cg.setColor( QColorGroup::Text, _textColor ); if ( _backgroundColor.isValid() ) cg.setColor( QColorGroup::Base, _backgroundColor ); - QCheckListItem::paintCell( painter, cg, column, width, alignment ); + Q3CheckListItem::paintCell( painter, cg, column, width, alignment ); } +#if FIXME_TOOLTIP void QY2ListViewToolTip::maybeTip( const QPoint & pos ) { - QHeader * header = _listView->header(); - QListViewItem * item = _listView->itemAt( pos ); + Q3Header * header = _listView->header(); + Q3ListViewItem * item = _listView->itemAt( pos ); if ( ! item ) return; @@ -565,5 +571,7 @@ } } +#endif + #include "QY2ListView.moc" Modified: branches/tmp/sh/qt4-port/qt/src/QY2ListView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2ListView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2ListView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2ListView.h Thu Jul 26 15:47:28 2007 @@ -23,12 +23,14 @@ #ifndef QY2ListView_h #define QY2ListView_h -#include +#include #include #include #include #include <vector> +#define FIXME_TOOLTIP 0 + class QY2ListViewItem; class QY2ListViewToolTip; @@ -37,7 +39,7 @@ /** * @short Enhanced QListView **/ -class QY2ListView : public QListView +class QY2ListView : public Q3ListView { Q_OBJECT @@ -101,7 +103,7 @@ * Emitted for mouse clicks on an item **/ void columnClicked ( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -109,7 +111,7 @@ * Emitted for mouse double clicks on an item **/ void columnDoubleClicked ( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -126,7 +128,7 @@ * * Derived classes may handle this differently. **/ - virtual QString toolTip( QListViewItem * item, int column ); + virtual QString toolTip( Q3ListViewItem * item, int column ); /** * Returns the next free serial number for items that want to be ordered in @@ -179,14 +181,17 @@ // Data members - QListViewItem * _mousePressedItem; + Q3ListViewItem * _mousePressedItem; int _mousePressedCol; int _mousePressedButton; std::vector<int> _savedColumnWidth; int _nextSerial; +#if FIXME_TOOLTIP QY2ListViewToolTip * _toolTip; +#endif + bool _mouseButton1PressedInHeader; bool _finalSizeChangeExpected; }; @@ -196,7 +201,7 @@ /** * Enhanced QListViewItem **/ -class QY2ListViewItem: public QListViewItem +class QY2ListViewItem: public Q3ListViewItem { public: @@ -219,7 +224,7 @@ * order ( true ) or leaves sorting to the user ( false - sort-by-click on * column headers ). **/ - QY2ListViewItem( QListViewItem * parentItem, + QY2ListViewItem( Q3ListViewItem * parentItem, const QString & text = QString::null, bool sortByInsertionSequence = false ); @@ -253,7 +258,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -326,7 +331,7 @@ /** * Enhanced QCheckListItem **/ -class QY2CheckListItem: public QCheckListItem +class QY2CheckListItem: public Q3CheckListItem { public: @@ -339,7 +344,7 @@ **/ QY2CheckListItem( QY2ListView * parentListView, const QString & text, - QCheckListItem::Type type, + Q3CheckListItem::Type type, bool sortByInsertionSequence = false ); @@ -350,9 +355,9 @@ * order ( true ) or leaves sorting to the user ( false - sort-by-click on * column headers ). **/ - QY2CheckListItem( QListViewItem * parentItem, + QY2CheckListItem( Q3ListViewItem * parentItem, const QString & text, - QCheckListItem::Type type, + Q3CheckListItem::Type type, bool sortByInsertionSequence = false ); @@ -363,9 +368,9 @@ * order ( true ) or leaves sorting to the user ( false - sort-by-click on * column headers ). **/ - QY2CheckListItem( QCheckListItem * parentItem, + QY2CheckListItem( Q3CheckListItem * parentItem, const QString & text, - QCheckListItem::Type type, + Q3CheckListItem::Type type, bool sortByInsertionSequence = false ); /** @@ -398,7 +403,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -467,6 +472,7 @@ }; +#if FIXME_TOOLTIP /** * Tool tip for a QY2ListView widget: Enables individual tool tips specific to * each list item and each column. Overwrite QY2ListViewItem::toolTip() to use @@ -480,7 +486,8 @@ * Constructor. **/ QY2ListViewToolTip( QY2ListView * parent ) - : QToolTip( parent->viewport() ), _listView( parent ) {} + : QToolTip( parent->viewport() ) + , _listView( parent ) {} /** * Destructor (to make gcc 4.x happy) @@ -502,5 +509,6 @@ QY2ListView * _listView; }; +#endif #endif // ifndef QY2ListView_h Modified: branches/tmp/sh/qt4-port/qt/src/QY2Settings.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2Settings.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2Settings.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2Settings.cc Thu Jul 26 15:47:28 2007 @@ -47,7 +47,7 @@ void QY2Settings::initSections() { _defaultSection = new Section( "" ); - CHECK_PTR( _defaultSection ); + Q_CHECK_PTR( _defaultSection ); _currentSection = _defaultSection; _sections.insert( "", _defaultSection ); @@ -154,10 +154,10 @@ QFile file( _fileName ); - if ( ! file.open( IO_ReadOnly ) ) + if ( ! file.open( QIODevice::ReadOnly ) ) { - cerr << "Can't load settings from " << _fileName - << ": " << file.errorString() + cerr << "Can't load settings from " << (const char *) _fileName + << ": " << (const char *) file.errorString() << endl; _readError = true; @@ -165,8 +165,8 @@ return false; } - QTextStream str( &file ); - str.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream str( &file ); + str.setEncoding( Q3TextStream::UnicodeUTF8 ); QString line; int lineCount = 0; @@ -230,17 +230,17 @@ QFile file( _fileName ); - if ( ! file.open( IO_WriteOnly ) ) + if ( ! file.open( QIODevice::WriteOnly ) ) { - cerr << "Can't save settings to " << _fileName - << ": " << file.errorString() + cerr << "Can't save settings to " << (const char *) _fileName + << ": " << (const char *) file.errorString() << endl; return false; } - QTextStream str( &file ); - str.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream str( &file ); + str.setEncoding( Q3TextStream::UnicodeUTF8 ); // The default section must be saved first since it doesn't have a section // name that could be used for a headline @@ -261,7 +261,7 @@ } -void QY2Settings::saveSection( QTextStream & str, Section * sect ) +void QY2Settings::saveSection( Q3TextStream & str, Section * sect ) { // Section header @@ -299,7 +299,7 @@ return; _currentSection = new Section( sectionName ); - CHECK_PTR( _currentSection ); + Q_CHECK_PTR( _currentSection ); _sections.insert( sectionName, _currentSection ); _dirty = true; Modified: branches/tmp/sh/qt4-port/qt/src/QY2Settings.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/QY2Settings.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/QY2Settings.h (original) +++ branches/tmp/sh/qt4-port/qt/src/QY2Settings.h Thu Jul 26 15:47:28 2007 @@ -25,9 +25,9 @@ #include #include -#include +#include #include -#include +#include /** * Utility class that handles program settings in .ini file format: @@ -233,7 +233,7 @@ /** * Save one section to a stream **/ - void saveSection( QTextStream & stream, Section * section ); + void saveSection( Q3TextStream & stream, Section * section ); // Data members @@ -247,9 +247,9 @@ bool _dirty; Section * _defaultSection; - QDict<Section> _sections; + Q3Dict<Section> _sections; - typedef QDictIterator<Section> SectionIterator; + typedef Q3DictIterator<Section> SectionIterator; }; #endif // QY2Settings_h Modified: branches/tmp/sh/qt4-port/qt/src/YQCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQCheckBox.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQCheckBox.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQCheckBox.cc Thu Jul 26 15:47:28 2007 @@ -19,7 +19,7 @@ #include -#include +#include #define y2log_component "qt-ui" #include @@ -36,14 +36,14 @@ const YWidgetOpt & opt, const YCPString & label, bool initiallyChecked ) - : QGroupBox( parent ) + : Q3GroupBox( parent ) , YCheckBox( opt, label ) , _dont_care( false ) { setWidgetRep( this ); setFrameStyle( NoFrame ); - QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + Q3BoxLayout * layout = new Q3BoxLayout( this, Q3BoxLayout::LeftToRight ); _qt_checkbox = new QCheckBox( fromUTF8( label->value() ), this ); layout->addSpacing( SPACING ); @@ -79,9 +79,9 @@ { switch ( _qt_checkbox->state() ) { - case QButton::On: return YCPBoolean( true ); - case QButton::Off: return YCPBoolean( false ); - case QButton::NoChange: return YCPVoid(); // nil + case QCheckBox::On: return YCPBoolean( true ); + case QCheckBox::Off: return YCPBoolean( false ); + case QCheckBox::NoChange: return YCPVoid(); // nil } y2error( "Unknown QCheckBox state: %d", (int) _qt_checkbox->state() ); Modified: branches/tmp/sh/qt4-port/qt/src/YQCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQCheckBox.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQCheckBox.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQCheckBox.h Thu Jul 26 15:47:28 2007 @@ -22,7 +22,7 @@ #ifndef YQCheckBox_h #define YQCheckBox_h -#include +#include #include #include "YCheckBox.h" @@ -30,7 +30,7 @@ class QCheckBox; -class YQCheckBox : public QGroupBox, public YCheckBox +class YQCheckBox : public Q3GroupBox, public YCheckBox { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.cc Thu Jul 26 15:47:28 2007 @@ -21,6 +21,9 @@ #define y2log_component "qt-ui" #include #include +//Added by qt3to4: +#include +#include #include "YQUI.h" #include "YEvent.h" #include "utf8.h" @@ -36,15 +39,15 @@ const YWidgetOpt & opt, const YCPString & newLabel, bool initialValue ) - : QGroupBox( parent ) + : Q3GroupBox( parent ) , YCheckBoxFrame( opt, newLabel ) { - QGroupBox::setTitle( fromUTF8( getLabel()->value() ) ); - QGroupBox::setCheckable( true ); + Q3GroupBox::setTitle( fromUTF8( getLabel()->value() ) ); + Q3GroupBox::setCheckable( true ); setFont( YQUI::ui()->currentFont() ); setWidgetRep ( this ); preventQGroupBoxAutoEnablement(); - QFrame::setEnabled( ! opt.isDisabled.value() ); + Q3GroupBox::setEnabled( ! opt.isDisabled.value() ); setValue( initialValue ); } @@ -52,7 +55,7 @@ bool YQCheckBoxFrame::getValue() { - return _checkBox ? _checkBox->isChecked() : QGroupBox::isChecked(); + return _checkBox ? _checkBox->isChecked() : Q3GroupBox::isChecked(); } @@ -69,13 +72,13 @@ { if ( enabled ) { - QFrame::setEnabled( true ); + Q3GroupBox::setEnabled( true ); handleChildrenEnablement( getValue() ); } else { setChildrenEnabling( false ); - QFrame::setEnabled( true ); + Q3GroupBox::setEnabled( true ); } } @@ -153,7 +156,7 @@ YQCheckBoxFrame::setLabel( const YCPString & newLabel ) { YCheckBoxFrame::setLabel( newLabel ); - QGroupBox::setTitle( fromUTF8( getLabel()->value() ) ); + Q3GroupBox::setTitle( fromUTF8( getLabel()->value() ) ); } @@ -194,7 +197,7 @@ bool YQCheckBoxFrame::setKeyboardFocus() { - QGroupBox::setFocus(); + Q3GroupBox::setFocus(); return true; } Modified: branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQCheckBoxFrame.h Thu Jul 26 15:47:28 2007 @@ -21,14 +21,16 @@ #ifndef YQCheckBoxFrame_h #define YQCheckBoxFrame_h -#include +#include +//Added by qt3to4: +#include #include "YCheckBoxFrame.h" class QWidget; class QCheckBox; -class YQCheckBoxFrame : public QGroupBox, public YCheckBoxFrame +class YQCheckBoxFrame : public Q3GroupBox, public YCheckBoxFrame { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQColoredLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQColoredLabel.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQColoredLabel.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQColoredLabel.cc Thu Jul 26 15:47:28 2007 @@ -23,6 +23,8 @@ #include "utf8.h" #include "YQUI.h" #include "YQColoredLabel.h" +//Added by qt3to4: +#include YQColoredLabel::YQColoredLabel( QWidget * parent, @@ -36,13 +38,13 @@ { setWidgetRep( this ); - setTextFormat( QLabel::PlainText ); + setTextFormat( Qt::PlainText ); setText( fromUTF8(text->value() ) ); setIndent(0); setPaletteForegroundColor( QColor( fg.red, fg.green, fg.blue ) ); setPaletteBackgroundColor( QColor( bg.red, bg.green, bg.blue ) ); setMargin( margin ); - setAlignment( AlignLeft | AlignVCenter ); + setAlignment( Qt::AlignLeft | Qt::AlignVCenter ); setFont( opt.boldFont.value() ? YQUI::ui()->boldFont() : Modified: branches/tmp/sh/qt4-port/qt/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQComboBox.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQComboBox.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQComboBox.cc Thu Jul 26 15:47:28 2007 @@ -37,7 +37,7 @@ YQComboBox::YQComboBox( QWidget * parent, const YWidgetOpt & opt, const YCPString & label ) - : QVBox( parent ) + : Q3VBox( parent ) , YComboBox( opt, label ) , _validator(0) { @@ -46,7 +46,7 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8(label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( _qt_label->text().isEmpty() ) Modified: branches/tmp/sh/qt4-port/qt/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQComboBox.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQComboBox.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQComboBox.h Thu Jul 26 15:47:28 2007 @@ -20,7 +20,9 @@ #ifndef YQComboBox_h #define YQComboBox_h -#include +#include +//Added by qt3to4: +#include #include #include "YComboBox.h" @@ -31,7 +33,7 @@ class QY2CharValidator; -class YQComboBox : public QVBox, public YComboBox +class YQComboBox : public Q3VBox, public YComboBox { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQDate.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDate.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDate.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDate.cc Thu Jul 26 15:47:28 2007 @@ -23,6 +23,8 @@ #include "utf8.h" #include "YQUI.h" #include "YQDate.h" +//Added by qt3to4: +#include YQDate::YQDate( QWidget * parent, @@ -30,7 +32,7 @@ const YCPString & label, const YCPString & date ) //: QDateEdit ( parent ) - : QVBox( parent ) + : Q3VBox( parent ) , YDate( opt, label ) { setWidgetRep( this ); @@ -38,15 +40,15 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8(label->value()), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); - _qt_dateedit = new QDateEdit( this ); - _qt_dateedit->setOrder( QDateEdit::DMY ); - _qt_dateedit->setDate( QDate::fromString(date->value(), Qt::ISODate )); + _qt_dateedit = new Q3DateEdit( this ); + _qt_dateedit->setOrder( Q3DateEdit::DMY ); + _qt_dateedit->setDate( QDate::fromString(date->value().c_str(), Qt::ISODate )); _qt_label->setBuddy( _qt_dateedit ); } @@ -86,7 +88,7 @@ void YQDate::setNewDate( const YCPString & date ) { - _qt_dateedit->setDate( QDate::fromString(date->value(), Qt::ISODate )); + _qt_dateedit->setDate( QDate::fromString( date->value().c_str(), Qt::ISODate ) ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQDate.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDate.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDate.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDate.h Thu Jul 26 15:47:28 2007 @@ -20,8 +20,8 @@ #ifndef YQDate_h #define YQDate_h -#include -#include +#include +#include #include #include #include @@ -29,7 +29,7 @@ #include "YDate.h" -class YQDate : public QVBox, public YDate +class YQDate : public Q3VBox, public YDate { Q_OBJECT @@ -83,7 +83,7 @@ //void setDate( const YCPString & label ); protected: - QDateEdit * _qt_dateedit; + Q3DateEdit * _qt_dateedit; QLabel * _qt_label; }; Modified: branches/tmp/sh/qt4-port/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDialog.cc Thu Jul 26 15:47:28 2007 @@ -25,8 +25,10 @@ #define y2log_component "qt-ui" #include #include -#include +#include #include +#include +#include #include #include "YQUI.h" @@ -42,24 +44,23 @@ QWidget * qt_parent, bool default_size ) : QWidget( qt_parent, - 0, // name - default_size ? 0 : WType_Modal | WStyle_Dialog ) // WFlags + default_size ? Qt::Widget : Qt::WType_Dialog ) // WFlags , YDialog( opt ) { _userResized = false; _focusButton = 0; _defaultButton = 0; - setWidgetRep( this ); setCaption( hasDefaultSize() ? "YaST2" : "" ); - setFocusPolicy( QWidget::StrongFocus ); + setFocusPolicy( Qt::StrongFocus ); + setWindowModality( Qt::WindowModal ); if ( hasWarnColor() || hasInfoColor() ) { QColor normalBackground ( 0, 128, 0 ); QColor inputFieldBackground ( 0, 96, 0 ); - QColor text = white; + QColor text = Qt::white; if ( hasInfoColor() ) { @@ -74,7 +75,7 @@ setPalette( warnPalette ); } - _qFrame = new QFrame ( this ); + _qFrame = new Q3Frame ( this ); bool decorate = ! hasDefaultSize() && ! YQUI::ui()->haveWM(); #if 0 @@ -83,20 +84,20 @@ // None of this works (yet). :-(( clearWFlags( getWFlags() ); - setWFlags( WStyle_Customize | WStyle_DialogBorder | WStyle_StaysOnTop ); + setWFlags( Qt::WStyle_Customize | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop ); // decorate = true; } #endif if ( decorate ) { - _qFrame->setFrameStyle ( QFrame::Box | QFrame::Raised ); + _qFrame->setFrameStyle ( Q3Frame::Box | Q3Frame::Raised ); _qFrame->setLineWidth(2); _qFrame->setMidLineWidth(3); } else { - _qFrame->setFrameStyle ( QFrame::NoFrame ); + _qFrame->setFrameStyle ( Q3Frame::NoFrame ); } } @@ -561,7 +562,7 @@ // button mechanism to work. So let's accept the focus and give it to some // child widget. - if ( event->reason() == QFocusEvent::Tab ) + if ( event->reason() == Qt::TabFocusReason ) { focusNextPrevChild( true ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDialog.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDialog.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDialog.h Thu Jul 26 15:47:28 2007 @@ -21,13 +21,15 @@ #ifndef YQDialog_h #define YQDialog_h +#include +#include #include #include "YDialog.h" class YQGenericButton; class YQWizard; -class QFrame; +class Q3Frame; class YQDialog : public QWidget, public YDialog @@ -202,7 +204,7 @@ // Data members // - QFrame * _qFrame; + Q3Frame * _qFrame; bool _userResized; QSize _userSize; Modified: branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.cc Thu Jul 26 15:47:28 2007 @@ -18,7 +18,7 @@ #include -#include +#include #include #define y2log_component "qt-ui" #include @@ -33,17 +33,17 @@ const YCPString & label, const YCPString & filename, int expectedSize ) - : QVBox( parent ) + : Q3VBox( parent ) , YDownloadProgress( opt, label, filename, expectedSize ) { setWidgetRep( this ); setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); - _qt_progress = new QProgressBar( this ); + _qt_progress = new Q3ProgressBar( this ); _qt_progress->setFont( YQUI::ui()->currentFont() ); _qt_progress->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); Modified: branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDownloadProgress.h Thu Jul 26 15:47:28 2007 @@ -20,16 +20,18 @@ #ifndef YQDownloadProgress_h #define YQDownloadProgress_h -#include +#include +//Added by qt3to4: +#include #include #include "YDownloadProgress.h" class QLabel; -class QProgressBar; +class Q3ProgressBar; -class YQDownloadProgress : public QVBox, public YDownloadProgress +class YQDownloadProgress : public Q3VBox, public YDownloadProgress { Q_OBJECT @@ -88,7 +90,7 @@ protected: QLabel * _qt_label; - QProgressBar * _qt_progress; + Q3ProgressBar * _qt_progress; QTimer * _timer; }; Modified: branches/tmp/sh/qt4-port/qt/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDumbTab.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDumbTab.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDumbTab.cc Thu Jul 26 15:47:28 2007 @@ -20,6 +20,9 @@ #define y2log_component "qt-ui" #include #include +//Added by qt3to4: +#include +#include #include <algorithm> #include "QY2LayoutUtils.h" @@ -32,7 +35,7 @@ YQDumbTab::YQDumbTab( QWidget * parent, const YWidgetOpt & opt ) - : QVBox( parent ) + : Q3VBox( parent ) , YDumbTab( opt ) { setWidgetRep( this ); @@ -45,12 +48,12 @@ // _tabBar = new QTabBar( this ); - CHECK_PTR( _tabBar ); + Q_CHECK_PTR( _tabBar ); _tabBar->setFont( YQUI::ui()->currentFont() ); _tabBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert setFocusProxy( _tabBar ); - setFocusPolicy( TabFocus ); + setFocusPolicy( Qt::TabFocus ); connect( _tabBar, SIGNAL( selected( int ) ), this, SLOT ( sendTabSelectedEvent( int ) ) ); @@ -60,16 +63,16 @@ // Client area for tab page contents // - _clientArea = new QVBox( this ); + _clientArea = new Q3VBox( this ); - CHECK_PTR( _clientArea ); + Q_CHECK_PTR( _clientArea ); #if 0 - _clientArea->setFrameStyle( QFrame::WinPanel | QFrame::Raised ); + _clientArea->setFrameStyle( Q3Frame::WinPanel | Q3Frame::Raised ); _clientArea->setLineWidth( 1 ); _clientArea->setMidLineWidth( 1 ); #endif - _clientArea->setFrameStyle( QFrame::TabWidgetPanel | QFrame::Raised ); + _clientArea->setFrameStyle( Q3Frame::TabWidgetPanel | Q3Frame::Raised ); // _clientArea->setFrameStyle( QFrame::TabWidgetPanel | QFrame::Sunken ); _clientArea->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -80,18 +83,18 @@ YWidgetOpt widgetOpt; _contents = new YQAlignment( _clientArea, widgetOpt, YAlignUnchanged, YAlignUnchanged); - CHECK_PTR( _contents ); + Q_CHECK_PTR( _contents ); addChild( _contents ); - _contents->setParent( this ); + _contents->YWidget::setParent( this ); _contents->installEventFilter( this ); } void YQDumbTab::setEnabling( bool enabled ) { - QVBox::setEnabled( enabled ); + Q3VBox::setEnabled( enabled ); } @@ -178,25 +181,22 @@ void YQDumbTab::addTab( const YCPString & label ) { - QTab * tab = new QTab( fromUTF8( label->value() ) ); - CHECK_PTR( tab ); - - tab->setIdentifier( _tabBar->count() ); - _tabBar->addTab( tab ); + _tabBar->insertTab( _tabBar->count()+1, + fromUTF8( label->value() ) ); } int YQDumbTab::getSelectedTabIndex() { - return _tabBar->currentTab(); + return _tabBar->currentIndex(); } void YQDumbTab::setSelectedTab( int index ) { - _tabBar->setCurrentTab( index ); + _tabBar->setCurrentIndex( index ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQDumbTab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDumbTab.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDumbTab.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDumbTab.h Thu Jul 26 15:47:28 2007 @@ -20,7 +20,9 @@ #ifndef YQDumbTab_h #define YQDumbTab_h -#include +#include +//Added by qt3to4: +#include #include "YDumbTab.h" @@ -28,7 +30,7 @@ class YQAlignment; class YWidget; -class YQDumbTab : public QVBox, public YDumbTab +class YQDumbTab : public Q3VBox, public YDumbTab { Q_OBJECT @@ -113,7 +115,7 @@ // QTabBar * _tabBar; - QVBox * _clientArea; + Q3VBox * _clientArea; YQAlignment * _contents; bool _doingResize; Modified: branches/tmp/sh/qt4-port/qt/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQFrame.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQFrame.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQFrame.cc Thu Jul 26 15:47:28 2007 @@ -22,6 +22,8 @@ #include #include "YQUI.h" #include "utf8.h" +//Added by qt3to4: +#include using std::max; @@ -31,17 +33,17 @@ YQFrame::YQFrame( QWidget * parent, const YWidgetOpt & opt, const YCPString & newLabel ) - : QGroupBox( parent ) + : Q3GroupBox( parent ) , YFrame( opt, newLabel ) { - QGroupBox::setTitle( fromUTF8( getLabel()->value() ) ); + Q3GroupBox::setTitle( fromUTF8( getLabel()->value() ) ); setFont( YQUI::ui()->currentFont() ); setWidgetRep ( this ); } void YQFrame::setEnabling( bool enabled ) { - QFrame::setEnabled( enabled ); + Q3GroupBox::setEnabled( enabled ); } @@ -62,7 +64,7 @@ YQFrame::setLabel( const YCPString & newLabel ) { YFrame::setLabel( newLabel ); - QGroupBox::setTitle( fromUTF8( getLabel()->value() ) ); + Q3GroupBox::setTitle( fromUTF8( getLabel()->value() ) ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQFrame.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQFrame.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQFrame.h Thu Jul 26 15:47:28 2007 @@ -21,13 +21,13 @@ #ifndef YQFrame_h #define YQFrame_h -#include +#include #include "YFrame.h" class QWidget; -class YQFrame : public QGroupBox, public YFrame +class YQFrame : public Q3GroupBox, public YFrame { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQGenericButton.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQGenericButton.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQGenericButton.cc Thu Jul 26 15:47:28 2007 @@ -20,6 +20,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #define y2log_component "qt-ui" #include @@ -95,7 +98,7 @@ if ( icon_name.isEmpty() ) { - _qPushButton->setIconSet( QIconSet() ); + _qPushButton->setIconSet( QIcon() ); return; } Modified: branches/tmp/sh/qt4-port/qt/src/YQGenericButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQGenericButton.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQGenericButton.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQGenericButton.h Thu Jul 26 15:47:28 2007 @@ -21,6 +21,8 @@ #define YQGenericButton_h #include +//Added by qt3to4: +#include #include #include "YPushButton.h" Modified: branches/tmp/sh/qt4-port/qt/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQIconPool.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQIconPool.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQIconPool.cc Thu Jul 26 15:47:28 2007 @@ -64,6 +64,8 @@ #include "icons/step_current.xpm" #include "icons/step_todo.xpm" #include "icons/step_done.xpm" +//Added by qt3to4: +#include YQIconPool * YQIconPool::_iconPool = 0; Modified: branches/tmp/sh/qt4-port/qt/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQIconPool.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQIconPool.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQIconPool.h Thu Jul 26 15:47:28 2007 @@ -22,7 +22,7 @@ #define YQIconPool_h #include -#include +#include class YQIconPool { @@ -107,7 +107,7 @@ // Data members static YQIconPool * _iconPool; - QPtrDict<QPixmap> _iconCache; + Q3PtrDict<QPixmap> _iconCache; }; Modified: branches/tmp/sh/qt4-port/qt/src/YQImage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQImage.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQImage.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQImage.cc Thu Jul 26 15:47:28 2007 @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #define y2log_component "qt-ui" #include @@ -39,9 +41,7 @@ if ( _animated ) { - QMovie movie( byteblock->size() ); - movie.pushData( byteblock->value(), byteblock->size() ); - setMovie( movie ); + y2error( "Animations from byte block not supported" ); } else { @@ -72,7 +72,7 @@ } else { - setMovie( movie ); + setMovie( &movie ); } } else Modified: branches/tmp/sh/qt4-port/qt/src/YQImage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQImage.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQImage.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQImage.h Thu Jul 26 15:47:28 2007 @@ -22,6 +22,8 @@ #define YQImage_h #include +//Added by qt3to4: +#include #include #include "YImage.h" Modified: branches/tmp/sh/qt4-port/qt/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQIntField.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQIntField.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQIntField.cc Thu Jul 26 15:47:28 2007 @@ -24,6 +24,8 @@ #include "YQUI.h" #include "YEvent.h" #include "YQIntField.h" +//Added by qt3to4: +#include YQIntField::YQIntField( QWidget * parent, @@ -33,7 +35,7 @@ int maxValue, int initialValue ) - : QVBox( parent ) + : Q3VBox( parent ) , YIntField( opt, label, minValue, maxValue, initialValue ) { setWidgetRep( this ); @@ -41,7 +43,7 @@ setSpacing( YQWidgetSpacing ); setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); _qt_label->setAlignment( Qt::AlignLeft ); Modified: branches/tmp/sh/qt4-port/qt/src/YQIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQIntField.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQIntField.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQIntField.h Thu Jul 26 15:47:28 2007 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "YIntField.h" @@ -33,7 +33,7 @@ class QLabel; class QIntField; -class YQIntField : public QVBox, public YIntField +class YQIntField : public Q3VBox, public YIntField { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQLabel.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQLabel.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQLabel.cc Thu Jul 26 15:47:28 2007 @@ -24,6 +24,9 @@ #include "utf8.h" #include "YQUI.h" #include "YQLabel.h" +//Added by qt3to4: +#include +#include YQLabel::YQLabel( QWidget * parent, @@ -34,7 +37,7 @@ { setWidgetRep( this ); - setTextFormat( QLabel::PlainText ); + setTextFormat( Qt::PlainText ); setText( fromUTF8(text->value() ) ); setIndent(0); @@ -53,13 +56,13 @@ if ( opt.isOutputField.value() ) { - setFrameStyle ( QFrame::Panel | QFrame::Sunken ); + setFrameStyle ( Q3Frame::Panel | Q3Frame::Sunken ); setLineWidth(2); setMidLineWidth(2); } setMargin( YQWidgetMargin ); - setAlignment( AlignLeft | AlignTop ); + setAlignment( Qt::AlignLeft | Qt::AlignTop ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQLogView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQLogView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQLogView.cc Thu Jul 26 15:47:28 2007 @@ -35,7 +35,7 @@ const YCPString & label, int visLines, int maxLines ) - : QVBox( parent ) + : Q3VBox( parent ) , YLogView( opt, label, visLines, maxLines ) { setWidgetRep( this ); @@ -44,13 +44,13 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); - _qt_text = new QMultiLineEdit( this ); + _qt_text = new Q3MultiLineEdit( this ); _qt_text->setFont( YQUI::ui()->currentFont() ); _qt_text->setReadOnly( true ); _qt_text->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); @@ -79,7 +79,11 @@ long minSize = 10; long hintHeight = _qt_label->sizeHint().height(); hintHeight += visibleLines() * _qt_text->fontMetrics().lineSpacing(); +#ifdef FIXME hintHeight += _qt_text->style().scrollBarExtent().height(); +#else + hintHeight += 20; +#endif hintHeight += _qt_text->frameWidth() * 2; return max( minSize, hintHeight ); Modified: branches/tmp/sh/qt4-port/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQLogView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQLogView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQLogView.h Thu Jul 26 15:47:28 2007 @@ -20,15 +20,15 @@ #ifndef YQLogView_h #define YQLogView_h -#include +#include #include -#include +#include #include #include "YLogView.h" -class YQLogView : public QVBox, public YLogView +class YQLogView : public Q3VBox, public YLogView { Q_OBJECT @@ -85,7 +85,7 @@ // QLabel * _qt_label; - QMultiLineEdit * _qt_text; + Q3MultiLineEdit * _qt_text; }; Modified: branches/tmp/sh/qt4-port/qt/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMenuButton.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMenuButton.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMenuButton.cc Thu Jul 26 15:47:28 2007 @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #define y2log_component "qt-ui" @@ -121,7 +121,7 @@ void YQMenuButton::createMenu() { - QPopupMenu * popup = new QPopupMenu( _qt_pushbutton ); + Q3PopupMenu * popup = new Q3PopupMenu( _qt_pushbutton ); _qt_pushbutton->setPopup( popup ); connect( popup, SIGNAL( activated(int) ), this, SLOT ( menuEntryActivated(int) ) ); @@ -131,7 +131,7 @@ void -YQMenuButton::createMenu( YMenuItem * ymenu, QPopupMenu * qt_menu ) +YQMenuButton::createMenu( YMenuItem * ymenu, Q3PopupMenu * qt_menu ) { YMenuItemListIterator it = ymenu->itemList().begin(); @@ -141,7 +141,7 @@ if ( item->isMenu() ) { - QPopupMenu * sub_menu = new QPopupMenu( qt_menu ); + Q3PopupMenu * sub_menu = new Q3PopupMenu( qt_menu ); // y2debug( "Inserting sub menu '%s'", item->getLabel()->value().c_str() ); qt_menu->insertItem( fromUTF8( item->getLabel()->value() ), sub_menu ); connect( sub_menu, SIGNAL( activated(int) ), Modified: branches/tmp/sh/qt4-port/qt/src/YQMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMenuButton.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMenuButton.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMenuButton.h Thu Jul 26 15:47:28 2007 @@ -21,6 +21,8 @@ #define YQMenuButton_h #include +//Added by qt3to4: +#include #include #include "YMenuButton.h" @@ -79,7 +81,7 @@ /** * Recursively create the menu structure. */ - void createMenu( YMenuItem * ymenu, QPopupMenu * _qt_menu ); + void createMenu( YMenuItem * ymenu, Q3PopupMenu * _qt_menu ); protected slots: Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.cc Thu Jul 26 15:47:28 2007 @@ -17,7 +17,7 @@ /-*/ -#include +#include #include #define y2log_component "qt-ui" #include @@ -36,7 +36,7 @@ const YWidgetOpt & opt, const YCPString & label, const YCPString & initialText ) - : QVBox( parent ) + : Q3VBox( parent ) , YMultiLineEdit( opt, label ) , InputMaxLength( -1 ) { @@ -47,13 +47,13 @@ if ( label->value().length() > 0 ) { _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); } else _qt_label = 0; - _qt_textedit = new QTextEdit( this ); + _qt_textedit = new Q3TextEdit( this ); _qt_textedit->setTextFormat( Qt::PlainText ); _qt_textedit->setFont( YQUI::ui()->currentFont() ); _qt_textedit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiLineEdit.h Thu Jul 26 15:47:28 2007 @@ -20,7 +20,7 @@ #ifndef YQMultiLineEdit_h #define YQMultiLineEdit_h -#include +#include #include #include @@ -29,9 +29,9 @@ #define DEFAULT_VISIBLE_LINES 3 -class QTextEdit; +class Q3TextEdit; -class YQMultiLineEdit : public QVBox, public YMultiLineEdit +class YQMultiLineEdit : public Q3VBox, public YMultiLineEdit { Q_OBJECT @@ -108,7 +108,7 @@ protected: QLabel * _qt_label; - QTextEdit * _qt_textedit; + Q3TextEdit * _qt_textedit; // specifies how much characters can be inserted. -1 for unlimited input int InputMaxLength; Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.cc Thu Jul 26 15:47:28 2007 @@ -21,6 +21,10 @@ #include #include +//Added by qt3to4: +#include +#include +#include #include "YQUI.h" #include "YQMultiProgressMeter.h" @@ -249,7 +253,7 @@ { if ( fillStart < length ) { - QPointArray points( 4 ); + Q3PointArray points( 4 ); int p=0; points.setPoint( p++, offset + fillStart, border + fillHeight ); @@ -258,7 +262,7 @@ points.setPoint( p++, offset + length, border + indent ); painter.setBrush( palette().active().highlight() ); - painter.setPen( NoPen ); + painter.setPen( Qt::NoPen ); painter.drawConvexPolygon( points ); } } @@ -266,7 +270,7 @@ { if ( fillStart > 0 ) { - QPointArray points( 4 ); + Q3PointArray points( 4 ); int p=0; points.setPoint( p++, offset, border + thickness ); @@ -275,7 +279,7 @@ points.setPoint( p++, offset + fillStart, border + thickness - fillHeight ); painter.setBrush( palette().active().highlight() ); - painter.setPen( NoPen ); + painter.setPen( Qt::NoPen ); painter.drawConvexPolygon( points ); } } @@ -291,7 +295,7 @@ // Draw arrow base (left) painter.setPen( dark ); - painter.setPen( SolidLine ); + painter.setPen( Qt::SolidLine ); painter.drawLine( offset, border, offset, border + thickness ); @@ -324,7 +328,7 @@ const QColor & color = palette().active().foreground(); painter.setPen( color ); - painter.setPen( SolidLine ); + painter.setPen( Qt::SolidLine ); painter.setBrush( color ); // painter.setBrush( NoBrush ); @@ -332,7 +336,7 @@ // Draw upper marker triangle int tri = triThickness(); - QPointArray points( 3 ); + Q3PointArray points( 3 ); int p=0; points.setPoint( p++, offset - tri+1, margin() ); // top left (base) Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiProgressMeter.h Thu Jul 26 15:47:28 2007 @@ -24,6 +24,9 @@ #include "YMultiProgressMeter.h" #include #include +//Added by qt3to4: +#include +#include class QPaintEvent; Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.cc Thu Jul 26 15:47:28 2007 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #define y2log_component "qt-ui" #include @@ -40,7 +40,7 @@ YQMultiSelectionBox::YQMultiSelectionBox( QWidget * parent, const YWidgetOpt & opt, const YCPString & label ) - : QVBox( parent ) + : Q3VBox( parent ) , YMultiSelectionBox( opt, label ) { setWidgetRep( this ); @@ -49,10 +49,10 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8(label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); - _qt_listview = new QListView( this ); + _qt_listview = new Q3ListView( this ); _qt_listview->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _qt_listview->addColumn( "" ); // QListView doesn't have one single column by default! _qt_listview->setSorting( 0, false ); @@ -135,7 +135,7 @@ YQMultiSelectionBox::getCurrentItem() { int index = 0; - QListViewItem * child = _qt_listview->firstChild(); + Q3ListViewItem * child = _qt_listview->firstChild(); while ( child ) { @@ -156,7 +156,7 @@ { _qt_listview->blockSignals( true ); _qt_listview->clearSelection(); - QListViewItem * child = _qt_listview->firstChild(); + Q3ListViewItem * child = _qt_listview->firstChild(); for ( int i = 0; i < index; i++ ) { @@ -196,7 +196,7 @@ bool YQMultiSelectionBox::itemIsSelected( int index ) { - QListViewItem * child = _qt_listview->firstChild(); + Q3ListViewItem * child = _qt_listview->firstChild(); for ( int i = 0; i < index; i++ ) { @@ -209,7 +209,7 @@ } } - QCheckListItem * item = ( QCheckListItem * ) child; + Q3CheckListItem * item = ( Q3CheckListItem * ) child; return item->isOn(); } @@ -219,7 +219,7 @@ YQMultiSelectionBox::selectItem( int index ) { _qt_listview->blockSignals( true ); - QListViewItem * child = _qt_listview->firstChild(); + Q3ListViewItem * child = _qt_listview->firstChild(); for ( int i = 0; i < index; i++ ) { @@ -232,7 +232,7 @@ } } - QCheckListItem * item = ( QCheckListItem * ) child; + Q3CheckListItem * item = ( Q3CheckListItem * ) child; item->setOn( true ); _qt_listview->blockSignals( false ); @@ -244,11 +244,11 @@ { _qt_listview->blockSignals( true ); - QListViewItem * child = _qt_listview->firstChild(); + Q3ListViewItem * child = _qt_listview->firstChild(); while ( child ) { - QCheckListItem * item = ( QCheckListItem * ) child; + Q3CheckListItem * item = ( Q3CheckListItem * ) child; item->setOn( false ); child = child->nextSibling(); } @@ -293,9 +293,9 @@ YQMultiSelectionBoxItem::YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - QListView * listView, + Q3ListView * listView, const QString & text ) - : QCheckListItem( listView, text, QCheckListItem::CheckBox ) + : Q3CheckListItem( listView, text, Q3CheckListItem::CheckBox ) , _multiSelectionBox( parent ) { _serial = _item_count++; @@ -306,7 +306,7 @@ YQMultiSelectionBoxItem::stateChange( bool newState ) { _multiSelectionBox->sendValueChanged(); - QCheckListItem::stateChange( newState ); + Q3CheckListItem::stateChange( newState ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQMultiSelectionBox.h Thu Jul 26 15:47:28 2007 @@ -20,8 +20,10 @@ #ifndef YQMultiSelectionBox_h #define YQMultiSelectionBox_h -#include -#include +#include +#include +//Added by qt3to4: +#include #include #include "YMultiSelectionBox.h" @@ -29,7 +31,7 @@ class QLabel; -class YQMultiSelectionBox : public QVBox, public YMultiSelectionBox +class YQMultiSelectionBox : public Q3VBox, public YMultiSelectionBox { Q_OBJECT @@ -154,21 +156,21 @@ protected: QLabel * _qt_label; - QListView * _qt_listview; + Q3ListView * _qt_listview; bool _shrinkable; }; -class YQMultiSelectionBoxItem: public QCheckListItem +class YQMultiSelectionBoxItem: public Q3CheckListItem { public: /** * Constructor. **/ YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - QListView * listView, + Q3ListView * listView, const QString & text ); /** Modified: branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.cc Thu Jul 26 15:47:28 2007 @@ -24,6 +24,8 @@ #include "YQUI.h" #include "YEvent.h" #include "YQPartitionSplitter.h" +//Added by qt3to4: +#include YQPartitionSplitter::YQPartitionSplitter( QWidget * parent, @@ -38,7 +40,7 @@ const YCPString & arg_newPartLabel, const YCPString & arg_freeFieldLabel, const YCPString & arg_newPartFieldLabel ) - : QVBox( parent ) + : Q3VBox( parent ) , YPartitionSplitter( opt, arg_usedSize, arg_totalFreeSize, @@ -70,7 +72,7 @@ // upper inner HBox for the labels - _labels_hbox = new QHBox( this ); + _labels_hbox = new Q3HBox( this ); _labels_hbox->setSpacing( YQWidgetMargin ); @@ -78,7 +80,7 @@ _qt_freeFieldLabel = new QLabel( fromUTF8( freeFieldLabel()->value() ), _labels_hbox ); - _qt_freeFieldLabel->setTextFormat( QLabel::PlainText ); + _qt_freeFieldLabel->setTextFormat( Qt::PlainText ); _qt_freeFieldLabel->setFont( YQUI::ui()->currentFont() ); _qt_freeFieldLabel->setAlignment( Qt::AlignLeft ); @@ -87,14 +89,14 @@ _qt_newPartFieldLabel = new QLabel( fromUTF8( newPartFieldLabel()->value() ), _labels_hbox ); - _qt_newPartFieldLabel->setTextFormat( QLabel::PlainText ); + _qt_newPartFieldLabel->setTextFormat( Qt::PlainText ); _qt_newPartFieldLabel->setFont( YQUI::ui()->currentFont() ); _qt_newPartFieldLabel->setAlignment( Qt::AlignRight ); // lower inner HBox for the fields and the slider - _fields_hbox = new QHBox( this ); + _fields_hbox = new Q3HBox( this ); _fields_hbox->setSpacing( YQWidgetMargin ); @@ -112,7 +114,7 @@ _qt_freeSizeSlider = new QSlider( minFreeSize(), maxFreeSize(), 1, // pageStep remainingFreeSize(), // initial value - QSlider::Horizontal, _fields_hbox ); + Qt::Horizontal, _fields_hbox ); _qt_freeSizeSlider->setFont( YQUI::ui()->currentFont() ); Modified: branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQPartitionSplitter.h Thu Jul 26 15:47:28 2007 @@ -23,15 +23,15 @@ #include #include #include -#include -#include +#include +#include #include #include "QY2BarGraph.h" #include "YPartitionSplitter.h" -class YQPartitionSplitter : public QVBox, public YPartitionSplitter +class YQPartitionSplitter : public Q3VBox, public YPartitionSplitter { Q_OBJECT @@ -105,10 +105,10 @@ */ QY2BarGraph * _barGraph; - QHBox * _labels_hbox; + Q3HBox * _labels_hbox; QLabel * _qt_freeFieldLabel; QLabel * _qt_newPartFieldLabel; - QHBox * _fields_hbox; + Q3HBox * _fields_hbox; QSpinBox * _qt_freeSizeField; QSlider * _qt_freeSizeSlider; QSpinBox * _qt_newPartSizeField; Modified: branches/tmp/sh/qt4-port/qt/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQProgressBar.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQProgressBar.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQProgressBar.cc Thu Jul 26 15:47:28 2007 @@ -18,7 +18,7 @@ /-*/ -#include +#include #include #define y2log_component "qt-ui" #include @@ -37,7 +37,7 @@ const YCPString & label, const YCPInteger & maxProgress, const YCPInteger & progress ) - : QVBox( parent ) + : Q3VBox( parent ) , YProgressBar( opt, label, maxProgress, progress ) { setWidgetRep( this ); @@ -46,13 +46,13 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8(label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); - _qt_progressbar = new QProgressBar( this ); + _qt_progressbar = new Q3ProgressBar( this ); _qt_progressbar->setFont( YQUI::ui()->currentFont() ); _qt_progressbar->setTotalSteps( MAX_PROGRESS ); _qt_label->setBuddy( _qt_progressbar ); Modified: branches/tmp/sh/qt4-port/qt/src/YQProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQProgressBar.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQProgressBar.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQProgressBar.h Thu Jul 26 15:47:28 2007 @@ -21,7 +21,9 @@ #ifndef YQProgressBar_h #define YQProgressBar_h -#include +#include +//Added by qt3to4: +#include #include #include "YProgressBar.h" @@ -29,9 +31,9 @@ class QString; class QLabel; -class QProgressBar; +class Q3ProgressBar; -class YQProgressBar : public QVBox, public YProgressBar +class YQProgressBar : public Q3VBox, public YProgressBar { Q_OBJECT @@ -88,7 +90,7 @@ // QLabel * _qt_label; - QProgressBar * _qt_progressbar; + Q3ProgressBar * _qt_progressbar; }; #endif // YQProgressBar_h Modified: branches/tmp/sh/qt4-port/qt/src/YQPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQPushButton.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQPushButton.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQPushButton.cc Thu Jul 26 15:47:28 2007 @@ -37,7 +37,7 @@ setWidgetRep( this ); QPushButton * button = new QPushButton( fromUTF8( label->value() ), this ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); setQPushButton( button ); Modified: branches/tmp/sh/qt4-port/qt/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRadioButton.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRadioButton.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRadioButton.cc Thu Jul 26 15:47:28 2007 @@ -19,7 +19,7 @@ #include -#include +#include #define y2log_component "qt-ui" #include @@ -43,13 +43,13 @@ YRadioButtonGroup * rbg, const YCPString & label, bool checked ) - : QGroupBox( parent ) + : Q3GroupBox( parent ) , YRadioButton( opt, label, rbg ) { setWidgetRep( this ); setFrameStyle( NoFrame ); - QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + Q3BoxLayout * layout = new Q3BoxLayout( this, Q3BoxLayout::LeftToRight ); _qt_radiobutton = new QRadioButton( fromUTF8( label->value() ), this ); layout->addSpacing( SPACING ); Modified: branches/tmp/sh/qt4-port/qt/src/YQRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRadioButton.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRadioButton.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRadioButton.h Thu Jul 26 15:47:28 2007 @@ -21,7 +21,7 @@ #ifndef YQRadioButton_h #define YQRadioButton_h -#include +#include #include #include "YRadioButton.h" @@ -29,7 +29,7 @@ class QRadioButton; -class YQRadioButton : public QGroupBox, public YRadioButton +class YQRadioButton : public Q3GroupBox, public YRadioButton { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.cc Thu Jul 26 15:47:28 2007 @@ -19,7 +19,7 @@ #include -#include +#include #define y2log_component "qt-ui" #include #include Modified: branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRadioButtonGroup.h Thu Jul 26 15:47:28 2007 @@ -23,7 +23,7 @@ #include #include "YRadioButtonGroup.h" -class QButtonGroup; +class Q3ButtonGroup; class YQRadioButtonGroup : public QWidget, public YRadioButtonGroup { Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRichText.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRichText.cc Thu Jul 26 15:47:28 2007 @@ -21,6 +21,9 @@ #include #include "qregexp.h" +//Added by qt3to4: +#include +#include #include "YEvent.h" #include "utf8.h" #include "YQUI.h" @@ -31,7 +34,7 @@ YQRichText::YQRichText( QWidget * parent, const YWidgetOpt & opt, const YCPString & text ) - : QVBox( parent ) + : Q3VBox( parent ) , YRichText( opt, text ) { setWidgetRep( this ); @@ -46,7 +49,7 @@ if ( opt.plainTextMode.value() ) { _textBrowser->setTextFormat( Qt::PlainText ); - _textBrowser->setWordWrap( QTextEdit::NoWrap ); + _textBrowser->setWordWrap( Q3TextEdit::NoWrap ); } else { @@ -63,7 +66,7 @@ QPalette pal( _textBrowser->palette() ); QColorGroup normalColors( pal.normal() ); - normalColors.setColor( QColorGroup::Text, black ); + normalColors.setColor( QColorGroup::Text, Qt::black ); pal.setNormal( normalColors ); _textBrowser->setPalette( pal ); Modified: branches/tmp/sh/qt4-port/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQRichText.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQRichText.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQRichText.h Thu Jul 26 15:47:28 2007 @@ -21,8 +21,10 @@ #ifndef YQRichText_h #define YQRichText_h -#include -#include +#include +#include +//Added by qt3to4: +#include #include #include "YRichText.h" @@ -30,7 +32,7 @@ class YQTextBrowser; -class YQRichText : public QVBox, public YRichText +class YQRichText : public Q3VBox, public YRichText { Q_OBJECT @@ -110,7 +112,7 @@ * * This class is required only to overwrite setSource(). **/ -class YQTextBrowser: public QTextBrowser +class YQTextBrowser: public Q3TextBrowser { Q_OBJECT @@ -121,7 +123,7 @@ * Constructor **/ YQTextBrowser( QWidget * parent = 0 ): - QTextBrowser( parent ) {} + Q3TextBrowser( parent ) {} public slots: Modified: branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.cc Thu Jul 26 15:47:28 2007 @@ -20,8 +20,13 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include +#include #define y2log_component "qt-ui" #include @@ -45,7 +50,7 @@ YQSelectionBox::YQSelectionBox( QWidget * parent, const YWidgetOpt & opt, const YCPString & label ) - : QVBox( parent ) + : Q3VBox( parent ) , YSelectionBox( opt, label ) { setWidgetRep( this ); @@ -54,13 +59,13 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8(label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( _qt_label->text().isEmpty() ) _qt_label->hide(); - _qt_listbox = new QListBox( this ); + _qt_listbox = new Q3ListBox( this ); _qt_listbox->installEventFilter( this ); _qt_listbox->setVariableHeight( false ); _qt_listbox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); @@ -75,8 +80,8 @@ connect( _qt_listbox, SIGNAL( highlighted ( int ) ), this, SLOT ( slotSelected( int ) ) ); - connect( _qt_listbox, SIGNAL( doubleClicked( QListBoxItem * ) ), - this, SLOT ( slotActivated( QListBoxItem * ) ) ); + connect( _qt_listbox, SIGNAL( doubleClicked( Q3ListBoxItem * ) ), + this, SLOT ( slotActivated( Q3ListBoxItem * ) ) ); connect( &_timer, SIGNAL( timeout() ), this, SLOT ( returnImmediately() ) ); @@ -252,7 +257,7 @@ } -void YQSelectionBox::slotActivated( QListBoxItem * ) +void YQSelectionBox::slotActivated( Q3ListBoxItem * ) { YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQSelectionBox.h Thu Jul 26 15:47:28 2007 @@ -21,18 +21,21 @@ #ifndef YQSelectionBox_h #define YQSelectionBox_h -#include +#include #include +//Added by qt3to4: +#include +#include #include #include "YSelectionBox.h" class QLabel; -class QListBox; -class QListBoxItem; +class Q3ListBox; +class Q3ListBoxItem; -class YQSelectionBox : public QVBox, public YSelectionBox +class YQSelectionBox : public Q3VBox, public YSelectionBox { Q_OBJECT @@ -110,7 +113,7 @@ /** * Notification that an item has been activated (double clicked). */ - void slotActivated( QListBoxItem * item ); + void slotActivated( Q3ListBoxItem * item ); /** * Return after some millseconds delay - collect multiple events. @@ -134,7 +137,7 @@ // Widgets QLabel * _qt_label; - QListBox * _qt_listbox; + Q3ListBox * _qt_listbox; // Very small default size if specified Modified: branches/tmp/sh/qt4-port/qt/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQSlider.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQSlider.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQSlider.cc Thu Jul 26 15:47:28 2007 @@ -24,6 +24,8 @@ #include "YQUI.h" #include "YEvent.h" #include "YQSlider.h" +//Added by qt3to4: +#include YQSlider::YQSlider( QWidget * parent, @@ -33,7 +35,7 @@ int maxValue, int initialValue ) - : QVBox( parent ) + : Q3VBox( parent ) , YSlider( opt, label, minValue, maxValue, initialValue ) { setWidgetRep( this ); @@ -41,17 +43,17 @@ setSpacing( YQWidgetSpacing ); setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); _qt_label->setAlignment( Qt::AlignRight ); - _hbox = new QHBox( this ); + _hbox = new Q3HBox( this ); _hbox->setSpacing( YQWidgetSpacing ); _qt_slider = new QSlider( minValue, maxValue, 1, // pageStep initialValue, - QSlider::Horizontal, _hbox ); + Qt::Horizontal, _hbox ); _qt_slider->setFont( YQUI::ui()->currentFont() ); _qt_spinbox = new QSpinBox( minValue, maxValue, Modified: branches/tmp/sh/qt4-port/qt/src/YQSlider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQSlider.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQSlider.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQSlider.h Thu Jul 26 15:47:28 2007 @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include "YSlider.h" @@ -34,7 +34,7 @@ class QLabel; class QSlider; -class YQSlider : public QVBox, public YSlider +class YQSlider : public Q3VBox, public YSlider { Q_OBJECT @@ -102,7 +102,7 @@ QLabel * _qt_label; QSlider * _qt_slider; QSpinBox * _qt_spinbox; - QHBox * _hbox; + Q3HBox * _hbox; }; Modified: branches/tmp/sh/qt4-port/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTable.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTable.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTable.cc Thu Jul 26 15:47:28 2007 @@ -18,8 +18,8 @@ /-*/ #include -#include -#include +#include +#include #define y2log_component "qt-ui" #include @@ -30,7 +30,7 @@ -class YQListViewItem : public QListViewItem +class YQListViewItem : public Q3ListViewItem { public: @@ -40,7 +40,7 @@ * Constructor for auto-sorting **/ YQListViewItem( YQTable * table, - QListView * list_view, + Q3ListView * list_view, int index ); /** @@ -48,7 +48,7 @@ * 'after' is the item this one is to be inserted after. **/ YQListViewItem( YQTable * table, - QListView * list_view, + Q3ListView * list_view, YQListViewItem * after, int index ); @@ -59,9 +59,9 @@ YQListViewItem::YQListViewItem( YQTable * table, - QListView * list_view, + Q3ListView * list_view, int index ) - : QListViewItem( list_view ) + : Q3ListViewItem( list_view ) , index( index ) , table( table ) { @@ -69,10 +69,10 @@ YQListViewItem::YQListViewItem( YQTable * table, - QListView * list_view, + Q3ListView * list_view, YQListViewItem * after, int index ) - : QListViewItem( list_view, after ) + : Q3ListViewItem( list_view, after ) , index( index ) , table( table ) { @@ -82,7 +82,7 @@ YQTable::YQTable( QWidget * parent, const YWidgetOpt & opt, vector<string> header ) - : QVBox( parent ) + : Q3VBox( parent ) , YTable( opt, header.size() ) , _last_item(0) { @@ -91,7 +91,7 @@ setWidgetRep( this ); setMargin( YQWidgetMargin ); - _qt_listview = new QListView( this ); + _qt_listview = new Q3ListView( this ); if ( ! _enable_user_sort ) @@ -116,14 +116,14 @@ switch ( header[c][0] ) { case 'R': - _qt_listview->setColumnAlignment( c, AlignRight ); + _qt_listview->setColumnAlignment( c, Qt::AlignRight ); break; case 'C': - _qt_listview->setColumnAlignment( c, AlignCenter ); + _qt_listview->setColumnAlignment( c, Qt::AlignCenter ); break; case 'L': default: - _qt_listview->setColumnAlignment( c, AlignLeft ); + _qt_listview->setColumnAlignment( c, Qt::AlignLeft ); break; } } @@ -133,13 +133,13 @@ if ( opt.notifyMode.value() ) { - connect( _qt_listview, SIGNAL( doubleClicked ( QListViewItem * ) ), this, SLOT( slotActivated( QListViewItem * ) ) ); - connect( _qt_listview, SIGNAL( spacePressed ( QListViewItem * ) ), this, SLOT( slotActivated( QListViewItem * ) ) ); + connect( _qt_listview, SIGNAL( doubleClicked ( Q3ListViewItem * ) ), this, SLOT( slotActivated( Q3ListViewItem * ) ) ); + connect( _qt_listview, SIGNAL( spacePressed ( Q3ListViewItem * ) ), this, SLOT( slotActivated( Q3ListViewItem * ) ) ); if ( opt.immediateMode.value() ) { - connect( _qt_listview, SIGNAL( selectionChanged ( QListViewItem * ) ), - this, SLOT ( slotSelected ( QListViewItem * ) ) ); + connect( _qt_listview, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), + this, SLOT ( slotSelected ( Q3ListViewItem * ) ) ); } } @@ -210,7 +210,7 @@ void YQTable::cellChanged( int index, int colnum, const YCPString & newtext ) { - QListViewItem * item = findItem( index ); + Q3ListViewItem * item = findItem( index ); if ( item ) item->setText( colnum, fromUTF8( newtext->value() ) ); } @@ -225,7 +225,7 @@ void YQTable::setCurrentItem( int index ) { - QListViewItem * item = findItem( index ); + Q3ListViewItem * item = findItem( index ); if ( item ) // should be always true { @@ -237,10 +237,10 @@ } -QListViewItem * YQTable::findItem( int index ) +Q3ListViewItem * YQTable::findItem( int index ) { // Scan all items and look for the one with the right index. - QListViewItem * item = _qt_listview->firstChild(); + Q3ListViewItem * item = _qt_listview->firstChild(); while ( item ) { if ( ( ( YQListViewItem *)item )->index == index ) @@ -259,7 +259,7 @@ } -void YQTable::slotSelected( QListViewItem * ) +void YQTable::slotSelected( Q3ListViewItem * ) { if ( getNotify() ) { @@ -273,7 +273,7 @@ } -void YQTable::slotActivated( QListViewItem * ) +void YQTable::slotActivated( Q3ListViewItem * ) { if ( getNotify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); Modified: branches/tmp/sh/qt4-port/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTable.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTable.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTable.h Thu Jul 26 15:47:28 2007 @@ -20,17 +20,17 @@ #ifndef YQTable_h #define YQTable_h -#include +#include #include #include "YTable.h" -class QListView; -class QListViewItem; +class Q3ListView; +class Q3ListViewItem; class YQListViewItem; -class YQTable : public QVBox, public YTable +class YQTable : public Q3VBox, public YTable { Q_OBJECT @@ -106,13 +106,13 @@ * Notification that an item is selected. * Only relevant if `opt(`notify, `immediate) is set. */ - void slotSelected( QListViewItem * ); + void slotSelected( Q3ListViewItem * ); /** * Notification that an item is activated. * Only relevant if `opt(`notify) is set. */ - void slotActivated( QListViewItem * ); + void slotActivated( Q3ListViewItem * ); /** @@ -125,12 +125,12 @@ /** * Helper function. Find item with given id. */ - QListViewItem * findItem( int index ); + Q3ListViewItem * findItem( int index ); /** * The Qt widget representing the table */ - QListView * _qt_listview; + Q3ListView * _qt_listview; // Modified: branches/tmp/sh/qt4-port/qt/src/YQTextEntry.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTextEntry.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTextEntry.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTextEntry.cc Thu Jul 26 15:47:28 2007 @@ -22,9 +22,6 @@ #include #include -#include -#include -#include #define y2log_component "qt-ui" #include @@ -37,12 +34,16 @@ #include "YQTextEntry.h" #include "YQi18n.h" +#include +#include +#include + YQTextEntry::YQTextEntry( QWidget * parent, const YWidgetOpt & opt, const YCPString & label, const YCPString & text ) - : QVBox( parent ) + : Q3VBox( parent ) , YTextEntry( opt, label ) , _validator(0) , _displayingCapsLockWarning( false ) @@ -53,7 +54,7 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) Modified: branches/tmp/sh/qt4-port/qt/src/YQTextEntry.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTextEntry.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTextEntry.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTextEntry.h Thu Jul 26 15:47:28 2007 @@ -21,7 +21,7 @@ #ifndef YQTextEntry_h #define YQTextEntry_h -#include +#include #include #include @@ -35,7 +35,7 @@ class YQRawLineEdit; -class YQTextEntry : public QVBox, public YTextEntry +class YQTextEntry : public Q3VBox, public YTextEntry { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/YQTime.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTime.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTime.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTime.cc Thu Jul 26 15:47:28 2007 @@ -23,6 +23,8 @@ #include "utf8.h" #include "YQUI.h" #include "YQTime.h" +//Added by qt3to4: +#include YQTime::YQTime( QWidget * parent, @@ -30,7 +32,7 @@ const YCPString & label, const YCPString & time ) //: QTimeEdit ( parent ) - : QVBox( parent ) + : Q3VBox( parent ) , YTime( opt, label ) { setWidgetRep( this ); @@ -38,14 +40,14 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8(label->value()), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); - _qt_timeedit = new QTimeEdit( this ); - _qt_timeedit->setTime( QTime::fromString(time->value(), Qt::ISODate )); + _qt_timeedit = new Q3TimeEdit( this ); + _qt_timeedit->setTime( QTime::fromString( time->value().c_str(), Qt::ISODate )); _qt_label->setBuddy( _qt_timeedit ); } @@ -85,8 +87,7 @@ void YQTime::setNewTime( const YCPString & time ) { - _qt_timeedit->setTime( QTime::fromString(time->value(), Qt::ISODate )); - + _qt_timeedit->setTime( QTime::fromString( time->value().c_str(), Qt::ISODate ) ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQTime.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTime.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTime.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTime.h Thu Jul 26 15:47:28 2007 @@ -20,8 +20,8 @@ #ifndef YQTime_h #define YQTime_h -#include -#include +#include +#include #include #include #include @@ -29,7 +29,7 @@ #include "YTime.h" -class YQTime : public QVBox, public YTime +class YQTime : public Q3VBox, public YTime { Q_OBJECT @@ -83,7 +83,7 @@ //void setTime( const YCPString & label ); protected: - QTimeEdit * _qt_timeedit; + Q3TimeEdit * _qt_timeedit; QLabel * _qt_label; }; Modified: branches/tmp/sh/qt4-port/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTree.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTree.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTree.cc Thu Jul 26 15:47:28 2007 @@ -18,11 +18,13 @@ /-*/ -#include +#include #include -#include -#include +#include +#include #include +//Added by qt3to4: +#include #define y2log_component "qt-ui" #include @@ -41,7 +43,7 @@ YQTree::YQTree( QWidget * parent, const YWidgetOpt & opt, const YCPString & label ) - : QVBox( parent ) + : Q3VBox( parent ) , YTree ( opt, label ) { setWidgetRep( this ); @@ -52,10 +54,10 @@ _nextSerialNo = 0; _qt_label = new QLabel( fromUTF8( label->value() ), this ); - _qt_label->setTextFormat( QLabel::PlainText ); + _qt_label->setTextFormat( Qt::PlainText ); _qt_label->setFont( YQUI::ui()->currentFont() ); - _listView = new QListView( this ); + _listView = new Q3ListView( this ); _listView->setFont( YQUI::ui()->currentFont() ); _listView->addColumn( "" ); _listView->header()->hide(); @@ -66,10 +68,10 @@ connect( _listView, SIGNAL( selectionChanged ( void ) ), this, SLOT ( slotSelected ( void ) ) ); - connect( _listView, SIGNAL( spacePressed ( QListViewItem * ) ), + connect( _listView, SIGNAL( spacePressed ( Q3ListViewItem * ) ), this, SLOT ( slotActivated ( void ) ) ); - connect( _listView, SIGNAL( doubleClicked ( QListViewItem * ) ), + connect( _listView, SIGNAL( doubleClicked ( Q3ListViewItem * ) ), this, SLOT ( slotActivated ( void ) ) ); } @@ -223,10 +225,10 @@ YQTreeItem::YQTreeItem( YQTree * tree, - QListView * parent, + Q3ListView * parent, YTreeItem * yTreeItem, int serial ) - : QListViewItem( parent ) + : Q3ListViewItem( parent ) { init( tree, yTreeItem, serial ); } @@ -236,7 +238,7 @@ YQTreeItem * parent, YTreeItem * yTreeItem, int serial ) - : QListViewItem( parent ) + : Q3ListViewItem( parent ) { init( tree, yTreeItem, serial ); } @@ -298,7 +300,7 @@ void YQTreeItem::setOpen( bool open ) { - QListViewItem::setOpen( open ); + Q3ListViewItem::setOpen( open ); _origItem->setOpen( open ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQTree.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQTree.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQTree.h Thu Jul 26 15:47:28 2007 @@ -21,9 +21,11 @@ #ifndef YQTree_h #define YQTree_h -#include -#include -#include +#include +#include +#include +//Added by qt3to4: +#include #include #include "YTree.h" @@ -33,7 +35,7 @@ class YQTreeItem; -class YQTree : public QVBox, public YTree +class YQTree : public Q3VBox, public YTree { Q_OBJECT @@ -135,7 +137,7 @@ /** * The real tree: The QListView widget. */ - QListView * _listView; + Q3ListView * _listView; /** * The next item serial number. @@ -150,11 +152,11 @@ * * registerItem() adds a pair to this map. */ - QPtrDict <YQTreeItem> _yTreeItemToYQTreeItem; + Q3PtrDict <YQTreeItem> _yTreeItemToYQTreeItem; }; -class YQTreeItem: public QListViewItem +class YQTreeItem: public Q3ListViewItem { public: @@ -162,7 +164,7 @@ * Constructor for a top level item. **/ YQTreeItem( YQTree * tree, - QListView * parent, + Q3ListView * parent, YTreeItem * origItem, int serial ); Modified: branches/tmp/sh/qt4-port/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI.h Thu Jul 26 15:47:28 2007 @@ -36,9 +36,10 @@ #define YQWidgetSpacing 4 #define YQButtonBorder 3 -class QVBox; -class QWidgetStack; +class Q3VBox; +class Q3WidgetStack; class QCursor; +class QEvent; class YEvent; class QY2Settings; class YQPackageSelectorPlugin; @@ -746,12 +747,12 @@ * argument, so this needs to be embedded into something else - and a QVBox * at least handles all the sizeHint and resize stuff. **/ - QVBox * _main_win; + Q3VBox * _main_win; /** * Stack for the Qt widgets inside the main window. **/ - QWidgetStack * _widget_stack; + Q3WidgetStack * _widget_stack; /** * Stack to keep track of the stacking order of popup dialogs. Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_builtins.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_builtins.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_builtins.cc Thu Jul 26 15:47:28 2007 @@ -26,11 +26,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #define y2log_component "qt-ui" @@ -213,12 +213,12 @@ if ( interactive ) { - QMessageBox::warning( 0, // parent - "Error", // caption + QMessageBox::warning( 0, // parent + "Error", // caption QString( "Couldn't save screen shot\nto %1" ).arg( fileName ), QMessageBox::Ok | QMessageBox::Default, // button0 - QMessageBox::NoButton, // button1 - QMessageBox::NoButton ); // button2 + Qt::NoButton, // button1 + Qt::NoButton ); // button2 } } @@ -326,7 +326,7 @@ normalCursor(); QString filename = - QFileDialog::getSaveFileName( DEFAULT_MACRO_FILE_NAME, // startWith + Q3FileDialog::getSaveFileName( DEFAULT_MACRO_FILE_NAME, // startWith "*.ycp", // filter 0, // parent 0, // (widget) name @@ -345,7 +345,7 @@ normalCursor(); QString filename = - QFileDialog::getOpenFileName( DEFAULT_MACRO_FILE_NAME, // startWith + Q3FileDialog::getOpenFileName( DEFAULT_MACRO_FILE_NAME, // startWith "*.ycp", // filter 0, // parent 0, // (widget) name @@ -377,7 +377,7 @@ normalCursor(); QString dir_name = - QFileDialog::getExistingDirectory( fromUTF8( startDir->value() ), + Q3FileDialog::getExistingDirectory( fromUTF8( startDir->value() ), _main_win, // parent "dir_selector", // name fromUTF8( headline->value() ) ); // caption @@ -397,7 +397,7 @@ normalCursor(); QString file_name = - QFileDialog::getOpenFileName( fromUTF8( startWith->value() ), + Q3FileDialog::getOpenFileName( fromUTF8( startWith->value() ), fromUTF8( filter->value() ), _main_win, // parent "file_selector", // name @@ -442,7 +442,7 @@ // Leave the mouse cursor alone - this function might be called from // some other widget, not only from UI::AskForSaveFileName(). - file_name = QFileDialog::getSaveFileName( startWith, + file_name = Q3FileDialog::getSaveFileName( startWith, filter, _main_win, // parent "file_selector", // name Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc Thu Jul 26 15:47:28 2007 @@ -25,10 +25,9 @@ #include #include #include -#include -#include - -#include "qxembed.h" +#include +#include +#include #include #include @@ -87,22 +86,39 @@ qInstallMsgHandler( qMessageHandler ); -#if ! KYAST_EMBEDDING - _running_embedded = ( getenv( "KCMYAST2_CALL" ) != 0 ); -#endif + _running_embedded = false; -#if KYAST_EMBEDDING - if ( ! runningEmbedded() ) + + // DEBUG + // DEBUG + // DEBUG + char ** argv_copy = (char **) malloc( (argc+1) * sizeof( const char * ) ); + + for ( int i=0; i < argc; i++ ) + argv_copy[i+1] = strdup( argv[i] ); + + argv_copy[0] = strdup( "YaST2" ); + // DEBUG + // DEBUG + // DEBUG + +#if 0 + new QApplication( argc, argv_copy, + true ); // GUI enabled #endif - new QApplication( argc, argv ); + + int argc_copy = argc; + new QApplication( argc_copy, argv_copy, + true ); // GUI enabled + loadPredefinedQtTranslations(); _normalPalette = qApp->palette(); // Qt keeps track to a global QApplication in qApp. - CHECK_PTR( qApp ); + Q_CHECK_PTR( qApp ); qApp->installEventFilter( this ); - processCommandLineArgs( argc, argv ); + processCommandLineArgs( argc_copy, argv_copy ); calcDefaultSize(); @@ -111,12 +127,12 @@ // We have to use something else than QWidgetStack since QWidgetStack // doesn't accept a WFlags arg which we badly need here. - WFlags wflags = WType_TopLevel; + Qt::WFlags wflags = Qt::WType_TopLevel; if ( ! _decorate_toplevel_window ) { y2debug( "Suppressing WM decorations for toplevel window" ); - wflags |= WStyle_Customize | WStyle_NoBorder; + wflags |= Qt::WStyle_Customize | Qt::WStyle_NoBorder; } // if we have a window already, delete it @@ -124,15 +140,15 @@ delete _main_win; if ( _embeddingParent ) - _main_win = new QVBox( _embeddingParent ); + _main_win = new Q3VBox( _embeddingParent ); else - _main_win = new QVBox( 0, 0, wflags ); // parent, name, wflags + _main_win = new Q3VBox( 0, 0, wflags ); // parent, name, wflags // Create widget stack for `opt(`defaultsize) dialogs - _widget_stack = new QWidgetStack( _main_win ); - _widget_stack->setFocusPolicy( QWidget::StrongFocus ); + _widget_stack = new Q3WidgetStack( _main_win ); + _widget_stack->setFocusPolicy( Qt::StrongFocus ); qApp->setMainWidget( _main_win ); _main_win->installEventFilter( this ); _main_win->resize( _default_size ); @@ -204,16 +220,19 @@ // Workaround: Keep one more reference to libqt-mt open - dlopen() it here // and make sure there is no corresponding dlclose(). +#if 0 QString qt_lib_name = QString( QTLIBDIR "/libqt-mt.so.%1" ).arg( QT_VERSION >> 16 );; void * qt_lib = dlopen( (const char *) qt_lib_name, RTLD_GLOBAL ); y2milestone( "Forcing %s open %s", (const char *) qt_lib_name, qt_lib ? "successful" : "failed" ); +#else +#warning reactivate force-loading the shared Qt lib! +#endif // Init other stuff qApp->setFont( currentFont() ); - QXEmbed::initialize(); busyCursor(); connect( & _user_input_timer, SIGNAL( timeout() ), @@ -501,7 +520,7 @@ qt_parent = _popup_stack.back(); YQDialog * dialog = new YQDialog( opt, qt_parent, has_defaultsize ); - CHECK_PTR( dialog ); + Q_CHECK_PTR( dialog ); if ( ! has_defaultsize ) _popup_stack.push_back( (QWidget *) dialog->widgetRep() ); @@ -660,6 +679,9 @@ case QtWarningMsg: y2warning ("qt-warning: %s\n", msg); break; + case QtCriticalMsg: + y2warning ("qt-critical: %s\n", msg); + break; case QtFatalMsg: y2internal ("qt-fatal: %s\n", msg); exit (1); // qt does the same Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_widgets.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_widgets.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_widgets.cc Thu Jul 26 15:47:28 2007 @@ -19,6 +19,7 @@ #define y2log_component "qt-ui" #include +#include #include "YQUI.h" @@ -373,7 +374,7 @@ bool YQUI::hasColoredLabel() { - return QColor::numBitPlanes() >= 15; + return qApp->desktop()->depth() >= 15; } YWidget * YQUI::createColoredLabel ( YWidget * parent, @@ -383,10 +384,10 @@ YColor background, int margin ) { - if ( QColor::numBitPlanes() < 15 ) + if ( qApp->desktop()->depth() < 15 ) { y2error( "Display depth is %d, need at least 15 for ColoredLabel", - QColor::numBitPlanes() ); + qApp->desktop()->depth() ); return 0; } Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc Thu Jul 26 15:47:28 2007 @@ -20,14 +20,16 @@ /-*/ +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include +#include #include @@ -55,13 +57,13 @@ int YQUI::getDisplayDepth() { - return QColor::numBitPlanes(); + return qApp->desktop()->depth(); } long YQUI::getDisplayColors() { - return 1L << QColor::numBitPlanes(); + return 1L << qApp->desktop()->depth(); } @@ -101,7 +103,7 @@ void YQUI::busyCursor( void ) { - qApp->setOverrideCursor( Qt::busyCursor ); + qApp->setOverrideCursor( Qt::BusyCursor ); } @@ -463,7 +465,7 @@ if ( ! _lang_fonts ) { _lang_fonts = new QY2Settings( LANG_FONTS_FILE ); - CHECK_PTR( _lang_fonts ); + Q_CHECK_PTR( _lang_fonts ); if ( _lang_fonts->readError() ) y2error( "Error reading %s", (const char *) _lang_fonts->fileName() ); Modified: branches/tmp/sh/qt4-port/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQWizard.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQWizard.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQWizard.cc Thu Jul 26 15:47:28 2007 @@ -40,24 +40,30 @@ #include <string> -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include "QY2ListView.h" +//Added by qt3to4: +#include +#include +#include +#include +#include #include "utf8.h" #include "YQi18n.h" @@ -121,7 +127,7 @@ const YCPValue & backButtonId, const YCPString & backButtonLabel, const YCPValue & abortButtonId, const YCPString & abortButtonLabel, const YCPValue & nextButtonId, const YCPString & nextButtonLabel ) - : QVBox( parent ) + : Q3VBox( parent ) , YWizard( opt, backButtonId, backButtonLabel, abortButtonId, abortButtonLabel, @@ -202,7 +208,7 @@ layoutTitleBar( this ); #else QWidget * spacer = addVSpacing( this, WORK_AREA_TOP_MARGIN ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); # if ENABLE_GRADIENTS spacer->setPaletteBackgroundColor( _gradientCenterColor ); @@ -210,8 +216,8 @@ #endif } - QHBox * hBox = new QHBox( this ); - CHECK_PTR( hBox ); + Q3HBox * hBox = new Q3HBox( this ); + Q_CHECK_PTR( hBox ); if ( ! runningEmbedded() ) layoutSideBar( hBox ); @@ -241,8 +247,8 @@ } - QHBox * titleBar = new QHBox( parent ); - CHECK_PTR( titleBar ); + Q3HBox * titleBar = new Q3HBox( parent ); + Q_CHECK_PTR( titleBar ); #if ENABLE_GRADIENTS setGradient( titleBar, _titleBarGradientPixmap ); @@ -279,7 +285,7 @@ // QLabel * right = new QLabel( titleBar ); - CHECK_PTR( right ); + Q_CHECK_PTR( right ); QPixmap rightLogo( PIXMAP_DIR "title-bar-right.png" ); @@ -295,8 +301,8 @@ void YQWizard::layoutSideBar( QWidget * parent ) { - _sideBar = new QWidgetStack( parent ); - CHECK_PTR( _sideBar ); + _sideBar = new Q3WidgetStack( parent ); + Q_CHECK_PTR( _sideBar ); _sideBar->setMinimumWidth( YQUI::ui()->defaultSize( YD_HORIZ ) / 5 ); _sideBar->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred ) ); // hor/vert _sideBar->setMargin( 0 ); @@ -320,8 +326,8 @@ void YQWizard::layoutStepsPanel() { - _stepsPanel = new QVBox( _sideBar ); - CHECK_PTR( _stepsPanel ); + _stepsPanel = new Q3VBox( _sideBar ); + Q_CHECK_PTR( _stepsPanel ); #if ENABLE_GRADIENTS @@ -330,7 +336,7 @@ // Top gradient QLabel * topGradient = new QLabel( _stepsPanel ); - CHECK_PTR( topGradient ); + Q_CHECK_PTR( topGradient ); setGradient( topGradient, _topGradientPixmap ); # endif @@ -341,15 +347,15 @@ _sideBar->addWidget( _stepsPanel ); - _stepsBox = new QVBox( _stepsPanel ); - CHECK_PTR( _stepsBox ); + _stepsBox = new Q3VBox( _stepsPanel ); + Q_CHECK_PTR( _stepsBox ); #if ENABLE_GRADIENTS _stepsBox->setPaletteBackgroundColor( _gradientCenterColor ); #endif _stepsBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); // hor/vert QWidget * stretch = addVStretch( _stepsPanel ); - CHECK_PTR( stretch ); + Q_CHECK_PTR( stretch ); #if ENABLE_GRADIENTS stretch->setPaletteBackgroundColor( _gradientCenterColor ); #endif @@ -360,7 +366,7 @@ QLabel * helpButtonBox = new QLabel( _stepsPanel ); #if ENABLE_GRADIENTS - CHECK_PTR( helpButtonBox ); + Q_CHECK_PTR( helpButtonBox ); setGradient( helpButtonBox, _bottomGradientPixmap ); #endif @@ -368,12 +374,12 @@ // Layouts for the buttons - QVBoxLayout * vbox = new QVBoxLayout( helpButtonBox, 0, 0 ); // parent, margin, spacing - CHECK_PTR( vbox ); + Q3VBoxLayout * vbox = new Q3VBoxLayout( helpButtonBox, 0, 0 ); // parent, margin, spacing + Q_CHECK_PTR( vbox ); vbox->addStretch( 99 ); - QHBoxLayout * hbox = new QHBoxLayout( vbox, 0 ); // parent, spacing + Q3HBoxLayout * hbox = new Q3HBoxLayout( vbox, 0 ); // parent, spacing hbox->addStretch( 99 ); _releaseNotesButton = new QPushButton( _( "Release Notes..." ), helpButtonBox ); @@ -388,12 +394,12 @@ hbox->addStretch( 99 ); vbox->addStretch( 99 ); - hbox = new QHBoxLayout( vbox, 0 ); // parent, spacing + hbox = new Q3HBoxLayout( vbox, 0 ); // parent, spacing hbox->addStretch( 99 ); // Help button - intentionally without keyboard shortcut _helpButton = new QPushButton( _( "Help" ), helpButtonBox ); - CHECK_PTR( _helpButton ); + Q_CHECK_PTR( _helpButton ); hbox->addWidget( _helpButton ); hbox->addStretch( 99 ); @@ -475,7 +481,7 @@ // QWidget * stepsParent = new QWidget( _stepsBox ); - CHECK_PTR( stepsParent ); + Q_CHECK_PTR( stepsParent ); stepsParent->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); // hor/vert #if ENABLE_GRADIENTS stepsParent->setPaletteBackgroundColor( _gradientCenterColor ); @@ -483,10 +489,10 @@ // Create a grid layout for the steps - _stepsGrid = new QGridLayout( stepsParent, // parent + _stepsGrid = new Q3GridLayout( stepsParent, // parent _stepsList.count(), 4, // rows, cols 0, STEPS_SPACING ); // margin, spacing - CHECK_PTR( _stepsGrid ); + Q_CHECK_PTR( _stepsGrid ); const int statusCol = 1; const int nameCol = 2; @@ -507,11 +513,11 @@ int row = 0; QWidget * leftSpacer = addHSpacing( stepsParent, STEPS_MARGIN ); - CHECK_PTR( leftSpacer ); + Q_CHECK_PTR( leftSpacer ); _stepsGrid->addWidget( leftSpacer, row, 0 ); QWidget * rightSpacer = addHSpacing( stepsParent, STEPS_MARGIN ); - CHECK_PTR( rightSpacer ); + Q_CHECK_PTR( rightSpacer ); _stepsGrid->addWidget( rightSpacer, row, 3 ); @@ -530,7 +536,7 @@ // Spacing QWidget * spacer = addVSpacing( stepsParent, STEPS_HEADING_SPACING ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); _stepsGrid->addWidget( spacer, row++, nameCol ); } @@ -539,7 +545,7 @@ // QLabel * label = new QLabel( step->name(), stepsParent ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setAlignment( Qt::AlignLeft | Qt::AlignTop ); #if USE_FIXED_STEP_FONTS @@ -570,7 +576,7 @@ // QLabel * statusLabel = new QLabel( stepsParent ); - CHECK_PTR( statusLabel ); + Q_CHECK_PTR( statusLabel ); step->setStatusLabel( statusLabel ); _stepsGrid->addWidget( statusLabel, row, statusCol ); @@ -581,7 +587,7 @@ // QLabel * nameLabel = new QLabel( step->name(), stepsParent ); - CHECK_PTR( nameLabel ); + Q_CHECK_PTR( nameLabel ); nameLabel->setAlignment( Qt::AlignLeft | Qt::AlignTop ); #if USE_FIXED_STEP_FONTS @@ -684,27 +690,27 @@ void YQWizard::layoutHelpPanel() { - _helpPanel = new QHBox( _sideBar ); - CHECK_PTR( _helpPanel ); + _helpPanel = new Q3HBox( _sideBar ); + Q_CHECK_PTR( _helpPanel ); _sideBar->addWidget( _helpPanel ); addGradientColumn( _helpPanel ); - QVBox * vbox = new QVBox( _helpPanel ); - CHECK_PTR( vbox ); + Q3VBox * vbox = new Q3VBox( _helpPanel ); + Q_CHECK_PTR( vbox ); // Help browser - _helpBrowser = new QTextBrowser( vbox ); - CHECK_PTR( _helpBrowser ); + _helpBrowser = new Q3TextBrowser( vbox ); + Q_CHECK_PTR( _helpBrowser ); _helpBrowser->setMimeSourceFactory( 0 ); _helpBrowser->setFont( YQUI::ui()->currentFont() ); _helpBrowser->installEventFilter( this ); _helpBrowser->setTextFormat( Qt::RichText ); _helpBrowser->setMargin( 4 ); - _helpBrowser->setResizePolicy( QScrollView::Manual ); + _helpBrowser->setResizePolicy( Q3ScrollView::Manual ); if ( highColorDisplay() ) { @@ -724,7 +730,7 @@ QLabel * buttonBox = new QLabel( vbox ); - CHECK_PTR( buttonBox ); + Q_CHECK_PTR( buttonBox ); QPushButton * button; QPixmap pixmap; @@ -733,7 +739,7 @@ { // "Tree" button - intentionally without keyboard shortcut button = new QPushButton( _( "Tree" ), buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); _treeButton = button; #if USE_ICON_ON_HELP_BUTTON @@ -745,7 +751,7 @@ { // "Steps" button - intentionally without keyboard shortcut button = new QPushButton( _( "Steps" ), buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); _stepsButton = button; #if USE_ICON_ON_HELP_BUTTON @@ -756,7 +762,7 @@ { // Create a dummy button just to find out how high it would become button = new QPushButton( "Dummy", buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); } @@ -788,12 +794,12 @@ void YQWizard::layoutSideBarButtonBox( QWidget * parent, QPushButton * button ) { - QVBoxLayout * vbox = new QVBoxLayout( parent, 0, 0 ); // parent, margin, spacing - CHECK_PTR( vbox ); + Q3VBoxLayout * vbox = new Q3VBoxLayout( parent, 0, 0 ); // parent, margin, spacing + Q_CHECK_PTR( vbox ); vbox->addSpacing( BUTTON_BOX_TOP_MARGIN ); - QHBoxLayout * hbox = new QHBoxLayout( vbox, 0 ); // parent, spacing - CHECK_PTR( hbox ); + Q3HBoxLayout * hbox = new Q3HBoxLayout( vbox, 0 ); // parent, spacing + Q_CHECK_PTR( hbox ); hbox->addStretch( 99 ); hbox->addWidget( button ); @@ -817,21 +823,21 @@ void YQWizard::layoutTreePanel() { - _treePanel = new QHBox( _sideBar ); - CHECK_PTR( _treePanel ); + _treePanel = new Q3HBox( _sideBar ); + Q_CHECK_PTR( _treePanel ); _sideBar->addWidget( _treePanel ); // Left margin (with gradients) addGradientColumn( _treePanel ); - QVBox * vbox = new QVBox( _treePanel ); - CHECK_PTR( vbox ); + Q3VBox * vbox = new Q3VBox( _treePanel ); + Q_CHECK_PTR( vbox ); // Selection tree _tree = new QY2ListView( vbox ); - CHECK_PTR( _tree ); + Q_CHECK_PTR( _tree ); _tree->addColumn( "" ); _tree->header()->hide(); _tree->setRootIsDecorated( true ); @@ -839,22 +845,22 @@ connect( _tree, SIGNAL( selectionChanged ( void ) ), this, SLOT ( treeSelectionChanged ( void ) ) ); - connect( _tree, SIGNAL( spacePressed ( QListViewItem * ) ), - this, SLOT ( sendTreeEvent ( QListViewItem * ) ) ); + connect( _tree, SIGNAL( spacePressed ( Q3ListViewItem * ) ), + this, SLOT ( sendTreeEvent ( Q3ListViewItem * ) ) ); - connect( _tree, SIGNAL( doubleClicked ( QListViewItem * ) ), - this, SLOT ( sendTreeEvent ( QListViewItem * ) ) ); + connect( _tree, SIGNAL( doubleClicked ( Q3ListViewItem * ) ), + this, SLOT ( sendTreeEvent ( Q3ListViewItem * ) ) ); // Bottom gradient QLabel * buttonBox = new QLabel( vbox ); - CHECK_PTR( buttonBox ); + Q_CHECK_PTR( buttonBox ); // "Help" button - intentionally without keyboard shortcut QPushButton * button = new QPushButton( _( "Help" ), buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); #if USE_ICON_ON_HELP_BUTTON QPixmap pixmap( PIXMAP_DIR "help-button.png" ); @@ -894,12 +900,12 @@ if ( parent ) { item = new YQWizard::TreeItem( parent, text, id ); - CHECK_PTR( item ); + Q_CHECK_PTR( item ); } else { item = new YQWizard::TreeItem( _tree, text, id ); - CHECK_PTR( item ); + Q_CHECK_PTR( item ); } if ( ! id.isEmpty() ) @@ -944,7 +950,7 @@ } -void YQWizard::sendTreeEvent( QListViewItem * listViewItem ) +void YQWizard::sendTreeEvent( Q3ListViewItem * listViewItem ) { if ( listViewItem ) { @@ -967,7 +973,7 @@ { if ( _tree ) { - QListViewItem * sel = _tree->selectedItem(); + Q3ListViewItem * sel = _tree->selectedItem(); if ( sel ) { @@ -984,21 +990,21 @@ -void YQWizard::layoutWorkArea( QHBox * parentHBox ) +void YQWizard::layoutWorkArea( Q3HBox * parentHBox ) { - QVBox * workAreaVBox = new QVBox( parentHBox ); - CHECK_PTR( workAreaVBox ); + Q3VBox * workAreaVBox = new Q3VBox( parentHBox ); + Q_CHECK_PTR( workAreaVBox ); // An extra QVBox inside the workAreaVBox is needed for frame and margin - QVBox * workArea = new QVBox( workAreaVBox ); - CHECK_PTR( workArea ); + Q3VBox * workArea = new Q3VBox( workAreaVBox ); + Q_CHECK_PTR( workArea ); #if ENABLE_GRADIENTS - workArea->setFrameStyle( QFrame::Box | QFrame::Plain ); + workArea->setFrameStyle( Q3Frame::Box | Q3Frame::Plain ); workArea->setMargin( 4 ); #else - workArea->setFrameStyle( QFrame::Box | QFrame::Sunken ); + workArea->setFrameStyle( Q3Frame::Box | Q3Frame::Sunken ); // workArea->setFrameStyle( QFrame::TabWidgetPanel | QFrame::Sunken ); #endif @@ -1009,11 +1015,11 @@ // Placed directly inside workArea the menu bar positions itself at (0,0) // and so obscures any kind of frame there might be. - _menuBarBox = new QVBox( workArea ); - CHECK_PTR( _menuBarBox ); + _menuBarBox = new Q3VBox( workArea ); + Q_CHECK_PTR( _menuBarBox ); _menuBar = new QMenuBar( _menuBarBox ); - CHECK_PTR( _menuBar ); + Q_CHECK_PTR( _menuBar ); _menuBarBox->hide(); // will be made visible when menus are added @@ -1022,20 +1028,20 @@ // Dialog icon and heading // - QHBox * headingHBox = new QHBox( workArea ); - CHECK_PTR( headingHBox ); + Q3HBox * headingHBox = new Q3HBox( workArea ); + Q_CHECK_PTR( headingHBox ); headingHBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert addHSpacing( headingHBox, SEPARATOR_MARGIN ); _dialogIcon = new QLabel( headingHBox ); - CHECK_PTR( _dialogIcon ); + Q_CHECK_PTR( _dialogIcon ); _dialogIcon->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); // hor/vert addHSpacing( headingHBox ); _dialogHeading = new QLabel( headingHBox ); - CHECK_PTR( _dialogHeading ); + Q_CHECK_PTR( _dialogHeading ); _dialogHeading->setFont( YQUI::ui()->headingFont() ); _dialogHeading->setAlignment( Qt::AlignLeft | Qt::WordBreak ); _dialogHeading->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert @@ -1047,13 +1053,13 @@ #if USE_SEPARATOR - QHBox * hbox = new QHBox( workArea ); + Q3HBox * hbox = new Q3HBox( workArea ); addHSpacing( hbox, SEPARATOR_MARGIN ); - QFrame * separator = new QFrame( hbox ); - CHECK_PTR( separator ); - separator->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + Q3Frame * separator = new Q3Frame( hbox ); + Q_CHECK_PTR( separator ); + separator->setFrameStyle( Q3Frame::HLine | Q3Frame::Sunken ); addHSpacing( hbox, SEPARATOR_MARGIN ); addVSpacing( workArea ); @@ -1087,8 +1093,8 @@ void YQWizard::layoutClientArea( QWidget * parent ) { - _clientArea = new QVBox( parent ); - CHECK_PTR( _clientArea ); + _clientArea = new Q3VBox( parent ); + Q_CHECK_PTR( _clientArea ); _clientArea->setMargin( 4 ); #if 0 @@ -1104,10 +1110,10 @@ hvstretchOpt.isHStretchable.setValue( true ); hvstretchOpt.isVStretchable.setValue( true ); _contents = new YQAlignment( _clientArea, hvstretchOpt, YAlignCenter, YAlignCenter ); - CHECK_PTR( _contents ); + Q_CHECK_PTR( _contents ); addChild( _contents ); - _contents->setParent( this ); + _contents->YWidget::setParent( this ); _contents->installEventFilter( this ); _contents->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -1118,11 +1124,11 @@ YWidgetOpt widgetOpt; YQReplacePoint * replacePoint = new YQReplacePoint( _contents, widgetOpt ); - CHECK_PTR( replacePoint ); + Q_CHECK_PTR( replacePoint ); replacePoint->setId( YCPSymbol( YWizardContentsReplacePointID ) ); // `id(`contents) _contents->addChild( replacePoint ); - replacePoint->setParent( _contents ); + replacePoint->YWidget::setParent( _contents ); // @@ -1130,7 +1136,7 @@ // YQEmpty * empty = new YQEmpty( replacePoint, widgetOpt ); - empty->setParent( replacePoint ); + empty->YWidget::setParent( replacePoint ); replacePoint->addChild( empty ); } @@ -1143,18 +1149,18 @@ // QWidget * buttonBox = new QWidget( parent ); - CHECK_PTR( buttonBox ); + Q_CHECK_PTR( buttonBox ); YQDialog * dialog = dynamic_cast( YQUI::ui()->currentDialog() ); - CHECK_PTR( dialog ); + Q_CHECK_PTR( dialog ); // Using old-style layouts to enable a seamless background with the // gradient pixmap: Any sub-widgets (QVBox, QHBox) would have to get yet // another portion of that gradient as their backround pixmap, and it would // be very hard to cover all cases - resizing, hiding individual buttons, etc. - QVBoxLayout * vbox = new QVBoxLayout( buttonBox, 0, 0 ); // parent, margin, spacing - CHECK_PTR( vbox ); + Q3VBoxLayout * vbox = new Q3VBoxLayout( buttonBox, 0, 0 ); // parent, margin, spacing + Q_CHECK_PTR( vbox ); vbox->addSpacing( BUTTON_BOX_TOP_MARGIN ); @@ -1163,8 +1169,8 @@ // QHBoxLayout for the buttons // - QHBoxLayout * hbox = new QHBoxLayout( vbox, 2 ); // parent, spacing - CHECK_PTR( hbox ); + Q3HBoxLayout * hbox = new Q3HBoxLayout( vbox, 2 ); // parent, spacing + Q_CHECK_PTR( hbox ); // @@ -1172,7 +1178,7 @@ // _backButton = new YQWizardButton( this, dialog, buttonBox, _backButtonLabel, _backButtonId ); - CHECK_PTR( _backButton ); + Q_CHECK_PTR( _backButton ); hbox->addWidget( (QWidget *) _backButton->widgetRep() ); addChild( _backButton ); // Enable shortcut checking for this button @@ -1182,7 +1188,7 @@ _backButtonSpacer = new QSpacerItem( 0, 0, // width, height QSizePolicy::Expanding, // horizontal QSizePolicy::Minimum ); // vertical - CHECK_PTR( _backButtonSpacer ); + Q_CHECK_PTR( _backButtonSpacer ); hbox->addItem( _backButtonSpacer ); @@ -1202,7 +1208,7 @@ // _abortButton = new YQWizardButton( this, dialog, buttonBox, _abortButtonLabel, _abortButtonId ); - CHECK_PTR( _abortButton ); + Q_CHECK_PTR( _abortButton ); hbox->addWidget( (QWidget *) _abortButton->widgetRep() ); addChild( _abortButton ); // Enable shortcut checking for this button @@ -1217,7 +1223,7 @@ QSpacerItem * spacer = new QSpacerItem( 0, 0, // width, height QSizePolicy::Expanding, // horizontal QSizePolicy::Minimum ); // vertical - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); hbox->addItem( spacer ); @@ -1226,7 +1232,7 @@ // _nextButton = new YQWizardButton( this, dialog, buttonBox, _nextButtonLabel, _nextButtonId ); - CHECK_PTR( _nextButton ); + Q_CHECK_PTR( _nextButton ); hbox->addWidget( (QWidget *) _nextButton->widgetRep() ); addChild( _nextButton ); // Enable shortcut checking for this button @@ -1371,21 +1377,21 @@ if ( ! parent ) return; - QVBox * vbox = new QVBox( parent ); - CHECK_PTR( vbox ); + Q3VBox * vbox = new Q3VBox( parent ); + Q_CHECK_PTR( vbox ); #if ENABLE_GRADIENTS QWidget * topGradient = addHSpacing( vbox, width ); - CHECK_PTR( topGradient ); + Q_CHECK_PTR( topGradient ); setGradient( topGradient, _topGradientPixmap ); QWidget * centerStretch = new QWidget( vbox ); - CHECK_PTR( centerStretch ); + Q_CHECK_PTR( centerStretch ); centerStretch->setPaletteBackgroundColor( _gradientCenterColor ); QWidget * bottomGradient = new QWidget( vbox ); - CHECK_PTR( bottomGradient ); + Q_CHECK_PTR( bottomGradient ); setGradient( bottomGradient, _bottomGradientPixmap ); #else vbox->setFixedWidth( width ); @@ -1419,7 +1425,7 @@ bool YQWizard::highColorDisplay() const { - return QColor::numBitPlanes() > 8; + return depth() > 8; } @@ -1472,7 +1478,7 @@ { if ( _dialogHeading ) { - if ( headingText ) + if ( ! headingText.isEmpty() ) _dialogHeading->setText( headingText ); else _dialogHeading->clear(); @@ -1502,7 +1508,7 @@ { if ( _helpBrowser ) { - if ( helpText ) + if ( ! helpText.isEmpty() ) { helpText.replace( "&product;", YQUI::ui()->productName() ); _helpBrowser->setText( helpText ); @@ -1602,8 +1608,8 @@ { if ( _menuBar ) { - QPopupMenu * menu = new QPopupMenu( _menuBar ); - CHECK_PTR( menu ); + Q3PopupMenu * menu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( menu ); _menuIDs.insert( id, menu ); _menuBar->insertItem( text, menu ); @@ -1624,12 +1630,12 @@ const QString & text, const QString & id ) { - QPopupMenu * parentMenu = _menuIDs[ parentMenuID ]; + Q3PopupMenu * parentMenu = _menuIDs[ parentMenuID ]; if ( parentMenu ) { - QPopupMenu * menu = new QPopupMenu( _menuBar ); - CHECK_PTR( menu ); + Q3PopupMenu * menu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( menu ); _menuIDs.insert( id, menu ); parentMenu->insertItem( text, menu ); @@ -1648,7 +1654,7 @@ const QString & text, const QString & idString ) { - QPopupMenu * parentMenu = _menuIDs[ parentMenuID ]; + Q3PopupMenu * parentMenu = _menuIDs[ parentMenuID ]; if ( parentMenu ) { @@ -1665,7 +1671,7 @@ void YQWizard::addMenuSeparator( const QString & parentMenuID ) { - QPopupMenu * parentMenu = _menuIDs[ parentMenuID ]; + Q3PopupMenu * parentMenu = _menuIDs[ parentMenuID ]; if ( parentMenu ) { @@ -1895,13 +1901,13 @@ arg_decl.remove( QRegExp( "^.*\\(" ) ); // remove "command (" arg_decl.remove( QRegExp( "\\).*$" ) ); // remove ")" - QStringList argDeclList = QStringList::split( ",", arg_decl ); + QStringList argDeclList = arg_decl.split( ",", QString::SkipEmptyParts ); // // Check number of arguments // - if ( argDeclList.size() != (unsigned) term->size() ) + if ( argDeclList.size() != term->size() ) { y2error( "Bad arguments for wizard command %s : %s", (const char *) declaration, term->toString().c_str() ); @@ -1915,7 +1921,7 @@ bool ok = true; - for ( unsigned i=0; i < argDeclList.size() && ok; i++ ) + for ( int i=0; i < argDeclList.size() && ok; i++ ) { QString wanted = argDeclList[ i ].stripWhiteSpace(); YCPValue seen = term->value( i ); Modified: branches/tmp/sh/qt4-port/qt/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQWizard.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQWizard.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQWizard.h Thu Jul 26 15:47:28 2007 @@ -21,26 +21,31 @@ #define YQWizard_h #include "YWizard.h" -#include +#include #include -#include +#include #include -#include +#include #include "QY2ListView.h" +//Added by qt3to4: +#include +#include +#include +#include #include <string> #include <vector> -class QGridLayout; -class QHBox; +class Q3GridLayout; +class Q3HBox; class QLabel; class QMenuBar; -class QPopupMenu; +class Q3PopupMenu; class QPushButton; class QSpacerItem; -class QTextBrowser; +class Q3TextBrowser; class QToolButton; -class QWidgetStack; +class Q3WidgetStack; class YQAlignment; class YQReplacePoint; @@ -48,7 +53,7 @@ class QY2ListView; -class YQWizard : public QVBox, public YWizard +class YQWizard : public Q3VBox, public YWizard { Q_OBJECT @@ -362,7 +367,7 @@ * tree item. * If the item has an ID, that ID will be returned to UI::UserInput(). **/ - void sendTreeEvent( QListViewItem * item ); + void sendTreeEvent( Q3ListViewItem * item ); /** * Internal notification that the tree selection has changed. @@ -397,7 +402,7 @@ void layoutStepsPanel(); void layoutHelpPanel(); void layoutTreePanel(); - void layoutWorkArea ( QHBox * parentHBox ); + void layoutWorkArea ( Q3HBox * parentHBox ); void layoutClientArea( QWidget * parent ); void layoutButtonBox( QWidget * parent ); @@ -595,21 +600,21 @@ QString _currentStepID; - QWidgetStack * _sideBar; - QVBox * _stepsPanel; - QVBox * _stepsBox; - QGridLayout * _stepsGrid; + Q3WidgetStack * _sideBar; + Q3VBox * _stepsPanel; + Q3VBox * _stepsBox; + Q3GridLayout * _stepsGrid; QPushButton * _releaseNotesButton; YCPValue _releaseNotesButtonId; QPushButton * _helpButton; - QHBox * _helpPanel; - QTextBrowser * _helpBrowser; + Q3HBox * _helpPanel; + Q3TextBrowser * _helpBrowser; QPushButton * _stepsButton; QPushButton * _treeButton; - QHBox * _treePanel; + Q3HBox * _treePanel; QY2ListView * _tree; - QVBox * _clientArea; + Q3VBox * _clientArea; QWidget * _menuBarBox; QMenuBar * _menuBar; QLabel * _dialogIcon; @@ -620,10 +625,10 @@ YQWizardButton * _abortButton; YQWizardButton * _nextButton; - QPtrListYQWizard::Step _stepsList; - QDictYQWizard::Step _stepsIDs; - QDictYQWizard::TreeItem _treeIDs; - QDict<QPopupMenu> _menuIDs; + Q3PtrListYQWizard::Step _stepsList; + Q3DictYQWizard::Step _stepsIDs; + Q3DictYQWizard::TreeItem _treeIDs; + Q3Dict<Q3PopupMenu> _menuIDs; vector<QString> _menuEntryIDs; @@ -710,7 +715,7 @@ , _id( id ) {} - QString text() const { return QListViewItem::text(0); } + QString text() const { return Q3ListViewItem::text(0); } QString id() const { return _id; } private: Modified: branches/tmp/sh/qt4-port/qt/src/YQWizardButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQWizardButton.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQWizardButton.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQWizardButton.cc Thu Jul 26 15:47:28 2007 @@ -37,7 +37,7 @@ , _wizard( wizard ) { QPushButton * button = new QPushButton( fromUTF8( label->value() ), buttonParent ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); setQPushButton( button ); setWidgetRep( button ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/Makefile.am?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/Makefile.am (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/Makefile.am Thu Jul 26 15:47:28 2007 @@ -5,18 +5,15 @@ SUBDIRS = icons AM_CXXFLAGS = -DY2LOG=\"ui-qt\" \ + -DQT3_SUPPORT \ -DLOCALEDIR=\"${localedir}\" \ - -DQT_LOCALEDIR=\"$(QTDIR)/translations\" \ -DICONDIR=\"${themedir}/current\" \ -DTHEMEDIR=\"${themedir}/current\" \ -DHELPIMAGEDIR=\"${imagedir}\" \ - -DQTLIBDIR=\"$(QTLIBDIR)\" \ -Wno-format-nonliteral \ -fmessage-length=0 -MOC = $(QTDIR)/bin/moc - # plugin, libtool forces 'lib' prefix # plugin_LTLIBRARIES = libpy2qt_pkg.la plugin_LTLIBRARIES = libpy2qt_pkg.la @@ -24,7 +21,7 @@ libpy2qt_pkg_la_LIBADD = \ -L$(libdir) -lyui \ - -L$(QTLIBDIR) -lqt-mt \ + -L$(QT_LIBDIR) -lQt3Support \ -lX11 -lXext -lSM -lICE \ ${ZYPP_LIBS} @@ -187,4 +184,4 @@ CLEANFILES = *.moc -INCLUDES = -I$(srcdir)/.. -I$(QTDIR)/include -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS} +INCLUDES = -I$(srcdir)/.. -I$(QT_INCLUDEDIR) -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS} Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.cc Thu Jul 26 15:47:28 2007 @@ -28,13 +28,13 @@ #include <fstream> #include -#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -43,6 +43,8 @@ #include #include #include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include @@ -219,8 +221,8 @@ { layoutMenuBar( this ); - QSplitter * outer_splitter = new QSplitter( QSplitter::Horizontal, this ); - CHECK_PTR( outer_splitter ); + QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); + Q_CHECK_PTR( outer_splitter ); QWidget * left_pane = layoutLeftPane ( outer_splitter ); QWidget * right_pane = layoutRightPane( outer_splitter ); @@ -233,19 +235,19 @@ QWidget * YQPackageSelector::layoutLeftPane( QWidget * parent ) { - QSplitter * splitter = new QSplitter( QSplitter::Vertical, parent ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); + Q_CHECK_PTR( splitter ); splitter->setMargin( MARGIN ); - QVBox * upper_vbox = new QVBox( splitter ); - CHECK_PTR( upper_vbox ); + Q3VBox * upper_vbox = new Q3VBox( splitter ); + Q_CHECK_PTR( upper_vbox ); layoutFilters( upper_vbox ); addVSpacing( upper_vbox, MARGIN ); - QVBox * lower_vbox = new QVBox( splitter ); + Q3VBox * lower_vbox = new Q3VBox( splitter ); addVSpacing( lower_vbox, MARGIN ); _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); - CHECK_PTR( _diskUsageList ); + Q_CHECK_PTR( _diskUsageList ); splitter->setResizeMode( upper_vbox, QSplitter::Stretch ); splitter->setResizeMode( lower_vbox, QSplitter::FollowSizeHint ); @@ -258,7 +260,7 @@ YQPackageSelector::layoutFilters( QWidget * parent ) { _filters = new QY2ComboTabWidget( _( "Fi<er:" ), parent ); - CHECK_PTR( _filters ); + Q_CHECK_PTR( _filters ); // @@ -271,7 +273,7 @@ || _testMode ) { _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); - CHECK_PTR( _updateProblemFilterView ); + Q_CHECK_PTR( _updateProblemFilterView ); _filters->addPage( _( "Update Problems" ), _updateProblemFilterView ); } } @@ -296,7 +298,7 @@ if ( ! zyppPool().emptyzypp::Pattern() || _testMode ) { _patternList = new YQPkgPatternList( parent, true ); - CHECK_PTR( _patternList ); + Q_CHECK_PTR( _patternList ); _filters->addPage( _( "Patterns" ), _patternList ); connect( _patternList, SIGNAL( statusChanged() ), @@ -321,7 +323,7 @@ { _selList = new YQPkgSelList( parent, true ); - CHECK_PTR( _selList ); + Q_CHECK_PTR( _selList ); _filters->addPage( _( "Selections" ), _selList ); connect( _selList, SIGNAL( statusChanged() ), @@ -343,7 +345,7 @@ // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); - CHECK_PTR( _rpmGroupTagsFilterView ); + Q_CHECK_PTR( _rpmGroupTagsFilterView ); _filters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); connect( this, SIGNAL( loadData() ), @@ -355,7 +357,7 @@ // _langList = new YQPkgLangList( parent ); - CHECK_PTR( _langList ); + Q_CHECK_PTR( _langList ); _filters->addPage( _( "Languages" ), _langList ); _langList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); // hor/vert @@ -372,7 +374,7 @@ // _repoFilterView = new YQPkgRepoFilterView( parent ); - CHECK_PTR( _repoFilterView ); + Q_CHECK_PTR( _repoFilterView ); _filters->addPage( _( "Repositories" ), _repoFilterView ); @@ -381,7 +383,7 @@ // _searchFilterView = new YQPkgSearchFilterView( parent ); - CHECK_PTR( _searchFilterView ); + Q_CHECK_PTR( _searchFilterView ); _filters->addPage( _( "Search" ), _searchFilterView ); @@ -390,7 +392,7 @@ // _statusFilterView = new YQPkgStatusFilterView( parent ); - CHECK_PTR( _statusFilterView ); + Q_CHECK_PTR( _statusFilterView ); _filters->addPage( _( "Installation Summary" ), _statusFilterView ); @@ -407,15 +409,15 @@ QWidget * YQPackageSelector::layoutRightPane( QWidget * parent ) { - QVBox * right_pane_vbox = new QVBox( parent ); - CHECK_PTR( right_pane_vbox ); + Q3VBox * right_pane_vbox = new Q3VBox( parent ); + Q_CHECK_PTR( right_pane_vbox ); right_pane_vbox->setMargin( MARGIN ); - QSplitter * splitter = new QSplitter( QSplitter::Vertical, right_pane_vbox ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, right_pane_vbox ); + Q_CHECK_PTR( splitter ); - QVBox * splitter_vbox = new QVBox( splitter ); - CHECK_PTR( splitter_vbox ); + Q3VBox * splitter_vbox = new Q3VBox( splitter ); + Q_CHECK_PTR( splitter_vbox ); layoutPkgList( splitter_vbox ); addVSpacing( splitter_vbox, MARGIN ); @@ -431,7 +433,7 @@ YQPackageSelector::layoutPkgList( QWidget * parent ) { _pkgList= new YQPkgList( parent ); - CHECK_PTR( _pkgList ); + Q_CHECK_PTR( _pkgList ); connect( _pkgList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -443,14 +445,14 @@ { bool haveInstalledPkgs = YQPkgList::haveInstalledPkgs(); - QVBox * details_vbox = new QVBox( parent ); - CHECK_PTR( details_vbox ); + Q3VBox * details_vbox = new Q3VBox( parent ); + Q_CHECK_PTR( details_vbox ); details_vbox->setMinimumSize( 0, 0 ); addVSpacing( details_vbox, 8 ); _detailsViews = new QTabWidget( details_vbox ); - CHECK_PTR( _detailsViews ); + Q_CHECK_PTR( _detailsViews ); _detailsViews->setMargin( MARGIN ); // _detailsViews->setTabPosition( QTabWidget::Bottom ); @@ -461,7 +463,7 @@ // _pkgDescriptionView = new YQPkgDescriptionView( _detailsViews ); - CHECK_PTR( _pkgDescriptionView ); + Q_CHECK_PTR( _pkgDescriptionView ); _detailsViews->addTab( _pkgDescriptionView, _( "D&escription" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -474,7 +476,7 @@ // _pkgTechnicalDetailsView = new YQPkgTechnicalDetailsView( _detailsViews ); - CHECK_PTR( _pkgTechnicalDetailsView ); + Q_CHECK_PTR( _pkgTechnicalDetailsView ); _detailsViews->addTab( _pkgTechnicalDetailsView, _( "&Technical Data" ) ); @@ -487,7 +489,7 @@ // _pkgDependenciesView = new YQPkgDependenciesView( _detailsViews ); - CHECK_PTR( _pkgDependenciesView ); + Q_CHECK_PTR( _pkgDependenciesView ); _detailsViews->addTab( _pkgDependenciesView, _( "Dependencies" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -503,7 +505,7 @@ _pkgVersionsView = new YQPkgVersionsView( _detailsViews, true ); // userCanSwitchVersions - CHECK_PTR( _pkgVersionsView ); + Q_CHECK_PTR( _pkgVersionsView ); _detailsViews->addTab( _pkgVersionsView, _( "&Versions" ) ); @@ -518,7 +520,7 @@ if ( haveInstalledPkgs ) // file list information is only available for installed pkgs { _pkgFileListView = new YQPkgFileListView( _detailsViews ); - CHECK_PTR( _pkgFileListView ); + Q_CHECK_PTR( _pkgFileListView ); _detailsViews->addTab( _pkgFileListView, _( "File List" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -535,7 +537,7 @@ if ( haveInstalledPkgs ) // change log information is only available for installed pkgs { _pkgChangeLogView = new YQPkgChangeLogView( _detailsViews ); - CHECK_PTR( _pkgChangeLogView ); + Q_CHECK_PTR( _pkgChangeLogView ); _detailsViews->addTab( _pkgChangeLogView, _( "Change Log" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -549,14 +551,14 @@ void YQPackageSelector::layoutButtons( QWidget * parent ) { - QHBox * button_box = new QHBox( parent ); - CHECK_PTR( button_box ); + Q3HBox * button_box = new Q3HBox( parent ); + Q_CHECK_PTR( button_box ); button_box->setSpacing( SPACING ); // Button: Dependency check // Translators: Please keep this short! _checkDependenciesButton = new QPushButton( _( "Chec&k" ), button_box ); - CHECK_PTR( _checkDependenciesButton ); + Q_CHECK_PTR( _checkDependenciesButton ); _checkDependenciesButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert _normalButtonBackground = _checkDependenciesButton->paletteBackgroundColor(); @@ -567,13 +569,13 @@ // Checkbox: Automatically check dependencies for every package status change? // Translators: Please keep this short! _autoDependenciesCheckBox = new QCheckBox( _( "A&utocheck" ), button_box ); - CHECK_PTR( _autoDependenciesCheckBox ); + Q_CHECK_PTR( _autoDependenciesCheckBox ); _autoDependenciesCheckBox->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT ); addHStretch( button_box ); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); - CHECK_PTR( cancel_button ); + Q_CHECK_PTR( cancel_button ); cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( cancel_button, SIGNAL( clicked() ), @@ -581,7 +583,7 @@ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box ); - CHECK_PTR( accept_button ); + Q_CHECK_PTR( accept_button ); accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( accept_button, SIGNAL( clicked() ), @@ -595,7 +597,7 @@ YQPackageSelector::layoutMenuBar( QWidget * parent ) { _menuBar = new QMenuBar( parent ); - CHECK_PTR( _menuBar ); + Q_CHECK_PTR( _menuBar ); _fileMenu = 0; _viewMenu = 0; @@ -614,8 +616,8 @@ // File menu // - _fileMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _fileMenu ); + _fileMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _fileMenu ); _menuBar->insertItem( _( "&File" ), _fileMenu ); _fileMenu->insertItem( _( "&Import..." ), this, SLOT( pkgImport() ) ); @@ -633,24 +635,24 @@ // View menu // - _viewMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _viewMenu ); + _viewMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _viewMenu ); _menuBar->insertItem( _( "&View" ), _viewMenu ); // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! _viewShowDevelID = _viewMenu->insertItem( _( "Show -de&vel Packages" ), - this, SLOT( pkgExcludeRulesChanged( int ) ), Key_F7 ); + this, SLOT( pkgExcludeRulesChanged( int ) ), Qt::Key_F7 ); _viewMenu->setItemChecked( _viewShowDevelID, true ); _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); - CHECK_PTR( _excludeDevelPkgs ); + Q_CHECK_PTR( _excludeDevelPkgs ); _excludeDevelPkgs->enable( false ); // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! _viewShowDebugInfoID = _viewMenu->insertItem( _( "Show -&debuginfo Packages" ), - this, SLOT( pkgExcludeRulesChanged( int ) ), Key_F8 ); + this, SLOT( pkgExcludeRulesChanged( int ) ), Qt::Key_F8 ); _viewMenu->setItemChecked( _viewShowDebugInfoID, true ); _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-debuginfo$" ), _pkgList->nameCol() ); - CHECK_PTR( _excludeDebugInfoPkgs ); + Q_CHECK_PTR( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); @@ -658,8 +660,8 @@ // Package menu // - _pkgMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _pkgMenu ); + _pkgMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _pkgMenu ); _menuBar->insertItem( _( "&Package" ), _pkgMenu ); _pkgList->actionSetCurrentInstall->addTo( _pkgMenu ); @@ -676,8 +678,8 @@ _pkgList->actionDontInstallSourceRpm->addTo( _pkgMenu ); _pkgMenu->insertSeparator(); - QPopupMenu * submenu = _pkgList->addAllInListSubMenu( _pkgMenu ); - CHECK_PTR( submenu ); + Q3PopupMenu * submenu = _pkgList->addAllInListSubMenu( _pkgMenu ); + Q_CHECK_PTR( submenu ); submenu->insertSeparator(); _pkgList->actionInstallListSourceRpms->addTo( submenu ); @@ -688,8 +690,8 @@ // Submenu for all packages // - submenu = new QPopupMenu( _pkgMenu ); - CHECK_PTR( submenu ); + submenu = new Q3PopupMenu( _pkgMenu ); + Q_CHECK_PTR( submenu ); // Translators: Unlike the "all in this list" submenu, this submenu // refers to all packages globally, not only to those that are @@ -710,8 +712,8 @@ // Patch menu // - _patchMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _patchMenu ); + _patchMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _patchMenu ); _menuBar->insertItem( _( "&Patch" ), _patchMenu ); _patchList->actionSetCurrentInstall->addTo( _patchMenu ); @@ -732,12 +734,12 @@ // Extras menu // - _extrasMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _extrasMenu ); + _extrasMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _extrasMenu ); _menuBar->insertItem( _( "&Extras" ), _extrasMenu ); _extrasMenu->insertItem( _( "Show &Products" ), this, SLOT( showProducts() ) ); - _extrasMenu->insertItem( _( "Show &Automatic Package Changes" ), this, SLOT( showAutoPkgList() ), CTRL + Key_A ); + _extrasMenu->insertItem( _( "Show &Automatic Package Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); _extrasMenu->insertItem( _( "&Verify System" ), this, SLOT( verifySystem() ) ); _extrasMenu->insertSeparator(); @@ -768,8 +770,8 @@ // Help menu // - _helpMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _helpMenu ); + _helpMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _helpMenu ); _menuBar->insertSeparator(); _menuBar->insertItem( _( "&Help" ), _helpMenu ); @@ -777,10 +779,10 @@ // to a separate source file YQPackageSelectorHelp.cc // Menu entry for help overview - _helpMenu->insertItem( _( "&Overview" ), this, SLOT( help() ), Key_F1 ); + _helpMenu->insertItem( _( "&Overview" ), this, SLOT( help() ), Qt::Key_F1 ); // Menu entry for help about used symbols ( icons ) - _helpMenu->insertItem( _( "&Symbols" ), this, SLOT( symbolHelp() ), SHIFT + Key_F1 ); + _helpMenu->insertItem( _( "&Symbols" ), this, SLOT( symbolHelp() ), Qt::SHIFT + Qt::Key_F1 ); // Menu entry for keyboard help _helpMenu->insertItem( _( "&Keys" ), this, SLOT( keyboardHelp() ) ); @@ -919,9 +921,9 @@ // Hotkey to enable "patches" filter view on the fly // - QAccel * accel = new QAccel( this ); - CHECK_PTR( accel ); - accel->connectItem( accel->insertItem( Key_F2 ), + Q3Accel * accel = new Q3Accel( this ); + Q_CHECK_PTR( accel ); + accel->connectItem( accel->insertItem( Qt::Key_F2 ), this, SLOT( hotkeyInsertPatchFilterView() ) ); @@ -1005,11 +1007,11 @@ if ( ! _patchFilterView ) { _patchFilterView = new YQPkgPatchFilterView( this ); - CHECK_PTR( _patchFilterView ); + Q_CHECK_PTR( _patchFilterView ); _filters->addPage( _( "Patches" ), _patchFilterView ); _patchList = _patchFilterView->patchList(); - CHECK_PTR( _patchList ); + Q_CHECK_PTR( _patchList ); connectPatchList(); } @@ -1087,7 +1089,7 @@ try { - std::ofstream exportFile( fromUTF8( filename ) ); + std::ofstream exportFile( toUTF8( filename ).c_str() ); exportFile.exceptions( std::ios_base::badbit | std::ios_base::failbit ); exportFile << writer; @@ -1106,8 +1108,8 @@ _( "Error" ), // caption _( "Error exporting package list to %1" ).arg( filename ), QMessageBox::Ok | QMessageBox::Default, // button0 - QMessageBox::NoButton, // button1 - QMessageBox::NoButton ); // button2 + Qt::NoButton, // button1 + Qt::NoButton ); // button2 } } } @@ -1116,7 +1118,7 @@ void YQPackageSelector::pkgImport() { - QString filename = QFileDialog::getOpenFileName( DEFAULT_EXPORT_FILE_NAME, // startsWith + QString filename = Q3FileDialog::getOpenFileName( DEFAULT_EXPORT_FILE_NAME, // startsWith "*.xml+;;*", // filter this, // parent 0, // name @@ -1128,7 +1130,7 @@ try { - std::ifstream importFile( fromUTF8( filename ) ); + std::ifstream importFile( toUTF8( filename ).c_str() ); zypp::syscontent::Reader reader( importFile ); // Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelector.h Thu Jul 26 15:47:28 2007 @@ -20,8 +20,11 @@ #ifndef YQPackageSelector_h #define YQPackageSelector_h -#include +#include #include +//Added by qt3to4: +#include +#include #include #include "YQPackageSelectorBase.h" @@ -30,12 +33,12 @@ class QCheckBox; class QComboBox; class QLabel; -class QListView; -class QProgressBar; +class Q3ListView; +class Q3ProgressBar; class QPushButton; class QSplitter; class QTabWidget; -class QPopupMenu; +class Q3PopupMenu; class QMenuBar; class QY2ComboTabWidget; @@ -321,12 +324,12 @@ YQPkgPatchList * _patchList; QMenuBar * _menuBar; - QPopupMenu * _fileMenu; - QPopupMenu * _viewMenu; - QPopupMenu * _pkgMenu; - QPopupMenu * _patchMenu; - QPopupMenu * _extrasMenu; - QPopupMenu * _helpMenu; + Q3PopupMenu * _fileMenu; + Q3PopupMenu * _viewMenu; + Q3PopupMenu * _pkgMenu; + Q3PopupMenu * _patchMenu; + Q3PopupMenu * _extrasMenu; + Q3PopupMenu * _helpMenu; int _viewShowDevelID; int _viewShowDebugInfoID; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.cc Thu Jul 26 15:47:28 2007 @@ -19,11 +19,13 @@ /-*/ #include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include -#include +#include #include "QY2LayoutUtils.h" #include "YQPackageSelectorBase.h" @@ -51,7 +53,7 @@ YQPackageSelectorBase::YQPackageSelectorBase( QWidget * parent, const YWidgetOpt & opt ) - : QVBox( parent ) + : Q3VBox( parent ) , YPackageSelector( opt ) { setWidgetRep( this ); @@ -67,14 +69,14 @@ YQUI::ui()->blockWmClose(); // Automatically undone after UI::RunPkgSelection() _pkgConflictDialog = new YQPkgConflictDialog( this ); - CHECK_PTR( _pkgConflictDialog ); + Q_CHECK_PTR( _pkgConflictDialog ); QString label = _( "Reset &Ignored Dependency Conflicts" ); - _actionResetIgnoredDependencyProblems = new QAction( label, // text + _actionResetIgnoredDependencyProblems = new Q3Action( label, // text label, // menu text (QKeySequence) 0, // accel this ); // parent - CHECK_PTR( _actionResetIgnoredDependencyProblems ); + Q_CHECK_PTR( _actionResetIgnoredDependencyProblems ); connect( _actionResetIgnoredDependencyProblems, SIGNAL( activated() ), this, SLOT ( resetIgnoredDependencyProblems() ) ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPackageSelectorBase.h Thu Jul 26 15:47:28 2007 @@ -20,13 +20,15 @@ #ifndef YQPackageSelectorBase_h #define YQPackageSelectorBase_h -#include +#include +//Added by qt3to4: +#include #include "YPackageSelector.h" #include "YQZypp.h" class QY2ComboTabWidget; -class QAction; +class Q3Action; class YQPkgConflictDialog; class YQPkgDiskUsageList; @@ -35,7 +37,7 @@ /** * Abstract base class for package selectors. **/ -class YQPackageSelectorBase : public QVBox, public YPackageSelector +class YQPackageSelectorBase : public Q3VBox, public YPackageSelector { Q_OBJECT @@ -187,7 +189,7 @@ bool _showChangesDialog; YQPkgConflictDialog * _pkgConflictDialog; YQPkgDiskUsageList * _diskUsageList; - QAction * _actionResetIgnoredDependencyProblems; + Q3Action * _actionResetIgnoredDependencyProblems; }; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.cc Thu Jul 26 15:47:28 2007 @@ -20,8 +20,8 @@ /-*/ #include -#include -#include +#include +#include #include #include @@ -107,8 +107,8 @@ void YQPatternSelector::basicLayout() { - QSplitter * outer_splitter = new QSplitter( QSplitter::Horizontal, this ); - CHECK_PTR( outer_splitter ); + QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); + Q_CHECK_PTR( outer_splitter ); QWidget * left_pane = layoutLeftPane ( outer_splitter ); QWidget * right_pane = layoutRightPane( outer_splitter ); @@ -128,8 +128,8 @@ QWidget * YQPatternSelector::layoutLeftPane( QWidget * parent ) { - QVBox * vbox = new QVBox( parent ); - CHECK_PTR( vbox ); + Q3VBox * vbox = new Q3VBox( parent ); + Q_CHECK_PTR( vbox ); vbox->setMargin( MARGIN ); if ( ! zyppPool().emptyzypp::Pattern() ) @@ -141,7 +141,7 @@ _patternList = new YQPkgPatternList( vbox, false, // no autoFill - need to connect to details view first false ); // no autoFilter - filterMatch() is not connected - CHECK_PTR( _patternList ); + Q_CHECK_PTR( _patternList ); _patternList->header()->hide(); } @@ -161,7 +161,7 @@ _selList = new YQPkgSelList( vbox, false, // no autoFill - need to connect to details view first false ); // no autoFilter - filterMatch() is not connected - CHECK_PTR( _selList ); + Q_CHECK_PTR( _selList ); _selList->header()->hide(); } @@ -173,11 +173,11 @@ addVSpacing( vbox, SPACING ); - QHBox * hbox = new QHBox( vbox ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( vbox ); + Q_CHECK_PTR( hbox ); QPushButton * details_button = new QPushButton( _( "&Details..." ), hbox ); - CHECK_PTR( details_button ); + Q_CHECK_PTR( details_button ); connect( details_button, SIGNAL( clicked() ), this, SLOT ( detailedPackageSelection() ) ); @@ -193,8 +193,8 @@ QWidget * YQPatternSelector::layoutRightPane( QWidget * parent ) { - QSplitter * splitter = new QSplitter( QSplitter::Vertical, parent ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); + Q_CHECK_PTR( splitter ); splitter->setMargin( MARGIN ); @@ -202,11 +202,11 @@ // Selection / Pattern description // - QVBox * upper_vbox = new QVBox( splitter ); - CHECK_PTR( upper_vbox ); + Q3VBox * upper_vbox = new Q3VBox( splitter ); + Q_CHECK_PTR( upper_vbox ); _descriptionView = new YQPkgSelDescriptionView( upper_vbox ); - CHECK_PTR( _descriptionView ); + Q_CHECK_PTR( _descriptionView ); addVSpacing( upper_vbox, MARGIN ); @@ -215,12 +215,12 @@ // Disk usage // - QVBox * lower_vbox = new QVBox( splitter ); - CHECK_PTR( lower_vbox ); + Q3VBox * lower_vbox = new Q3VBox( splitter ); + Q_CHECK_PTR( lower_vbox ); addVSpacing( lower_vbox, MARGIN ); _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); - CHECK_PTR( _diskUsageList ); + Q_CHECK_PTR( _diskUsageList ); splitter->setResizeMode( upper_vbox, QSplitter::Stretch ); splitter->setResizeMode( lower_vbox, QSplitter::FollowSizeHint ); @@ -233,14 +233,14 @@ void YQPatternSelector::layoutButtons( QWidget * parent ) { - QHBox * button_box = new QHBox( parent ); - CHECK_PTR( button_box ); + Q3HBox * button_box = new Q3HBox( parent ); + Q_CHECK_PTR( button_box ); button_box->setMargin ( MARGIN ); button_box->setSpacing( SPACING ); QPushButton * details_button = new QPushButton( _( "&Details..." ), button_box ); - CHECK_PTR( details_button ); + Q_CHECK_PTR( details_button ); details_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( details_button, SIGNAL( clicked() ), @@ -250,7 +250,7 @@ addHStretch( button_box ); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); - CHECK_PTR( cancel_button ); + Q_CHECK_PTR( cancel_button ); cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( cancel_button, SIGNAL( clicked() ), @@ -258,7 +258,7 @@ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box ); - CHECK_PTR( accept_button ); + Q_CHECK_PTR( accept_button ); accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( accept_button, SIGNAL( clicked() ), Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPatternSelector.h Thu Jul 26 15:47:28 2007 @@ -20,7 +20,7 @@ #ifndef YQPatternSelector_h #define YQPatternSelector_h -#include +#include #include #include Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgChangesDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgChangesDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgChangesDialog.cc Thu Jul 26 15:47:28 2007 @@ -23,11 +23,14 @@ #include #include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include #include "YQZypp.h" #include @@ -64,14 +67,14 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); - CHECK_PTR( layout ); + Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + Q_CHECK_PTR( layout ); // HBox for icon and message - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); layout->addWidget( hbox ); @@ -79,22 +82,24 @@ addHSpacing( hbox ); QLabel * iconLabel = new QLabel( hbox ); - CHECK_PTR( iconLabel ); + Q_CHECK_PTR( iconLabel ); +#ifdef FIXME iconLabel->setPixmap( QApplication::style().stylePixmap( QStyle::SP_MessageBoxInformation ) ); +#endif iconLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); // hor/vert addHSpacing( hbox ); // Label for the message QLabel * label = new QLabel( message, hbox ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert // Pkg list _pkgList = new YQPkgList( this ); - CHECK_PTR( _pkgList ); + Q_CHECK_PTR( _pkgList ); _pkgList->setEditable( false ); layout->addWidget( _pkgList ); @@ -102,8 +107,8 @@ // Button box - hbox = new QHBox( this ); - CHECK_PTR( hbox ); + hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); layout->addWidget( hbox ); @@ -114,7 +119,7 @@ // Accept button - usually "OK" or "Continue" QPushButton * button = new QPushButton( acceptButtonLabel, hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), @@ -128,7 +133,7 @@ // Reject button ( if desired ) - usually "Cancel" button = new QPushButton( rejectButtonLabel, hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); connect( button, SIGNAL( clicked() ), this, SLOT ( reject() ) ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.cc Thu Jul 26 15:47:28 2007 @@ -25,14 +25,18 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include #include +#include +//Added by qt3to4: +#include +#include #include "YQPkgConflictDialog.h" #include "YQPkgConflictList.h" @@ -77,13 +81,13 @@ // Layout for the dialog (can't simply insert a QVbox) - QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); - CHECK_PTR( layout ); + Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + Q_CHECK_PTR( layout ); // Conflict list _conflictList = new YQPkgConflictList( this ); - CHECK_PTR( _conflictList ); + Q_CHECK_PTR( _conflictList ); layout->addWidget( _conflictList ); layout->addSpacing(8); @@ -93,8 +97,8 @@ // Button box - QHBox * buttonBox = new QHBox( this ); - CHECK_PTR( buttonBox ); + Q3HBox * buttonBox = new Q3HBox( this ); + Q_CHECK_PTR( buttonBox ); buttonBox->setSpacing( SPACING ); buttonBox->setMargin ( MARGIN ); layout->addWidget( buttonBox ); @@ -103,7 +107,7 @@ // "OK" button QPushButton * button = new QPushButton( _( "&OK -- Try Again" ), buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), @@ -115,15 +119,15 @@ // "Expert" menu button button = new QPushButton( _( "&Expert" ), buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); addHStretch( buttonBox ); // "Expert" menu - _expertMenu = new QPopupMenu( button ); - CHECK_PTR( _expertMenu ); + _expertMenu = new Q3PopupMenu( button ); + Q_CHECK_PTR( _expertMenu ); button->setPopup( _expertMenu ); _expertMenu->insertItem( _( "&Save This List to a File..." ), @@ -133,7 +137,7 @@ // "Cancel" button button = new QPushButton( _( "&Cancel" ), buttonBox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); connect( button, SIGNAL( clicked() ), this, SLOT ( reject() ) ); @@ -141,9 +145,12 @@ // Busy popup - _busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent, 0, - WType_Dialog ); - CHECK_PTR( _busyPopup ); + _busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent, 0 +#ifdef FIXME + , WType_Dialog +#endif + ); + Q_CHECK_PTR( _busyPopup ); _busyPopup->setCaption( "" ); _busyPopup->resize( _busyPopup->sizeHint() ); YQDialog::center( _busyPopup, parent ); @@ -179,7 +186,7 @@ // course be centered inside the pixmap which is usually much larger than // the popup, thus the text would be cut off. QPainter painter( &pixmap ); - painter.drawText( pixmap.rect(), AlignLeft | AlignTop, _busyPopup->text() ); + painter.drawText( pixmap.rect(), Qt::AlignLeft | Qt::AlignTop, _busyPopup->text() ); painter.end(); _busyPopup->setPaletteBackgroundPixmap( pixmap ); @@ -257,7 +264,7 @@ void YQPkgConflictDialog::prepareSolving() { - CHECK_PTR( _conflictList ); + Q_CHECK_PTR( _conflictList ); YQUI::ui()->busyCursor(); if ( isVisible() ) Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictDialog.h Thu Jul 26 15:47:28 2007 @@ -22,11 +22,14 @@ #define YQPkgConflictDialog_h #include +//Added by qt3to4: +#include +#include class YQPkgConflictList; class PMManager; class QPushButton; -class QPopupMenu; +class Q3PopupMenu; class QLabel; @@ -140,7 +143,7 @@ // YQPkgConflictList * _conflictList; - QPopupMenu * _expertMenu; + Q3PopupMenu * _expertMenu; QLabel * _busyPopup; double _totalSolveTime; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.cc Thu Jul 26 15:47:28 2007 @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -80,7 +82,7 @@ while ( it != problemList.end() ) { YQPkgConflict * conflict = new YQPkgConflict( this, *it ); - CHECK_PTR( conflict ); + Q_CHECK_PTR( conflict ); ++it; } @@ -92,7 +94,7 @@ { zypp::ProblemSolutionList userChoices; - QListViewItem * child = firstChild(); + Q3ListViewItem * child = firstChild(); while ( child ) { @@ -163,7 +165,7 @@ // Recursively write all items - const QListViewItem * item = firstChild(); + const Q3ListViewItem * item = firstChild(); while ( item ) { @@ -186,7 +188,7 @@ void YQPkgConflictList::saveItemToFile( FILE * file, - const QListViewItem * item ) const + const Q3ListViewItem * item ) const { if ( ! item || ! file ) return; @@ -199,16 +201,16 @@ // Write item - const QCheckListItem * checkListItem = dynamic_cast (item); + const Q3CheckListItem * checkListItem = dynamic_cast (item); if ( checkListItem ) { switch ( checkListItem->type() ) { - case QCheckListItem::CheckBox: + case Q3CheckListItem::CheckBox: fprintf( file, "[%c] ", checkListItem->isOn() ? 'x' : ' ' ); break; - case QCheckListItem::RadioButton: + case Q3CheckListItem::RadioButton: fprintf( file, "(%c) ", checkListItem->isOn() ? 'x' : ' ' ); break; default: @@ -223,7 +225,7 @@ { // Recursively write children - const QListViewItem * child = item->firstChild(); + const Q3ListViewItem * child = item->firstChild(); while ( child ) { @@ -235,7 +237,7 @@ void -YQPkgConflictList::dumpList( QListViewItem * parent, +YQPkgConflictList::dumpList( Q3ListViewItem * parent, const QString & longText, const QString & header, int splitThreshold ) @@ -252,15 +254,14 @@ if ( ! header.isEmpty() ) { parent = new QY2ListViewItem( parent, header, true ); - CHECK_PTR( parent ); + Q_CHECK_PTR( parent ); parent->setOpen( true ); } - QStringList lines = QStringList::split( '\n', longText, - true ); // allowEmptyEntries - QValueList<QString>::const_iterator it = lines.begin(); + QStringList lines = longText.split( '\n', QString::KeepEmptyParts ); + QStringList::const_iterator it = lines.begin(); - bool doSplit = splitThreshold > 1 && lines.size() > (unsigned) splitThreshold + 3; + bool doSplit = splitThreshold > 1 && lines.size() > splitThreshold + 3; bool didSplit = false; int count = 0; @@ -329,9 +330,9 @@ // Heading for the choices // how to resolve this conflict _( "Conflict Resolution:" ), - QCheckListItem::Controller, + Q3CheckListItem::Controller, true ); - CHECK_PTR( _resolutionsHeader ); + Q_CHECK_PTR( _resolutionsHeader ); _resolutionsHeader->setOpen( true ); _resolutionsHeader->setBackgroundColor( LIGHT_GREY ); @@ -361,7 +362,7 @@ zypp::ProblemSolution_Ptr YQPkgConflict::userSelectedResolution() { - QListViewItem * item = _resolutionsHeader->firstChild(); + Q3ListViewItem * item = _resolutionsHeader->firstChild(); while ( item ) { @@ -392,7 +393,7 @@ zypp::ProblemSolution_Ptr solution ) : QY2CheckListItem( parent, fromUTF8( solution->description() ), - QCheckListItem::RadioButton, + Q3CheckListItem::RadioButton, true ) , _solution( solution ) { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgConflictList.h Thu Jul 26 15:47:28 2007 @@ -31,7 +31,7 @@ #include -class QAction; +class Q3Action; class YQPkgConflict; class YQPkgConflictResolution; class YQPkgConflictDialog; @@ -109,7 +109,7 @@ * "More...". * If 'header' is not empty, it will be added as the parent of the lines. **/ - static void dumpList( QListViewItem * parent, + static void dumpList( Q3ListViewItem * parent, const QString & longText, const QString & header = QString::null, int splitThreshold = 5 ); @@ -119,7 +119,7 @@ /** * (Recursively) save one item to file. **/ - void saveItemToFile( FILE * file, const QListViewItem * item ) const; + void saveItemToFile( FILE * file, const Q3ListViewItem * item ) const; signals: Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionDialog.cc Thu Jul 26 15:47:28 2007 @@ -23,13 +23,16 @@ #include #include -#include +#include +#include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include "YQPkgDescriptionDialog.h" #include "YQPkgDescriptionView.h" @@ -54,14 +57,14 @@ // Layout for the dialog (can't simply insert a QVBox) - QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); - CHECK_PTR( layout ); + Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + Q_CHECK_PTR( layout ); // VBox for splitter - QSplitter * splitter = new QSplitter( QSplitter::Vertical, this ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, this ); + Q_CHECK_PTR( splitter ); layout->addWidget( splitter ); splitter->setMargin( MARGIN ); @@ -69,14 +72,14 @@ // Pkg list _pkgList = new YQPkgList( splitter ); - CHECK_PTR( _pkgList ); + Q_CHECK_PTR( _pkgList ); _pkgList->resize( _pkgList->width(), 80 ); // Description view _pkgDescription = new YQPkgDescriptionView( splitter ); - CHECK_PTR( _pkgDescription ); + Q_CHECK_PTR( _pkgDescription ); _pkgDescription->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert connect( _pkgList, SIGNAL( selectionChanged ( ZyppSel ) ), @@ -85,8 +88,8 @@ // Button box (to center the single button) - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); layout->addWidget( hbox ); @@ -97,7 +100,7 @@ // "OK" button QPushButton * button = new QPushButton( _( "&OK" ), hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDescriptionView.cc Thu Jul 26 15:47:28 2007 @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include "YQPkgDescriptionView.h" #include "YQPkgDescriptionDialog.h" #include "YQi18n.h" @@ -75,9 +77,8 @@ bool foundAuthorsList = false; QString html_text = "<p>"; - QStringList lines = QStringList::split( '\n', text.stripWhiteSpace(), - true ); // allowEmptyEntries - QValueList<QString>::const_iterator it = lines.begin(); + QStringList lines = text.trimmed().split( '\n', QString::KeepEmptyParts ); + QStringList::const_iterator it = lines.begin(); while ( it != lines.end() ) { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.cc Thu Jul 26 15:47:28 2007 @@ -22,8 +22,10 @@ #define y2log_component "qt-pkg" #include -#include +#include #include +//Added by qt3to4: +#include #include @@ -81,7 +83,7 @@ if ( ! partitionDu.readonly ) { YQPkgDiskUsageListItem * item = new YQPkgDiskUsageListItem( this, partitionDu ); - CHECK_PTR( item ); + Q_CHECK_PTR( item ); item->updateData(); _items.insert( partitionDu.dir.c_str(), item ); } @@ -147,7 +149,11 @@ YQPkgDiskUsageList::sizeHint() const { int width = header()->headerWidth() +#ifdef FIXME + style().pixelMetric( QStyle::PM_ScrollBarExtent, verticalScrollBar() ); +#else + + 30; +#endif return QSize( width, 100 ); } Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageList.h Thu Jul 26 15:47:28 2007 @@ -23,7 +23,9 @@ #include #include -#include +#include +//Added by qt3to4: +#include typedef zypp::DiskUsageCounter::MountPoint ZyppPartitionDu; class YQPkgDiskUsageListItem; @@ -188,7 +190,7 @@ // Data members - QAsciiDict<YQPkgDiskUsageListItem> _items; + Q3AsciiDict<YQPkgDiskUsageListItem> _items; bool _debug; }; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc Thu Jul 26 15:47:28 2007 @@ -23,11 +23,13 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include #include "YQPkgDiskUsageWarningDialog.h" #include "YQPkgDiskUsageList.h" @@ -55,14 +57,14 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); - CHECK_PTR( layout ); + Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + Q_CHECK_PTR( layout ); // HBox for icon and message - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); layout->addWidget( hbox ); @@ -70,30 +72,32 @@ addHSpacing( hbox ); QLabel * iconLabel = new QLabel( hbox ); - CHECK_PTR( iconLabel ); + Q_CHECK_PTR( iconLabel ); +#ifdef FIXME iconLabel->setPixmap( QApplication::style().stylePixmap( QStyle::SP_MessageBoxWarning ) ); +#endif iconLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); // hor/vert addHSpacing( hbox ); // Label for the message QLabel * label = new QLabel( message, hbox ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert // Disk usage list YQPkgDiskUsageList * duList = new YQPkgDiskUsageList( this, thresholdPercent ); - CHECK_PTR( duList ); + Q_CHECK_PTR( duList ); layout->addWidget( duList ); // Button box - hbox = new QHBox( this ); - CHECK_PTR( hbox ); + hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); layout->addWidget( hbox ); @@ -104,7 +108,7 @@ // Accept button - usually "OK" or "Continue" QPushButton * button = new QPushButton( acceptButtonLabel, hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); connect( button, SIGNAL( clicked() ), @@ -118,7 +122,7 @@ // Reject button ( if desired ) - usually "Cancel" button = new QPushButton( rejectButtonLabel, hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); connect( button, SIGNAL( clicked() ), this, SLOT ( reject() ) ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.cc Thu Jul 26 15:47:28 2007 @@ -31,7 +31,7 @@ YQPkgGenericDetailsView::YQPkgGenericDetailsView( QWidget * parent ) - : QTextBrowser( parent ) + : Q3TextBrowser( parent ) { _selectable = 0; _parentTab = dynamic_cast (parent); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgGenericDetailsView.h Thu Jul 26 15:47:28 2007 @@ -21,7 +21,7 @@ #ifndef YQPkgGenericDetailsView_h #define YQPkgGenericDetailsView_h -#include +#include #include #include @@ -35,7 +35,7 @@ * HTML formatting, Qt slots and display only if this view is visible at all * ( it may be hidden if it's part of a QTabWidget ). **/ -class YQPkgGenericDetailsView : public QTextBrowser +class YQPkgGenericDetailsView : public Q3TextBrowser { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgLangList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgLangList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgLangList.cc Thu Jul 26 15:47:28 2007 @@ -46,7 +46,7 @@ addColumn( _( "Language" ) ); _summaryCol = numCol++; setAllColumnsShowFocus( true ); - connect( this, SIGNAL( selectionChanged ( QListViewItem * ) ), + connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); fillList(); @@ -172,7 +172,7 @@ YQPkgLangListItem * YQPkgLangList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.cc Thu Jul 26 15:47:28 2007 @@ -23,8 +23,8 @@ #define y2log_component "qt-pkg" #include #include -#include -#include +#include +#include #include #include "utf8.h" @@ -107,7 +107,7 @@ } YQPkgListItem * item = new YQPkgListItem( this, selectable, zyppPkg ); - CHECK_PTR( item ); + Q_CHECK_PTR( item ); item->setDimmed( dimmed ); applyExcludeRules( item ); @@ -131,7 +131,7 @@ void YQPkgList::pkgObjClicked( int button, - QListViewItem * listViewItem, + Q3ListViewItem * listViewItem, int col, const QPoint & pos ) { @@ -176,13 +176,13 @@ void YQPkgList::createSourceRpmContextMenu() { - _sourceRpmContextMenu = new QPopupMenu( this ); + _sourceRpmContextMenu = new Q3PopupMenu( this ); actionInstallSourceRpm->addTo( _sourceRpmContextMenu ); actionDontInstallSourceRpm->addTo( _sourceRpmContextMenu ); - QPopupMenu * submenu = new QPopupMenu( _sourceRpmContextMenu ); - CHECK_PTR( submenu ); + Q3PopupMenu * submenu = new Q3PopupMenu( _sourceRpmContextMenu ); + Q_CHECK_PTR( submenu ); _sourceRpmContextMenu->insertItem( _( "&All in This List" ), submenu ); actionInstallListSourceRpms->addTo( submenu ); @@ -194,7 +194,7 @@ YQPkgList::setInstallCurrentSourceRpm( bool installSourceRpm, bool selectNextItem ) { - QListViewItem * listViewItem = selectedItem(); + Q3ListViewItem * listViewItem = selectedItem(); if ( ! listViewItem ) return; @@ -220,7 +220,7 @@ if ( ! _editable ) return; - QListViewItem * listViewItem = firstChild(); + Q3ListViewItem * listViewItem = firstChild(); while ( listViewItem ) { @@ -240,8 +240,8 @@ void YQPkgList::createNotInstalledContextMenu() { - _notInstalledContextMenu = new QPopupMenu( this ); - CHECK_PTR( _notInstalledContextMenu ); + _notInstalledContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _notInstalledContextMenu ); actionSetCurrentInstall->addTo( _notInstalledContextMenu ); actionSetCurrentDontInstall->addTo( _notInstalledContextMenu ); @@ -259,8 +259,8 @@ void YQPkgList::createInstalledContextMenu() { - _installedContextMenu = new QPopupMenu( this ); - CHECK_PTR( _installedContextMenu ); + _installedContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); actionSetCurrentDelete->addTo( _installedContextMenu ); @@ -275,11 +275,11 @@ } -QPopupMenu * -YQPkgList::addAllInListSubMenu( QPopupMenu * menu ) +Q3PopupMenu * +YQPkgList::addAllInListSubMenu( Q3PopupMenu * menu ) { - QPopupMenu * submenu = new QPopupMenu( menu ); - CHECK_PTR( submenu ); + Q3PopupMenu * submenu = new Q3PopupMenu( menu ); + Q_CHECK_PTR( submenu ); actionSetListInstall->addTo( submenu ); actionSetListDontInstall->addTo( submenu ); @@ -407,7 +407,7 @@ // Write all items // - const QListViewItem * item = firstChild(); + const Q3ListViewItem * item = firstChild(); while ( item ) { @@ -721,7 +721,7 @@ * +1 if this > other **/ int -YQPkgListItem::compare( QListViewItem * otherListViewItem, +YQPkgListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -758,7 +758,7 @@ QColorGroup cg = colorGroup; cg.setColor( QColorGroup::Text, QColor( 0xA0, 0xA0, 0xA0 ) ); - QListViewItem::paintCell( painter, cg, column, width, alignment ); + Q3ListViewItem::paintCell( painter, cg, column, width, alignment ); } else { @@ -774,7 +774,7 @@ cg.setColor( QColorGroup::Text, QColor( 0xFF, 0, 0 ) ); // Foreground } - QListViewItem::paintCell( painter, cg, column, width, alignment ); + Q3ListViewItem::paintCell( painter, cg, column, width, alignment ); } else if ( candidateIsNewer() ) { @@ -788,11 +788,11 @@ cg.setColor( QColorGroup::Base, QColor( 0xF0, 0xF0, 0xF0 ) ); // Background } - QListViewItem::paintCell( painter, cg, column, width, alignment ); + Q3ListViewItem::paintCell( painter, cg, column, width, alignment ); } else { - QListViewItem::paintCell( painter, colorGroup, column, width, alignment ); + Q3ListViewItem::paintCell( painter, colorGroup, column, width, alignment ); } } } Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgList.h Thu Jul 26 15:47:28 2007 @@ -22,6 +22,8 @@ #define YQPkgList_h #include +//Added by qt3to4: +#include class YQPkgListItem; @@ -64,7 +66,7 @@ * * Reimplemented from YQPkgObjList. **/ - virtual QPopupMenu * addAllInListSubMenu( QPopupMenu * menu ); + virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); /** * Returns 'true' if there are any installed packages. @@ -118,7 +120,7 @@ * Reimplemented from YQPkgObjList. **/ virtual void pkgObjClicked( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -197,15 +199,15 @@ // Data members int _srpmStatusCol; - QPopupMenu * _sourceRpmContextMenu; + Q3PopupMenu * _sourceRpmContextMenu; public: - QAction * actionInstallSourceRpm; - QAction * actionDontInstallSourceRpm; - QAction * actionInstallListSourceRpms; - QAction * actionDontInstallListSourceRpms; + Q3Action * actionInstallSourceRpm; + Q3Action * actionDontInstallSourceRpm; + Q3Action * actionInstallListSourceRpms; + Q3Action * actionDontInstallListSourceRpms; }; @@ -268,7 +270,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.cc Thu Jul 26 15:47:28 2007 @@ -21,9 +21,11 @@ #define y2log_component "qt-pkg" #include #include -#include -#include -#include +#include +#include +#include +//Added by qt3to4: +#include #include "utf8.h" @@ -65,14 +67,14 @@ createActions(); - connect( this, SIGNAL( columnClicked ( int, QListViewItem *, int, const QPoint & ) ), - this, SLOT ( pkgObjClicked ( int, QListViewItem *, int, const QPoint & ) ) ); + connect( this, SIGNAL( columnClicked ( int, Q3ListViewItem *, int, const QPoint & ) ), + this, SLOT ( pkgObjClicked ( int, Q3ListViewItem *, int, const QPoint & ) ) ); - connect( this, SIGNAL( columnDoubleClicked ( int, QListViewItem *, int, const QPoint & ) ), - this, SLOT ( pkgObjClicked ( int, QListViewItem *, int, const QPoint & ) ) ); + connect( this, SIGNAL( columnDoubleClicked ( int, Q3ListViewItem *, int, const QPoint & ) ), + this, SLOT ( pkgObjClicked ( int, Q3ListViewItem *, int, const QPoint & ) ) ); - connect( this, SIGNAL( selectionChanged ( QListViewItem * ) ), - this, SLOT ( selectionChangedInternal( QListViewItem * ) ) ); + connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), + this, SLOT ( selectionChangedInternal( Q3ListViewItem * ) ) ); } @@ -120,7 +122,7 @@ void YQPkgObjList::pkgObjClicked( int button, - QListViewItem * listViewItem, + Q3ListViewItem * listViewItem, int col, const QPoint & pos ) { @@ -143,7 +145,7 @@ { updateActions( item ); - QPopupMenu * contextMenu = + Q3PopupMenu * contextMenu = item->selectable()->hasInstalledObj() ? installedContextMenu() : notInstalledContextMenu(); @@ -156,7 +158,7 @@ void -YQPkgObjList::selectionChangedInternal( QListViewItem * listViewItem ) +YQPkgObjList::selectionChangedInternal( Q3ListViewItem * listViewItem ) { YQPkgObjListItem * item = dynamic_cast (listViewItem); @@ -265,7 +267,7 @@ void YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem ) { - QListViewItem * listViewItem = selectedItem(); + Q3ListViewItem * listViewItem = selectedItem(); if ( ! listViewItem ) return; @@ -304,7 +306,7 @@ return; YQUI::ui()->busyCursor(); - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -339,7 +341,7 @@ void YQPkgObjList::selectNextItem() { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( item && item->nextSibling() ) { @@ -401,7 +403,7 @@ -QAction * +Q3Action * YQPkgObjList::createAction( ZyppStatus status, const QString & key, bool enabled ) { return createAction( statusText( status ), @@ -412,7 +414,7 @@ } -QAction * +Q3Action * YQPkgObjList::createAction( const QString & text, const QPixmap & icon, const QPixmap & insensitiveIcon, @@ -425,21 +427,21 @@ label += "\t" + key; - QIconSet iconSet ( icon ); + QIcon iconSet ( icon ); if ( ! insensitiveIcon.isNull() ) { iconSet.setPixmap( insensitiveIcon, - QIconSet::Automatic, - QIconSet::Disabled ); + QIcon::Automatic, + QIcon::Disabled ); } - QAction * action = new QAction( label, // text + Q3Action * action = new Q3Action( label, // text iconSet, // icon set label, // menu text 0, // accel key this ); // parent - CHECK_PTR( action ); + Q_CHECK_PTR( action ); action->setEnabled( enabled ); return action; @@ -449,8 +451,8 @@ void YQPkgObjList::createNotInstalledContextMenu() { - _notInstalledContextMenu = new QPopupMenu( this ); - CHECK_PTR( _notInstalledContextMenu ); + _notInstalledContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _notInstalledContextMenu ); actionSetCurrentInstall->addTo( _notInstalledContextMenu ); actionSetCurrentDontInstall->addTo( _notInstalledContextMenu ); @@ -463,8 +465,8 @@ void YQPkgObjList::createInstalledContextMenu() { - _installedContextMenu = new QPopupMenu( this ); - CHECK_PTR( _installedContextMenu ); + _installedContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); actionSetCurrentDelete->addTo( _installedContextMenu ); @@ -474,11 +476,11 @@ } -QPopupMenu * -YQPkgObjList::addAllInListSubMenu( QPopupMenu * menu ) +Q3PopupMenu * +YQPkgObjList::addAllInListSubMenu( Q3PopupMenu * menu ) { - QPopupMenu * submenu = new QPopupMenu( menu ); - CHECK_PTR( submenu ); + Q3PopupMenu * submenu = new Q3PopupMenu( menu ); + Q_CHECK_PTR( submenu ); actionSetListInstall->addTo( submenu ); actionSetListDontInstall->addTo( submenu ); @@ -494,7 +496,7 @@ } -QPopupMenu * +Q3PopupMenu * YQPkgObjList::notInstalledContextMenu() { if ( ! _notInstalledContextMenu ) @@ -504,7 +506,7 @@ } -QPopupMenu * +Q3PopupMenu * YQPkgObjList::installedContextMenu() { if ( ! _installedContextMenu ) @@ -582,7 +584,7 @@ } - QListViewItem * selectedListViewItem = selectedItem(); + Q3ListViewItem * selectedListViewItem = selectedItem(); if ( selectedListViewItem ) { @@ -684,7 +686,7 @@ } } - QListView::keyPressEvent( event ); + Q3ListView::keyPressEvent( event ); } @@ -692,7 +694,7 @@ YQPkgObjList::message( const QString & text ) { QY2ListViewItem * item = new QY2ListViewItem( this ); - CHECK_PTR( item ); + Q_CHECK_PTR( item ); item->setText( nameCol() >= 0 ? nameCol() : 0, text ); item->setBackgroundColor( QColor( 0xE0, 0xE0, 0xF8 ) ); @@ -710,11 +712,11 @@ YQPkgObjList::applyExcludeRules() { // y2debug( "Applying exclude rules" ); - QListViewItemIterator listView_it( this ); + Q3ListViewItemIterator listView_it( this ); while ( *listView_it ) { - QListViewItem * current_item = *listView_it; + Q3ListViewItem * current_item = *listView_it; // Advance iterator now so it remains valid even if there are changes // to the QListView, e.g., if the current item is excluded and thus @@ -728,7 +730,7 @@ while ( excluded_it != _excludedItems->end() ) { - QListViewItem * current_item = (*excluded_it).first; + Q3ListViewItem * current_item = (*excluded_it).first; // Advance iterator now so it remains valid even if there are changes // to the excluded items, e.g., if the current item is un-excluded and thus @@ -766,7 +768,7 @@ void -YQPkgObjList::applyExcludeRules( QListViewItem * listViewItem ) +YQPkgObjList::applyExcludeRules( Q3ListViewItem * listViewItem ) { YQPkgObjListItem * item = dynamic_cast( listViewItem ); @@ -819,12 +821,12 @@ if ( exclude ) { - QListViewItem * parentItem = item->parent(); + Q3ListViewItem * parentItem = item->parent(); if ( parentItem ) parentItem->takeItem( item ); else - QListView::takeItem( item ); + Q3ListView::takeItem( item ); _excludedItems->add( item, parentItem ); } @@ -832,13 +834,13 @@ { if ( _excludedItems->contains( item ) ) { - QListViewItem * oldParent = _excludedItems->oldParentItem( item ); + Q3ListViewItem * oldParent = _excludedItems->oldParentItem( item ); _excludedItems->remove( item ); if ( oldParent ) oldParent->insertItem( item ); else - QListView::insertItem( item ); + Q3ListView::insertItem( item ); } } } @@ -948,7 +950,7 @@ void YQPkgObjListItem::setText( int column, const string text ) { - QListViewItem::setText( column, fromUTF8( text.c_str() ) ); + Q3ListViewItem::setText( column, fromUTF8( text.c_str() ) ); } @@ -1366,7 +1368,7 @@ * +1 if this > other **/ int -YQPkgObjListItem::compare( QListViewItem * otherListViewItem, +YQPkgObjListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -1484,7 +1486,7 @@ bool -YQPkgObjList::ExcludeRule::match( QListViewItem * item ) +YQPkgObjList::ExcludeRule::match( Q3ListViewItem * item ) { if ( ! _enabled ) return false; @@ -1514,13 +1516,13 @@ } -void YQPkgObjList::ExcludedItems::add( QListViewItem * item, QListViewItem * oldParent ) +void YQPkgObjList::ExcludedItems::add( Q3ListViewItem * item, Q3ListViewItem * oldParent ) { _excludeMap.insert( ItemPair( item, oldParent ) ); } -void YQPkgObjList::ExcludedItems::remove( QListViewItem * item ) +void YQPkgObjList::ExcludedItems::remove( Q3ListViewItem * item ) { ItemMap::iterator it = _excludeMap.find( item ); @@ -1544,13 +1546,13 @@ } -bool YQPkgObjList::ExcludedItems::contains( QListViewItem * item ) +bool YQPkgObjList::ExcludedItems::contains( Q3ListViewItem * item ) { return ( _excludeMap.find( item ) != _excludeMap.end() ); } -QListViewItem * YQPkgObjList::ExcludedItems::oldParentItem( QListViewItem * item ) +Q3ListViewItem * YQPkgObjList::ExcludedItems::oldParentItem( Q3ListViewItem * item ) { ItemMap::iterator it = _excludeMap.find( item ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgObjList.h Thu Jul 26 15:47:28 2007 @@ -23,6 +23,9 @@ #include #include +//Added by qt3to4: +#include +#include #include <map> #include <list> #include @@ -31,8 +34,8 @@ #include class YQPkgObjListItem; -class QAction; -class QPopupMenu; +class Q3Action; +class Q3PopupMenu; using std::string; using std::list; @@ -103,7 +106,7 @@ * Add a submenu "All in this list..." to 'menu'. * Returns the newly created submenu. **/ - virtual QPopupMenu * addAllInListSubMenu( QPopupMenu * menu ); + virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); /** * Returns the suitable icon for a zypp::ResObject status - the regular @@ -137,7 +140,7 @@ /** * Apply all exclude rules of this list to one item. **/ - void applyExcludeRules( QListViewItem * ); + void applyExcludeRules( Q3ListViewItem * ); /** * Exclude or include an item, i.e. remove it from the visible items @@ -175,7 +178,7 @@ * Dispatcher slot for mouse click: cycle status depending on column. **/ virtual void pkgObjClicked( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -250,7 +253,7 @@ /** * Dispatcher slot for selection change - internal only. **/ - virtual void selectionChangedInternal( QListViewItem * item ); + virtual void selectionChangedInternal( Q3ListViewItem * item ); signals: @@ -288,13 +291,13 @@ * Returns the context menu for items that are not installed. * Creates the menu upon the first call. **/ - virtual QPopupMenu * installedContextMenu(); + virtual Q3PopupMenu * installedContextMenu(); /** * Returns the context menu for items that are installed. * Creates the menu upon the first call. **/ - virtual QPopupMenu * notInstalledContextMenu(); + virtual Q3PopupMenu * notInstalledContextMenu(); /** * Create the context menu for items that are not installed. @@ -317,7 +320,7 @@ * retrieve the corresponding status icons (both sensitive and insensitive) * and text. 'key' is only a descriptive text, no true accelerator. **/ - QAction * createAction( ZyppStatus status, + Q3Action * createAction( ZyppStatus status, const QString & key = QString::null, bool enabled = false ); @@ -325,7 +328,7 @@ * Low-level: Create an action. * 'key' is only a descriptive text, no true accelerator. **/ - QAction * createAction( const QString & text, + Q3Action * createAction( const QString & text, const QPixmap & icon = QPixmap(), const QPixmap & insensitiveIcon = QPixmap(), const QString & key = QString::null, @@ -351,28 +354,28 @@ ExcludeRuleList _excludeRules; ExcludedItems * _excludedItems; - QPopupMenu * _installedContextMenu; - QPopupMenu * _notInstalledContextMenu; + Q3PopupMenu * _installedContextMenu; + Q3PopupMenu * _notInstalledContextMenu; public: - QAction * actionSetCurrentInstall; - QAction * actionSetCurrentDontInstall; - QAction * actionSetCurrentKeepInstalled; - QAction * actionSetCurrentDelete; - QAction * actionSetCurrentUpdate; - QAction * actionSetCurrentTaboo; - QAction * actionSetCurrentProtected; - - QAction * actionSetListInstall; - QAction * actionSetListDontInstall; - QAction * actionSetListKeepInstalled; - QAction * actionSetListDelete; - QAction * actionSetListUpdate; - QAction * actionSetListUpdateForce; - QAction * actionSetListTaboo; - QAction * actionSetListProtected; + Q3Action * actionSetCurrentInstall; + Q3Action * actionSetCurrentDontInstall; + Q3Action * actionSetCurrentKeepInstalled; + Q3Action * actionSetCurrentDelete; + Q3Action * actionSetCurrentUpdate; + Q3Action * actionSetCurrentTaboo; + Q3Action * actionSetCurrentProtected; + + Q3Action * actionSetListInstall; + Q3Action * actionSetListDontInstall; + Q3Action * actionSetListKeepInstalled; + Q3Action * actionSetListDelete; + Q3Action * actionSetListUpdate; + Q3Action * actionSetListUpdateForce; + Q3Action * actionSetListTaboo; + Q3Action * actionSetListProtected; public: @@ -527,7 +530,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -628,7 +631,7 @@ * confused which one to use. **/ void setText( int column, const QString & text ) - { QListViewItem::setText( column, text ); } + { Q3ListViewItem::setText( column, text ); } /** * Set a column text via Edition. @@ -719,7 +722,7 @@ * Returns 'true' if the item matches this exclude rule, * i.e. if it should be excluded. **/ - bool match( QListViewItem * item ); + bool match( Q3ListViewItem * item ); private: @@ -734,8 +737,8 @@ { public: - typedef std::map ItemMap; - typedef std::pair ItemPair; + typedef std::map ItemMap; + typedef std::pair ItemPair; typedef ItemMap::iterator iterator; /** @@ -755,13 +758,13 @@ * oldParent is the previous parent item of this item * or 0 if it was a root item. **/ - void add( QListViewItem * item, QListViewItem * oldParent ); + void add( Q3ListViewItem * item, Q3ListViewItem * oldParent ); /** * Remove a list item from the excluded items and transfer ownership back * to the caller. **/ - void remove( QListViewItem * item ); + void remove( Q3ListViewItem * item ); /** * Clear the excluded items. Delete all items still excluded. @@ -771,13 +774,13 @@ /** * Returns 'true' if the specified item is in the excluded items. **/ - bool contains( QListViewItem * item ); + bool contains( Q3ListViewItem * item ); /** * Returns the old parent of this item so it can be reparented * or 0 if it was a root item. **/ - QListViewItem * oldParentItem( QListViewItem * item ); + Q3ListViewItem * oldParentItem( Q3ListViewItem * item ); /** * Returns the number of items Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.cc Thu Jul 26 15:47:28 2007 @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -50,23 +52,23 @@ YQPkgPatchFilterView::YQPkgPatchFilterView( QWidget * parent ) - : QVBox( parent ) + : Q3VBox( parent ) { - QVBox * vbox; + Q3VBox * vbox; - _splitter = new QSplitter( QSplitter::Vertical, this ); CHECK_PTR( _splitter ); - vbox = new QVBox( _splitter ); CHECK_PTR( vbox ); - _patchList = new YQPkgPatchList( vbox ); CHECK_PTR( _patchList ); + _splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( _splitter ); + vbox = new Q3VBox( _splitter ); Q_CHECK_PTR( vbox ); + _patchList = new YQPkgPatchList( vbox ); Q_CHECK_PTR( _patchList ); addVSpacing( vbox, 4 ); - QHBox * hbox = new QHBox( vbox ); CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( vbox ); Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); QLabel * label = new QLabel( _( "&Show Patch Category:" ), hbox ); _patchFilter = new QComboBox( hbox ); - CHECK_PTR( _patchFilter ); + Q_CHECK_PTR( _patchFilter ); _patchFilter->insertItem( _( "Installable Patches" ), 0 ); _patchFilter->insertItem( _( "Installable and Installed Patches" ), 1 ); @@ -78,13 +80,13 @@ connect( _patchFilter, SIGNAL( activated( int ) ), this, SLOT( fillPatchList() ) ); addVSpacing( vbox, 4 ); - vbox = new QVBox( _splitter ); CHECK_PTR( vbox ); + vbox = new Q3VBox( _splitter ); Q_CHECK_PTR( vbox ); addVSpacing( vbox, 8 ); - _detailsViews = new QTabWidget( vbox ); CHECK_PTR( _detailsViews ); + _detailsViews = new QTabWidget( vbox ); Q_CHECK_PTR( _detailsViews ); _detailsViews->setMargin( MARGIN ); - _descriptionView = new YQPkgDescriptionView( _detailsViews ); CHECK_PTR( _descriptionView ); + _descriptionView = new YQPkgDescriptionView( _detailsViews ); Q_CHECK_PTR( _descriptionView ); _descriptionView->setMinimumSize( 0, 0 ); _detailsViews->addTab( _descriptionView, _( "Patch Description" ) ); @@ -96,17 +98,17 @@ // addVSpacing( vbox, 4 ); - hbox = new QHBox( vbox ); CHECK_PTR( hbox ); + hbox = new Q3HBox( vbox ); Q_CHECK_PTR( hbox ); addHStretch( hbox ); new QLabel( _( "Estimated Download Size:" ) + " ", hbox ); _totalDownloadSize = new QLabel( FSize(0).asString().c_str(), hbox ); - CHECK_PTR( _totalDownloadSize ); + Q_CHECK_PTR( _totalDownloadSize ); // Give the total download size a 3D look - _totalDownloadSize->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + _totalDownloadSize->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken ); _totalDownloadSize->setLineWidth(1); _totalDownloadSize->setMidLineWidth(2); #endif Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchFilterView.h Thu Jul 26 15:47:28 2007 @@ -23,7 +23,9 @@ #include "YQZypp.h" #include "YQPkgSelMapper.h" -#include +#include +//Added by qt3to4: +#include class YQPkgPatchList; @@ -38,7 +40,7 @@ * @short Display a list of zypp::Patch objects and ( below ) details about the * currently selected patch. **/ -class YQPkgPatchFilterView : public QVBox +class YQPkgPatchFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.cc Thu Jul 26 15:47:28 2007 @@ -22,8 +22,10 @@ #define y2log_component "qt-pkg" #include -#include -#include +#include +#include +//Added by qt3to4: +#include #include #include <set> @@ -68,7 +70,7 @@ setAllColumnsShowFocus( true ); setColumnAlignment( sizeCol(), Qt::AlignRight ); - connect( this, SIGNAL( selectionChanged ( QListViewItem * ) ), + connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); setSorting( categoryCol() ); @@ -244,7 +246,7 @@ YQPkgPatchList::message( const QString & text ) { QY2ListViewItem * item = new QY2ListViewItem( this ); - CHECK_PTR( item ); + Q_CHECK_PTR( item ); item->setText( 1, text ); item->setBackgroundColor( QColor( 0xE0, 0xE0, 0xF8 ) ); @@ -350,7 +352,7 @@ YQPkgPatchListItem * YQPkgPatchList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; @@ -362,8 +364,8 @@ void YQPkgPatchList::createNotInstalledContextMenu() { - _notInstalledContextMenu = new QPopupMenu( this ); - CHECK_PTR( _notInstalledContextMenu ); + _notInstalledContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _notInstalledContextMenu ); actionSetCurrentInstall->addTo( _notInstalledContextMenu ); actionSetCurrentDontInstall->addTo( _notInstalledContextMenu ); @@ -376,8 +378,8 @@ void YQPkgPatchList::createInstalledContextMenu() { - _installedContextMenu = new QPopupMenu( this ); - CHECK_PTR( _installedContextMenu ); + _installedContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); @@ -392,11 +394,11 @@ } -QPopupMenu * -YQPkgPatchList::addAllInListSubMenu( QPopupMenu * menu ) +Q3PopupMenu * +YQPkgPatchList::addAllInListSubMenu( Q3PopupMenu * menu ) { - QPopupMenu * submenu = new QPopupMenu( menu ); - CHECK_PTR( submenu ); + Q3PopupMenu * submenu = new Q3PopupMenu( menu ); + Q_CHECK_PTR( submenu ); actionSetListInstall->addTo( submenu ); actionSetListDontInstall->addTo( submenu ); @@ -425,7 +427,7 @@ #if ! ENABLE_DELETING_PATCHES if ( event->ascii() == '-' ) { - QListViewItem * selectedListViewItem = selectedItem(); + Q3ListViewItem * selectedListViewItem = selectedItem(); if ( selectedListViewItem ) { @@ -488,6 +490,13 @@ YQPkgPatchCategory +YQPkgPatchListItem::patchCategory( const string & category ) +{ + return patchCategory( fromUTF8( category ) ); +} + + +YQPkgPatchCategory YQPkgPatchListItem::patchCategory( QString category ) { category = category.lower(); @@ -579,7 +588,7 @@ * +1 if this > other **/ int -YQPkgPatchListItem::compare( QListViewItem * otherListViewItem, +YQPkgPatchListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatchList.h Thu Jul 26 15:47:28 2007 @@ -24,6 +24,9 @@ #include <string> #include "YQPkgObjList.h" #include "YQPkgSelMapper.h" +//Added by qt3to4: +#include +#include #define ENABLE_DELETING_PATCHES 1 @@ -137,7 +140,7 @@ * * Reimplemented from YQPkgObjList. **/ - virtual QPopupMenu * addAllInListSubMenu( QPopupMenu * menu ); + virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); /** * Delayed initialization after the dialog is fully created. @@ -235,6 +238,7 @@ * Maps a string patch category to the corresponding enum. **/ static YQPkgPatchCategory patchCategory( QString category ); + static YQPkgPatchCategory patchCategory( const string & category ); /** * Converts a patch category to a user-readable (translated) string. @@ -269,7 +273,7 @@ * * Reimplemented from QListViewItem. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.cc Thu Jul 26 15:47:28 2007 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "YQi18n.h" @@ -69,7 +69,7 @@ if ( autoFilter ) { - connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), + connect( this, SIGNAL( selectionChanged( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); } @@ -134,7 +134,7 @@ y2debug( "New pattern category \"%s\"", (const char *) categoryName ); cat = new YQPkgPatternCategoryItem( this, categoryName ); - CHECK_PTR( cat ); + Q_CHECK_PTR( cat ); _categories.insert( categoryName, cat ); } @@ -213,7 +213,7 @@ YQPkgPatternListItem * YQPkgPatternList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; @@ -224,7 +224,7 @@ void YQPkgPatternList::pkgObjClicked( int button, - QListViewItem * listViewItem, + Q3ListViewItem * listViewItem, int col, const QPoint & pos ) { @@ -251,7 +251,7 @@ void YQPkgPatternList::selectSomething() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -331,7 +331,7 @@ * +1 if this > other **/ int -YQPkgPatternListItem::compare( QListViewItem * otherListViewItem, +YQPkgPatternListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -345,7 +345,7 @@ if ( otherCategoryItem ) // Patterns without category should always be sorted return -1; // before any category - return QListViewItem::compare( otherListViewItem, col, ascending ); + return Q3ListViewItem::compare( otherListViewItem, col, ascending ); } @@ -402,7 +402,7 @@ void YQPkgPatternCategoryItem::setOpen( bool open ) { - QListViewItem::setOpen( open ); + Q3ListViewItem::setOpen( open ); setTreeIcon(); } @@ -427,7 +427,7 @@ * +1 if this > other **/ int -YQPkgPatternCategoryItem::compare( QListViewItem * otherListViewItem, +YQPkgPatternCategoryItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -442,7 +442,7 @@ if ( otherPatternListitem ) // Patterns without category should always be sorted return 1; // before any category - return QListViewItem::compare( otherListViewItem, col, ascending ); + return Q3ListViewItem::compare( otherListViewItem, col, ascending ); } Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgPatternList.h Thu Jul 26 15:47:28 2007 @@ -22,7 +22,7 @@ #define YQPkgPatternList_h #include "YQPkgObjList.h" -#include +#include class YQPkgPatternListItem; @@ -93,7 +93,7 @@ * Reimplemented from YQPkgObjList. **/ virtual void pkgObjClicked( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -147,7 +147,7 @@ // Data members // - QDict<YQPkgPatternCategoryItem> _categories; + Q3Dict<YQPkgPatternCategoryItem> _categories; }; @@ -191,7 +191,7 @@ * Reimplemented from QListViewItem: * Sort by zypp::Pattern::order() only. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -260,7 +260,7 @@ * Reimplemented from QListViewItem: * Sort by zypp::Pattern::order() only. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgProductDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgProductDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgProductDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgProductDialog.cc Thu Jul 26 15:47:28 2007 @@ -23,14 +23,17 @@ #include #include -#include +#include +#include #include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include "YQPkgProductDialog.h" #include "YQPkgProductList.h" @@ -55,14 +58,14 @@ // Layout for the dialog (can't simply insert a QVBox) - QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); - CHECK_PTR( layout ); + Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + Q_CHECK_PTR( layout ); // VBox for splitter - QSplitter * splitter = new QSplitter( QSplitter::Vertical, this ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, this ); + Q_CHECK_PTR( splitter ); layout->addWidget( splitter ); splitter->setMargin( MARGIN ); @@ -70,7 +73,7 @@ // Product list _productList = new YQPkgProductList( splitter ); - CHECK_PTR( _productList ); + Q_CHECK_PTR( _productList ); _productList->resize( _productList->width(), 80 ); // Prevent status changes for now - this would require solver runs etc. @@ -80,14 +83,14 @@ // Tab widget for details views (looks better even just with one) _detailsViews = new QTabWidget( splitter ); - CHECK_PTR( _detailsViews ); + Q_CHECK_PTR( _detailsViews ); _detailsViews->setMargin( MARGIN ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert // Dependencies view _dependenciesView = new YQPkgDependenciesView( _detailsViews ); - CHECK_PTR( _dependenciesView ); + Q_CHECK_PTR( _dependenciesView ); _detailsViews->addTab( _dependenciesView, _( "Dependencies" ) ); _dependenciesView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -97,8 +100,8 @@ // Button box (to center the single button) - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); layout->addWidget( hbox ); @@ -109,7 +112,7 @@ // "OK" button QPushButton * button = new QPushButton( _( "&OK" ), hbox ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.cc Thu Jul 26 15:47:28 2007 @@ -26,6 +26,8 @@ #include "QY2ComboTabWidget.h" #include "QY2LayoutUtils.h" +//Added by qt3to4: +#include #include "YQPkgRepoFilterView.h" #include "YQPkgRepoList.h" #include "YQPkgRpmGroupTagsFilterView.h" @@ -37,14 +39,14 @@ YQPkgRepoFilterView::YQPkgRepoFilterView( QWidget * parent ) - : QVBox( parent ) + : Q3VBox( parent ) { - QSplitter * splitter = new QSplitter( QSplitter::Vertical, this ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, this ); + Q_CHECK_PTR( splitter ); - QVBox * upper_vbox = new QVBox( splitter ); + Q3VBox * upper_vbox = new Q3VBox( splitter ); _repoList = new YQPkgRepoList( upper_vbox ); - CHECK_PTR( _repoList ); + Q_CHECK_PTR( _repoList ); _repoList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert addVSpacing( upper_vbox, MARGIN ); @@ -89,17 +91,17 @@ QWidget * YQPkgRepoFilterView::layoutSecondaryFilters( QWidget * parent ) { - QVBox *vbox = new QVBox( parent ); - CHECK_PTR( vbox ); + Q3VBox *vbox = new Q3VBox( parent ); + Q_CHECK_PTR( vbox ); addVSpacing( vbox, MARGIN ); // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of // "all packages", "RPM groups", "search", "summary" _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" ), vbox ); - CHECK_PTR( _secondaryFilters ); + Q_CHECK_PTR( _secondaryFilters ); - _secondaryFilters->setFrameStyle( QFrame::Plain ); + _secondaryFilters->setFrameStyle( Q3Frame::Plain ); _secondaryFilters->setLineWidth( 0 ); _secondaryFilters->setMidLineWidth( 0 ); _secondaryFilters->setMargin( 0 ); @@ -110,7 +112,7 @@ // _allPackages = new QWidget( vbox ); - CHECK_PTR( _allPackages ); + Q_CHECK_PTR( _allPackages ); _secondaryFilters->addPage( _( "All Packages" ), _allPackages ); @@ -119,7 +121,7 @@ // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( vbox ); - CHECK_PTR( _rpmGroupTagsFilterView ); + Q_CHECK_PTR( _rpmGroupTagsFilterView ); _secondaryFilters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); connect( _rpmGroupTagsFilterView, SIGNAL( filterStart() ), @@ -131,7 +133,7 @@ // _searchFilterView = new YQPkgSearchFilterView( vbox ); - CHECK_PTR( _searchFilterView ); + Q_CHECK_PTR( _searchFilterView ); _secondaryFilters->addPage( _( "Search" ), _searchFilterView ); connect( _searchFilterView, SIGNAL( filterStart() ), @@ -146,7 +148,7 @@ // _statusFilterView = new YQPkgStatusFilterView( parent ); - CHECK_PTR( _statusFilterView ); + Q_CHECK_PTR( _statusFilterView ); _secondaryFilters->addPage( _( "Installation Summary" ), _statusFilterView ); connect( _statusFilterView, SIGNAL( filterStart() ), Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoFilterView.h Thu Jul 26 15:47:28 2007 @@ -22,7 +22,7 @@ #define YQPkgRepoFilterView_h #include "YQZypp.h" -#include +#include class YQPkgRepoList; @@ -32,7 +32,7 @@ class YQPkgStatusFilterView; -class YQPkgRepoFilterView : public QVBox +class YQPkgRepoFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRepoList.cc Thu Jul 26 15:47:28 2007 @@ -49,7 +49,7 @@ addColumn( _( "URL" ) ); _urlCol = numCol++; setAllColumnsShowFocus( true ); - setSelectionMode( QListView::Extended ); // allow multi-selection with Ctrl-mouse + setSelectionMode( Q3ListView::Extended ); // allow multi-selection with Ctrl-mouse connect( this, SIGNAL( selectionChanged() ), this, SLOT ( filterIfVisible()) ); @@ -116,7 +116,7 @@ set<ZyppSel> exactMatches; set<ZyppSel> nearMatches; - QListViewItem * item = firstChild(); // take multi selection into account + Q3ListViewItem * item = firstChild(); // take multi selection into account while ( item ) { @@ -202,7 +202,7 @@ YQPkgRepoListItem * YQPkgRepoList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc Thu Jul 26 15:47:28 2007 @@ -32,7 +32,7 @@ YQPkgRpmGroupTagsFilterView::YQPkgRpmGroupTagsFilterView( QWidget * parent ) - : QListView( parent ) + : Q3ListView( parent ) { addColumn( _( "Package Groups" ) ); setRootIsDecorated( true ); @@ -40,8 +40,8 @@ new YQPkgRpmGroupTag( this, _( "zzz All" ), 0 ); - connect( this, SIGNAL( selectionChanged ( QListViewItem * ) ), - this, SLOT ( slotSelectionChanged ( QListViewItem * ) ) ); + connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), + this, SLOT ( slotSelectionChanged ( Q3ListViewItem * ) ) ); selectSomething(); } @@ -58,7 +58,7 @@ if ( ! _rpmGroupsTree ) { _rpmGroupsTree = new YRpmGroupsTree(); - CHECK_PTR( _rpmGroupsTree ); + Q_CHECK_PTR( _rpmGroupsTree ); fillRpmGroupsTree(); } @@ -100,7 +100,7 @@ else clone = new YQPkgRpmGroupTag( this, child ); - CHECK_PTR( clone ); + Q_CHECK_PTR( clone ); clone->setOpen( clone->depth() < 1 ); cloneTree( child, clone ); @@ -112,7 +112,7 @@ void YQPkgRpmGroupTagsFilterView::selectSomething() { - QListViewItem * item = firstChild(); + Q3ListViewItem * item = firstChild(); if ( item ) setSelected( item, true ); @@ -168,7 +168,7 @@ void -YQPkgRpmGroupTagsFilterView::slotSelectionChanged( QListViewItem * newSelection ) +YQPkgRpmGroupTagsFilterView::slotSelectionChanged( Q3ListViewItem * newSelection ) { YQPkgRpmGroupTag * sel = dynamic_cast( newSelection ); @@ -218,7 +218,7 @@ YQPkgRpmGroupTag * YQPkgRpmGroupTagsFilterView::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; @@ -233,7 +233,7 @@ YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, YStringTreeItem * rpmGroup ) - : QListViewItem( parentFilterView ) + : Q3ListViewItem( parentFilterView ) , _filterView( parentFilterView ) , _rpmGroup( rpmGroup ) { @@ -244,7 +244,7 @@ YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, YQPkgRpmGroupTag * parentGroupTag, YStringTreeItem * rpmGroup ) - : QListViewItem( parentGroupTag ) + : Q3ListViewItem( parentGroupTag ) , _filterView( parentFilterView ) , _rpmGroup( rpmGroup ) { @@ -255,7 +255,7 @@ YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, const QString & rpmGroupName, YStringTreeItem * rpmGroup ) - : QListViewItem( parentFilterView ) + : Q3ListViewItem( parentFilterView ) , _filterView( parentFilterView ) , _rpmGroup( rpmGroup ) { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h Thu Jul 26 15:47:28 2007 @@ -22,7 +22,7 @@ #define YQPkgRpmGroupTagsFilterView_h #include "YQZypp.h" -#include +#include #include @@ -36,7 +36,7 @@ * signals if any group tag is selected so a package list can be filled or * updated. **/ -class YQPkgRpmGroupTagsFilterView : public QListView +class YQPkgRpmGroupTagsFilterView : public Q3ListView { Q_OBJECT @@ -126,7 +126,7 @@ /** * Update _selectedRpmGroup and filter data **/ - void slotSelectionChanged( QListViewItem * newSelection ); + void slotSelectionChanged( Q3ListViewItem * newSelection ); protected: @@ -156,7 +156,7 @@ -class YQPkgRpmGroupTag: public QListViewItem +class YQPkgRpmGroupTag: public Q3ListViewItem { public: Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.cc Thu Jul 26 15:47:28 2007 @@ -24,10 +24,11 @@ #include #include #include -#include -#include -#include +#include +#include #include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include @@ -47,7 +48,7 @@ YQPkgSearchFilterView::YQPkgSearchFilterView( QWidget * parent ) - : QVBox( parent ) + : Q3VBox( parent ) { _matchCount = 0; setMargin( MARGIN ); @@ -57,25 +58,25 @@ // Headline QLabel * label = new QLabel( _( "Searc&h:" ), this ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setFont( YQUI::ui()->headingFont() ); // Input field ( combo box ) for search text _searchText = new QComboBox( this ); - CHECK_PTR( _searchText ); + Q_CHECK_PTR( _searchText ); _searchText->setEditable( true ); label->setBuddy( _searchText ); // Box for search button - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); addHStretch( hbox ); // Search button _searchButton = new QPushButton( _( "&Search" ), hbox ); - CHECK_PTR( _searchButton ); + Q_CHECK_PTR( _searchButton ); connect( _searchButton, SIGNAL( clicked() ), this, SLOT ( filter() ) ); @@ -86,19 +87,19 @@ // Where to search // - QVGroupBox * gbox = new QVGroupBox( _( "Search in" ), this ); - CHECK_PTR( gbox ); + Q3VGroupBox * gbox = new Q3VGroupBox( _( "Search in" ), this ); + Q_CHECK_PTR( gbox ); - _searchInName = new QCheckBox( _( "&Name" ), gbox ); CHECK_PTR( _searchInName ); - _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); CHECK_PTR( _searchInSummary ); - _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); CHECK_PTR( _searchInDescription ); + _searchInName = new QCheckBox( _( "&Name" ), gbox ); Q_CHECK_PTR( _searchInName ); + _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); Q_CHECK_PTR( _searchInSummary ); + _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); Q_CHECK_PTR( _searchInDescription ); addVStretch( gbox ); // Intentionally NOT marking RPM tags for translation - _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); CHECK_PTR( _searchInProvides ); - _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); CHECK_PTR( _searchInRequires ); + _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); Q_CHECK_PTR( _searchInProvides ); + _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); Q_CHECK_PTR( _searchInRequires ); _searchInName->setChecked( true ); _searchInSummary->setChecked( true ); @@ -111,10 +112,10 @@ // label = new QLabel( _( "Search &Mode:" ), this ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); _searchMode = new QComboBox( this ); - CHECK_PTR( _searchMode ); + Q_CHECK_PTR( _searchMode ); _searchMode->setEditable( false ); label->setBuddy( _searchMode ); @@ -132,7 +133,7 @@ addVStretch( this ); _caseSensitive = new QCheckBox( _( "Case Sensiti&ve" ), this ); - CHECK_PTR( _caseSensitive ); + Q_CHECK_PTR( _caseSensitive ); for ( int i=0; i < 6; i++ ) addVStretch( this ); @@ -162,7 +163,7 @@ } - QVBox::keyPressEvent( event ); + Q3VBox::keyPressEvent( event ); } @@ -199,7 +200,7 @@ // Create a progress dialog that is only displayed if the search takes // longer than a couple of seconds ( default: 4 ). - QProgressDialog progress( _( "Searching..." ), // text + Q3ProgressDialog progress( _( "Searching..." ), // text _( "&Cancel" ), // cancelButtonLabel #ifdef FIXME Y2PM::packageManager().size(), // totalSteps @@ -212,7 +213,7 @@ progress.setMinimumDuration( 2000 ); // millisec QTime timer; - QRegExp regexp = _searchText->currentText(); + QRegExp regexp( _searchText->currentText() ); regexp.setCaseSensitive( _caseSensitive->isChecked() ); regexp.setWildcard( _searchMode->currentItem() == UseWildcards ); @@ -266,7 +267,7 @@ YQPkgSearchFilterView::check( ZyppSel selectable, ZyppObj zyppObj ) { - QRegExp regexp = _searchText->currentText(); + QRegExp regexp( _searchText->currentText() ); regexp.setCaseSensitive( _caseSensitive->isChecked() ); regexp.setWildcard( _searchMode->currentItem() == UseWildcards ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSearchFilterView.h Thu Jul 26 15:47:28 2007 @@ -22,8 +22,10 @@ #define YQPkgSearchFilterView_h #include "YQZypp.h" -#include +#include #include +//Added by qt3to4: +#include class QComboBox; @@ -38,7 +40,7 @@ /** * @short Filter view for searching within packages **/ -class YQPkgSearchFilterView : public QVBox +class YQPkgSearchFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelDescriptionView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelDescriptionView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelDescriptionView.cc Thu Jul 26 15:47:28 2007 @@ -95,7 +95,7 @@ icon.replace( ' ', '_' ); } - if ( icon ) + if ( ! icon.isEmpty() ) { if ( icon.startsWith( "./" ) ) icon.replace( QRegExp( "^\\./" ), "" ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.cc Thu Jul 26 15:47:28 2007 @@ -46,7 +46,7 @@ if ( autoFilter ) { - connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), + connect( this, SIGNAL( selectionChanged( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); } @@ -158,7 +158,7 @@ YQPkgSelListItem * YQPkgSelList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; @@ -214,7 +214,7 @@ * +1 if this > other **/ int -YQPkgSelListItem::compare( QListViewItem * otherListViewItem, +YQPkgSelListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgSelList.h Thu Jul 26 15:47:28 2007 @@ -145,7 +145,7 @@ * Reimplemented from QListViewItem: * Sort by zypp::Selection::order() only. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.cc Thu Jul 26 15:47:28 2007 @@ -22,7 +22,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include @@ -40,7 +42,7 @@ YQPkgStatusFilterView::YQPkgStatusFilterView( QWidget * parent ) - : QVBox( parent ) + : Q3VBox( parent ) { setMargin( MARGIN ); setSpacing( SPACING ); @@ -50,7 +52,7 @@ #if 0 // Headline QLabel * label = new QLabel( _( "Changes Overview" ), this ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setFont( YQUI::ui()->headingFont() ); #endif @@ -59,8 +61,8 @@ // Packages with what status to show // - QGroupBox * gbox = new QGroupBox( 3, Qt::Horizontal, _( "Show packages with status" ), this ); - CHECK_PTR( gbox ); + Q3GroupBox * gbox = new Q3GroupBox( 3, Qt::Horizontal, _( "Show packages with status" ), this ); + Q_CHECK_PTR( gbox ); _showDel = addStatusCheckBox( gbox, _( "Delete" ), YQIconPool::disabledPkgDel(), true ); _showInstall = addStatusCheckBox( gbox, _( "Install" ), YQIconPool::disabledPkgInstall(), true ); @@ -82,14 +84,14 @@ // Box for refresh button - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); addHStretch( hbox ); // Refresh button _refreshButton = new QPushButton( _( "&Refresh List" ), hbox ); - CHECK_PTR( _refreshButton ); + Q_CHECK_PTR( _refreshButton ); addHStretch( hbox ); connect( _refreshButton, SIGNAL( clicked() ), @@ -114,11 +116,11 @@ bool initiallyChecked ) { QCheckBox * checkBox = new QCheckBox( text, parent ); - CHECK_PTR( checkBox ); + Q_CHECK_PTR( checkBox ); checkBox->setChecked( initiallyChecked ); QLabel * label = new QLabel( parent ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setPixmap( icon ); addHStretch( parent ); Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgStatusFilterView.h Thu Jul 26 15:47:28 2007 @@ -22,8 +22,10 @@ #define YQPkgStatusFilterView_h #include "YQZypp.h" -#include +#include #include +//Added by qt3to4: +#include class QComboBox; @@ -34,7 +36,7 @@ /** * @short Filter view for packages that made problems during update **/ -class YQPkgStatusFilterView : public QVBox +class YQPkgStatusFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTechnicalDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTechnicalDetailsView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTechnicalDetailsView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTechnicalDetailsView.cc Thu Jul 26 15:47:28 2007 @@ -24,6 +24,8 @@ #include "YQPkgTechnicalDetailsView.h" #include "YQi18n.h" #include "utf8.h" +//Added by qt3to4: +#include using std::list; using std::string; @@ -100,15 +102,13 @@ QString YQPkgTechnicalDetailsView::formatRpmGroup( ZyppPkg pkg ) const { - QStringList groups = QStringList::split( '/', // delimiter - fromUTF8( pkg->group() ), - false ); // allow empties + QStringList groups = fromUTF8( pkg->group() ).split( '/', QString::KeepEmptyParts ); // Translate group path components QStringList translated; - for ( QValueList<QString>::const_iterator it = groups.begin(); + for ( QStringList::const_iterator it = groups.begin(); it != groups.end(); ++it ) { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.cc Thu Jul 26 15:47:28 2007 @@ -23,11 +23,15 @@ #include -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include #include "YQPkgTextDialog.h" @@ -78,14 +82,14 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); - CHECK_PTR( layout ); + Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + Q_CHECK_PTR( layout ); // Text browser - _textBrowser = new QTextBrowser( this ); - CHECK_PTR( _textBrowser ); + _textBrowser = new Q3TextBrowser( this ); + Q_CHECK_PTR( _textBrowser ); layout->addWidget( _textBrowser ); layout->addSpacing(8); _textBrowser->setText( text ); @@ -95,8 +99,8 @@ // Button box - QHBox * buttonBox = new QHBox( this ); - CHECK_PTR( buttonBox ); + Q3HBox * buttonBox = new Q3HBox( this ); + Q_CHECK_PTR( buttonBox ); buttonBox->setSpacing( SPACING ); buttonBox->setMargin ( MARGIN ); layout->addWidget( buttonBox ); @@ -106,7 +110,7 @@ // Accept (OK) button _acceptButton = new QPushButton( acceptButtonLabel, buttonBox ); - CHECK_PTR( _acceptButton ); + Q_CHECK_PTR( _acceptButton ); _acceptButton->setDefault( true ); connect( _acceptButton, SIGNAL( clicked() ), @@ -119,7 +123,7 @@ // Reject (Cancel) button _rejectButton = new QPushButton( rejectButtonLabel, buttonBox ); - CHECK_PTR( _rejectButton ); + Q_CHECK_PTR( _rejectButton ); _rejectButton->setDefault( true ); connect( _rejectButton, SIGNAL( clicked() ), @@ -150,13 +154,13 @@ if ( keyEvent ) { - if ( keyEvent->key() == Key_Return || - keyEvent->key() == Key_Enter ) + if ( keyEvent->key() == Qt::Key_Return || + keyEvent->key() == Qt::Key_Enter ) { _acceptButton->animateClick(); return true; // Stop event processing } - else if ( keyEvent->key() == Key_Escape ) + else if ( keyEvent->key() == Qt::Key_Escape ) { if ( _rejectButton ) { @@ -193,7 +197,7 @@ void YQPkgTextDialog::showText( QWidget * parent, const QString & text ) { YQPkgTextDialog * dia = new YQPkgTextDialog( text, parent ); - CHECK_PTR( dia ); + Q_CHECK_PTR( dia ); dia->exec(); delete dia; } @@ -216,7 +220,7 @@ parent, acceptButtonLabel, rejectButtonLabel ); - CHECK_PTR( dia ); + Q_CHECK_PTR( dia ); bool confirmed = ( dia->exec() == QDialog::Accepted ); delete dia; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgTextDialog.h Thu Jul 26 15:47:28 2007 @@ -23,10 +23,12 @@ #include "YQZypp.h" #include +//Added by qt3to4: +#include #include class QPushButton; -class QTextBrowser; +class Q3TextBrowser; using std::string; @@ -174,7 +176,7 @@ QPushButton * _acceptButton; QPushButton * _rejectButton; - QTextBrowser * _textBrowser; + Q3TextBrowser * _textBrowser; }; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.cc Thu Jul 26 15:47:28 2007 @@ -33,13 +33,13 @@ YQPkgUpdateProblemFilterView::YQPkgUpdateProblemFilterView( QWidget * parent ) - : QTextBrowser( parent ) + : Q3TextBrowser( parent ) { QString html = _( "\ <br>\n\ <h2>Update Problem</h2>\n\ <p>\n\ -<font color=blue>\n\ +<font color=Qt::blue>\n\ The packages in this list cannot be updated automatically.\n\ </font>\n\ </p>\n\ Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgUpdateProblemFilterView.h Thu Jul 26 15:47:28 2007 @@ -23,14 +23,14 @@ #include "YQZypp.h" -#include +#include #include "YQPkgSelMapper.h" /** * @short Filter view for packages that made problems during update **/ -class YQPkgUpdateProblemFilterView : public QTextBrowser +class YQPkgUpdateProblemFilterView : public Q3TextBrowser { Q_OBJECT Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.cc Thu Jul 26 15:47:28 2007 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "YQPkgVersionsView.h" #include "YQPkgRepoList.h" @@ -117,8 +117,8 @@ return; QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str(), - QCheckListItem::Controller, true ); - CHECK_PTR( root ); + Q3CheckListItem::Controller, true ); + Q_CHECK_PTR( root ); root->setOpen( true ); bool installedIsAvailable = false; @@ -156,7 +156,7 @@ if ( ! firstChild() || ! _selectable ) return; - QListViewItem * item = firstChild()->firstChild(); + Q3ListViewItem * item = firstChild()->firstChild(); while ( item ) { @@ -238,8 +238,8 @@ bool enabled ) : QY2CheckListItem( parent, "", enabled ? - QCheckListItem::RadioButton : - QCheckListItem::Controller ) // cheap way to make it read-only + Q3CheckListItem::RadioButton : + Q3CheckListItem::Controller ) // cheap way to make it read-only , _pkgVersionList( pkgVersionList ) , _selectable( selectable ) , _zyppObj( zyppObj ) @@ -248,13 +248,13 @@ if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); - if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); + if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); if ( productCol() >= 0 ) { ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() ); if ( product ) - setText( productCol(), product->summary() ); + setText( productCol(), fromUTF8( product->summary() ) ); } if ( urlCol() >= 0 ) { @@ -305,7 +305,7 @@ * +1 if this > other **/ int -YQPkgVersion::compare( QListViewItem * otherListViewItem, +YQPkgVersion::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQPkgVersionsView.h Thu Jul 26 15:47:28 2007 @@ -168,7 +168,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.cc?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.cc Thu Jul 26 15:47:28 2007 @@ -19,8 +19,8 @@ /-*/ #include -#include -#include +#include +#include #include #include @@ -94,23 +94,23 @@ void YQSimplePatchSelector::basicLayout() { - QSplitter * splitter = new QSplitter( QSplitter::Vertical, this ); - CHECK_PTR( splitter ); + QSplitter * splitter = new QSplitter( Qt::Vertical, this ); + Q_CHECK_PTR( splitter ); splitter->setMargin( MARGIN ); // // PatchFilterView // - QVBox * upper_vbox = new QVBox( splitter ); - CHECK_PTR( upper_vbox ); + Q3VBox * upper_vbox = new Q3VBox( splitter ); + Q_CHECK_PTR( upper_vbox ); splitter->setResizeMode( upper_vbox, QSplitter::Stretch ); _patchFilterView = new YQPkgPatchFilterView( upper_vbox ); - CHECK_PTR( _patchFilterView ); + Q_CHECK_PTR( _patchFilterView ); _patchList = _patchFilterView->patchList(); - CHECK_PTR( _patchList ); + Q_CHECK_PTR( _patchList ); addVSpacing( upper_vbox, MARGIN ); @@ -120,12 +120,12 @@ #if SHOW_DISK_USAGE - QVBox * lower_vbox = new QVBox( splitter ); - CHECK_PTR( lower_vbox ); + Q3VBox * lower_vbox = new Q3VBox( splitter ); + Q_CHECK_PTR( lower_vbox ); addVSpacing( lower_vbox, MARGIN ); _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); - CHECK_PTR( _diskUsageList ); + Q_CHECK_PTR( _diskUsageList ); splitter->setResizeMode( lower_vbox, QSplitter::FollowSizeHint ); #endif @@ -143,11 +143,11 @@ addVSpacing( this, SPACING ); - QHBox * hbox = new QHBox( this ); - CHECK_PTR( hbox ); + Q3HBox * hbox = new Q3HBox( this ); + Q_CHECK_PTR( hbox ); QPushButton * details_button = new QPushButton( _( "&Details..." ), hbox ); - CHECK_PTR( details_button ); + Q_CHECK_PTR( details_button ); connect( details_button, SIGNAL( clicked() ), this, SLOT ( detailedPackageSelection() ) ); @@ -164,14 +164,14 @@ void YQSimplePatchSelector::layoutButtons( QWidget * parent ) { - QHBox * button_box = new QHBox( parent ); - CHECK_PTR( button_box ); + Q3HBox * button_box = new Q3HBox( parent ); + Q_CHECK_PTR( button_box ); button_box->setMargin ( MARGIN ); button_box->setSpacing( SPACING ); QPushButton * details_button = new QPushButton( _( "&Details..." ), button_box ); - CHECK_PTR( details_button ); + Q_CHECK_PTR( details_button ); details_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( details_button, SIGNAL( clicked() ), @@ -181,7 +181,7 @@ addHStretch( button_box ); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); - CHECK_PTR( cancel_button ); + Q_CHECK_PTR( cancel_button ); cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( cancel_button, SIGNAL( clicked() ), @@ -189,7 +189,7 @@ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box ); - CHECK_PTR( accept_button ); + Q_CHECK_PTR( accept_button ); accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( accept_button, SIGNAL( clicked() ), Modified: branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.h (original) +++ branches/tmp/sh/qt4-port/qt/src/pkg/YQSimplePatchSelector.h Thu Jul 26 15:47:28 2007 @@ -20,7 +20,7 @@ #ifndef YQSimplePatchSelector_h #define YQSimplePatchSelector_h -#include +#include #include #include Modified: branches/tmp/sh/qt4-port/qt/src/utf8.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/utf8.h?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/utf8.h (original) +++ branches/tmp/sh/qt4-port/qt/src/utf8.h Thu Jul 26 15:47:28 2007 @@ -24,16 +24,19 @@ #include #include <string> -inline QString fromUTF8(const string &str) + +inline QString fromUTF8( const std::string & str ) { return QString::fromUtf8(str.c_str() ); } -inline string toUTF8(const QString &str) +inline std::string toUTF8( const QString & str ) { - QCString result = str.isEmpty() ? QCString("") : str.utf8(); - return string(result.data() ); + if ( str.isEmpty() ) + return std::string( "" ); + else + return std::string( str.utf8().data() ); } #endif // utf8_h Modified: branches/tmp/sh/qt4-port/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/yast2-qt.spec.in?rev=39717&r1=39716&r2=39717&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/yast2-qt.spec.in (original) +++ branches/tmp/sh/qt4-port/qt/yast2-qt.spec.in Thu Jul 26 15:47:28 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: dbus-1-devel boost-devel libzypp-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel +BuildRequires: dbus-1-devel boost-devel libzypp-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4 libqt4-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel Summary: - BuildRequires: yast2-core-devel >= 2.15.6 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org