[yast-commit] r42380 - in /branches/tmp/coolo/qt4-port: ./ src/ src/pkg/

Author: coolo Date: Mon Nov 26 11:13:17 2007 New Revision: 42380 URL: http://svn.opensuse.org/viewcvs/yast?rev=42380&view=rev Log: picking up branches/tmp/sh/qt4-port/, merging it with trunk and making it work Modified: branches/tmp/coolo/qt4-port/Makefile.cvs branches/tmp/coolo/qt4-port/acinclude.m4 branches/tmp/coolo/qt4-port/configure.in.in branches/tmp/coolo/qt4-port/src/Makefile.am branches/tmp/coolo/qt4-port/src/QY2CharValidator.cc branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.h branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h branches/tmp/coolo/qt4-port/src/QY2LayoutUtils.cc branches/tmp/coolo/qt4-port/src/QY2ListView.cc branches/tmp/coolo/qt4-port/src/QY2ListView.h branches/tmp/coolo/qt4-port/src/QY2Settings.cc branches/tmp/coolo/qt4-port/src/QY2Settings.h branches/tmp/coolo/qt4-port/src/YQApplication.cc branches/tmp/coolo/qt4-port/src/YQApplication.h branches/tmp/coolo/qt4-port/src/YQBarGraph.cc branches/tmp/coolo/qt4-port/src/YQCheckBox.cc branches/tmp/coolo/qt4-port/src/YQCheckBox.h branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.h branches/tmp/coolo/qt4-port/src/YQComboBox.cc branches/tmp/coolo/qt4-port/src/YQComboBox.h branches/tmp/coolo/qt4-port/src/YQDateField.cc branches/tmp/coolo/qt4-port/src/YQDateField.h branches/tmp/coolo/qt4-port/src/YQDialog.cc branches/tmp/coolo/qt4-port/src/YQDialog.h branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc branches/tmp/coolo/qt4-port/src/YQDownloadProgress.h branches/tmp/coolo/qt4-port/src/YQDumbTab.cc branches/tmp/coolo/qt4-port/src/YQFrame.cc branches/tmp/coolo/qt4-port/src/YQFrame.h branches/tmp/coolo/qt4-port/src/YQGenericButton.cc branches/tmp/coolo/qt4-port/src/YQIconPool.cc branches/tmp/coolo/qt4-port/src/YQIconPool.h branches/tmp/coolo/qt4-port/src/YQImage.cc branches/tmp/coolo/qt4-port/src/YQInputField.cc branches/tmp/coolo/qt4-port/src/YQInputField.h branches/tmp/coolo/qt4-port/src/YQIntField.cc branches/tmp/coolo/qt4-port/src/YQIntField.h branches/tmp/coolo/qt4-port/src/YQLabel.cc branches/tmp/coolo/qt4-port/src/YQLogView.cc branches/tmp/coolo/qt4-port/src/YQLogView.h branches/tmp/coolo/qt4-port/src/YQMenuButton.cc branches/tmp/coolo/qt4-port/src/YQMenuButton.h branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.h branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.h branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h branches/tmp/coolo/qt4-port/src/YQProgressBar.cc branches/tmp/coolo/qt4-port/src/YQProgressBar.h branches/tmp/coolo/qt4-port/src/YQPushButton.cc branches/tmp/coolo/qt4-port/src/YQRadioButton.cc branches/tmp/coolo/qt4-port/src/YQRadioButton.h branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h branches/tmp/coolo/qt4-port/src/YQRichText.cc branches/tmp/coolo/qt4-port/src/YQRichText.h branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQSelectionBox.h branches/tmp/coolo/qt4-port/src/YQSlider.cc branches/tmp/coolo/qt4-port/src/YQSlider.h branches/tmp/coolo/qt4-port/src/YQTable.cc branches/tmp/coolo/qt4-port/src/YQTable.h branches/tmp/coolo/qt4-port/src/YQTimeField.cc branches/tmp/coolo/qt4-port/src/YQTimeField.h branches/tmp/coolo/qt4-port/src/YQTree.cc branches/tmp/coolo/qt4-port/src/YQTree.h branches/tmp/coolo/qt4-port/src/YQUI.h branches/tmp/coolo/qt4-port/src/YQUIComponent.h branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc branches/tmp/coolo/qt4-port/src/YQUI_x11.cc branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc branches/tmp/coolo/qt4-port/src/YQWizard.cc branches/tmp/coolo/qt4-port/src/YQWizard.h branches/tmp/coolo/qt4-port/src/YQWizardButton.cc branches/tmp/coolo/qt4-port/src/pkg/Makefile.am branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.cc branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgChangesDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageWarningDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgLangList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgProductDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelDescriptionView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgTechnicalDetailsView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.cc branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.h branches/tmp/coolo/qt4-port/src/utf8.h branches/tmp/coolo/qt4-port/yast2-qt.spec.in Modified: branches/tmp/coolo/qt4-port/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/Makefile.cvs?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/Makefile.cvs (original) +++ branches/tmp/coolo/qt4-port/Makefile.cvs Mon Nov 26 11:13:17 2007 @@ -7,7 +7,7 @@ PREFIX = /usr configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: branches/tmp/coolo/qt4-port/acinclude.m4 URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/acinclude.m4?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/acinclude.m4 (original) +++ branches/tmp/coolo/qt4-port/acinclude.m4 Mon Nov 26 11:13:17 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/coolo/qt4-port/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/configure.in.in?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/configure.in.in (original) +++ branches/tmp/coolo/qt4-port/configure.in.in Mon Nov 26 11:13:17 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/coolo/qt4-port/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/Makefile.am?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/Makefile.am (original) +++ branches/tmp/coolo/qt4-port/src/Makefile.am Mon Nov 26 11:13:17 2007 @@ -2,22 +2,19 @@ # Makefile.am for qt/src # -SUBDIRS = pkg +# 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,8 +28,7 @@ libpy2qt_la_LIBADD = \ -L$(plugindir) -lpy2UI \ - -L$(QTLIBDIR) -lqt-mt \ - -lX11 -lXext -lSM -lICE + -L$(QTLIBDIR) -lQtGui -lQt3Support # libpy2qt_la_LIBADD = \ # -Lpkg -ly2qt_pkg \ @@ -66,11 +62,11 @@ YQBarGraph.cc \ YQCheckBox.cc \ YQCheckBoxFrame.cc \ + \ YQComboBox.cc \ YQDateField.cc \ YQDialog.cc \ YQDownloadProgress.cc \ - YQDumbTab.cc \ YQEBunny.cc \ YQEmpty.cc \ YQFrame.cc \ @@ -80,25 +76,19 @@ YQIntField.cc \ YQLabel.cc \ YQLayoutBox.cc \ - YQLogView.cc \ YQMenuButton.cc \ - YQMultiLineEdit.cc \ YQMultiProgressMeter.cc \ - YQMultiSelectionBox.cc \ YQPartitionSplitter.cc \ YQProgressBar.cc \ YQPushButton.cc \ YQRadioButton.cc \ YQRadioButtonGroup.cc \ YQReplacePoint.cc \ - YQRichText.cc \ YQSelectionBox.cc \ YQSlider.cc \ YQSpacing.cc \ YQSquash.cc \ - YQTable.cc \ YQTimeField.cc \ - YQTree.cc \ YQWizard.cc \ YQWizardButton.cc \ \ @@ -108,10 +98,15 @@ QY2CharValidator.cc \ QY2ListView.cc \ QY2Settings.cc \ - QY2LayoutUtils.cc - - - + QY2LayoutUtils.cc \ + \ + YQTable.cc \ + YQTree.cc \ + YQLogView.cc \ + YQMultiLineEdit.cc \ + YQDumbTab.cc \ + YQMultiSelectionBox.cc \ + YQRichText.cc # Note: QY2LayoutUtils and QY2Settings don't need any .moc file: No QObjects @@ -276,4 +271,4 @@ CLEANFILES = *.moc -INCLUDES = -I$(srcdir)/pkg -I$(QTDIR)/include -I$(includedir) -I$(includedir)/yui +INCLUDES = -I$(srcdir)/pkg `pkg-config --cflags QtGui` `pkg-config --cflags QtCore` `pkg-config --cflags Qt3Support` -I$(includedir) -I$(includedir)/yui Modified: branches/tmp/coolo/qt4-port/src/QY2CharValidator.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2CharValidator.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2CharValidator.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2CharValidator.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/QY2ComboTabWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/QY2ComboTabWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.h (original) +++ branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.h Mon Nov 26 11:13:17 2007 @@ -22,13 +22,13 @@ #ifndef QY2ComboTabWidget_h #define QY2ComboTabWidget_h -#include +#include #include -#include +#include class QComboBox; class QLabel; -class QWidgetStack; +class Q3WidgetStack; class QWidget; @@ -36,7 +36,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 @@ -95,8 +95,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/coolo/qt4-port/src/QY2DiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/QY2DiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h (original) +++ branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h Mon Nov 26 11:13:17 2007 @@ -177,7 +177,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. @@ -193,7 +193,7 @@ * * Reimplemented from QY2ListViewItem. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/coolo/qt4-port/src/QY2LayoutUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2LayoutUtils.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2LayoutUtils.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2LayoutUtils.cc Mon Nov 26 11:13:17 2007 @@ -21,6 +21,7 @@ #include #include +#include <QDesktopWidget> #include "QY2LayoutUtils.h" @@ -45,7 +46,7 @@ QWidget * addVSpacing( QWidget * parent, int height ) { QWidget * spacer = new QWidget( parent ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); spacer->setFixedHeight( height ); return spacer; @@ -55,7 +56,7 @@ QWidget * addHSpacing( QWidget * parent, int width ) { QWidget * spacer = new QWidget( parent ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); spacer->setFixedWidth( width ); return spacer; @@ -72,7 +73,7 @@ QSize limitToScreenSize( const QWidget * widget, const QSize & desiredSize ) { - QSize availableSize = qApp->desktop()->availableGeometry( const_cast (widget) ).size(); + QSize availableSize = QApplication::desktop()->availableGeometry( const_cast (widget) ).size(); // Subtract WM decorations. There seems to be no reliable way to tell if // this is necessary at all (even fvwm2 claims it is a NETWM compliant Modified: branches/tmp/coolo/qt4-port/src/QY2ListView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2ListView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2ListView.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2ListView.cc Mon Nov 26 11:13:17 2007 @@ -20,23 +20,26 @@ #include -#include - +#include +#include <QMouseEvent> #include "QY2ListView.h" QY2ListView::QY2ListView( QWidget * parent ) - : QListView( parent ) + : Q3ListView( parent ) , _mousePressedItem(0) , _mousePressedCol( -1 ) - , _mousePressedButton( NoButton ) + , _mousePressedButton( Qt::NoButton ) , _sortByInsertionSequence( false ) , _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 ); @@ -48,15 +51,17 @@ QY2ListView::~QY2ListView() { +#if FIXME_TOOLTIP if ( _toolTip ) delete _toolTip; +#endif } void QY2ListView::selectSomething() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -76,7 +81,7 @@ void QY2ListView::clear() { - QListView::clear(); + Q3ListView::clear(); restoreColumnWidths(); } @@ -84,7 +89,7 @@ void QY2ListView::updateItemStates() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -101,7 +106,7 @@ void QY2ListView::updateItemData() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -116,7 +121,7 @@ QString -QY2ListView::toolTip( QListViewItem * listViewItem, int column ) +QY2ListView::toolTip( Q3ListViewItem * listViewItem, int column ) { if ( ! listViewItem ) return QString::null; @@ -177,7 +182,7 @@ void QY2ListView::contentsMousePressEvent( QMouseEvent * ev ) { - QListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); + Q3ListViewItem * item = itemAt( contentsToViewport( ev->pos() ) ); if ( item && item->isEnabled() ) { @@ -193,14 +198,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 ) { @@ -219,17 +224,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() ) { @@ -241,10 +246,10 @@ _mousePressedItem = 0; _mousePressedCol = -1; - _mousePressedButton = NoButton; + _mousePressedButton = Qt::NoButton; // Call base class method - QListView::contentsMouseDoubleClickEvent( ev ); + Q3ListView::contentsMouseDoubleClickEvent( ev ); } @@ -300,7 +305,7 @@ } } - return QListView::eventFilter( obj, event ); + return Q3ListView::eventFilter( obj, event ); } @@ -325,15 +330,15 @@ QY2ListViewItem::QY2ListViewItem( QY2ListView * parentListView, const QString & text ) - : QListViewItem( parentListView, text ) + : Q3ListViewItem( parentListView, text ) { _serial = parentListView->nextSerial(); } -QY2ListViewItem::QY2ListViewItem( QListViewItem * parentItem, +QY2ListViewItem::QY2ListViewItem( Q3ListViewItem * parentItem, const QString & text ) - : QListViewItem( parentItem, text ) + : Q3ListViewItem( parentItem, text ) { _serial = 0; @@ -358,7 +363,7 @@ * +1 if this > other **/ int -QY2ListViewItem::compare( QListViewItem * otherListViewItem, +QY2ListViewItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -392,7 +397,7 @@ } - return QListViewItem::compare( otherListViewItem, col, ascending ); + return Q3ListViewItem::compare( otherListViewItem, col, ascending ); } @@ -408,7 +413,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 ); } @@ -418,17 +423,17 @@ QY2CheckListItem::QY2CheckListItem( QY2ListView * parentListView, const QString & text, - QCheckListItem::Type type ) - : QCheckListItem( parentListView, text, type ) + Q3CheckListItem::Type type ) + : Q3CheckListItem( parentListView, text, type ) { _serial = parentListView->nextSerial(); } -QY2CheckListItem::QY2CheckListItem( QListViewItem * parentItem, +QY2CheckListItem::QY2CheckListItem( Q3ListViewItem * parentItem, const QString & text, - QCheckListItem::Type type ) - : QCheckListItem( parentItem, text, type ) + Q3CheckListItem::Type type ) + : Q3CheckListItem( parentItem, text, type ) { _serial = 0; QY2ListView * parentListView = dynamic_cast ( listView() ); @@ -438,10 +443,10 @@ } -QY2CheckListItem::QY2CheckListItem( QCheckListItem * parentItem, +QY2CheckListItem::QY2CheckListItem( Q3CheckListItem * parentItem, const QString & text, - QCheckListItem::Type type ) - : QCheckListItem( parentItem, text, type ) + Q3CheckListItem::Type type ) + : Q3CheckListItem( parentItem, text, type ) { _serial = 0; QY2ListView * parentListView = dynamic_cast ( listView() ); @@ -465,7 +470,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/coolo/qt4-port/src/QY2ListView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2ListView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2ListView.h (original) +++ branches/tmp/coolo/qt4-port/src/QY2ListView.h Mon Nov 26 11:13:17 2007 @@ -22,21 +22,23 @@ #ifndef QY2ListView_h #define QY2ListView_h -#include +#include #include #include #include #include <vector> +#define FIXME_TOOLTIP 0 + class QY2ListViewItem; class QY2ListViewToolTip; /** - * @short Enhanced QListView + * @short Enhanced Q3ListView **/ -class QY2ListView : public QListView +class QY2ListView : public Q3ListView { Q_OBJECT @@ -63,7 +65,7 @@ virtual void selectSomething(); /** - * Reimplemented from QListView: + * Reimplemented from Q3ListView: * Adjust header sizes after clearing contents. **/ virtual void clear(); @@ -100,7 +102,7 @@ * Emitted for mouse clicks on an item **/ void columnClicked ( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -108,7 +110,7 @@ * Emitted for mouse double clicks on an item **/ void columnDoubleClicked ( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -125,7 +127,7 @@ * * Derived classes may handle this differently. **/ - virtual QString toolTip( QListViewItem * item, int column ); + virtual QString toolTip( Q3ListViewItem * item, int column ); /** * Returns 'true' if the sort order should always be the item insertion @@ -192,7 +194,7 @@ // Data members // - QListViewItem * _mousePressedItem; + Q3ListViewItem * _mousePressedItem; int _mousePressedCol; int _mousePressedButton; @@ -208,9 +210,9 @@ /** - * Enhanced QListViewItem + * Enhanced Q3ListViewItem **/ -class QY2ListViewItem: public QListViewItem +class QY2ListViewItem: public Q3ListViewItem { public: @@ -224,7 +226,7 @@ /** * Constructor for deeper level items. **/ - QY2ListViewItem( QListViewItem * parentItem, + QY2ListViewItem( Q3ListViewItem * parentItem, const QString & text = QString::null ); /** @@ -255,9 +257,9 @@ * 0 if this == other * +1 if this > other * - * Reimplemented from QListViewItem + * Reimplemented from Q3ListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -293,10 +295,10 @@ protected: /** - * Paint method. Reimplemented from @ref QListViewItem so different + * Paint method. Reimplemented from @ref Q3ListViewItem so different * colors can be used. * - * Reimplemented from QListViewItem. + * Reimplemented from Q3ListViewItem. **/ virtual void paintCell( QPainter * painter, const QColorGroup & colorGroup, @@ -319,7 +321,7 @@ /** * Enhanced QCheckListItem **/ -class QY2CheckListItem: public QCheckListItem +class QY2CheckListItem: public Q3CheckListItem { public: @@ -328,23 +330,23 @@ **/ QY2CheckListItem( QY2ListView * parentListView, const QString & text, - QCheckListItem::Type type ); + Q3CheckListItem::Type type ); /** * Constructor for deeper level items. **/ - QY2CheckListItem( QListViewItem * parentItem, + QY2CheckListItem( Q3ListViewItem * parentItem, const QString & text, - QCheckListItem::Type type ); + Q3CheckListItem::Type type ); /** * Constructor for deeper level items for QCheckListItem parents. **/ - QY2CheckListItem( QCheckListItem * parentItem, + QY2CheckListItem( Q3CheckListItem * parentItem, const QString & text, - QCheckListItem::Type type ); + Q3CheckListItem::Type type ); /** * Destructor @@ -374,9 +376,9 @@ * 0 if this == other * +1 if this > other * - * Reimplemented from QListViewItem + * Reimplemented from Q3ListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -412,10 +414,10 @@ protected: /** - * Paint method. Reimplemented from @ref QListViewItem so different + * Paint method. Reimplemented from @ref Q3ListViewItem so different * colors can be used. * - * Reimplemented from QListViewItem. + * Reimplemented from Q3ListViewItem. **/ virtual void paintCell( QPainter * painter, const QColorGroup & colorGroup, @@ -434,6 +436,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 @@ -447,7 +450,8 @@ * Constructor. **/ QY2ListViewToolTip( QY2ListView * parent ) - : QToolTip( parent->viewport() ), _listView( parent ) {} + : QToolTip( parent->viewport() ) + , _listView( parent ) {} /** * Destructor (to make gcc 4.x happy) @@ -471,5 +475,6 @@ QY2ListView * _listView; }; +#endif #endif // ifndef QY2ListView_h Modified: branches/tmp/coolo/qt4-port/src/QY2Settings.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2Settings.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2Settings.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2Settings.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/QY2Settings.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2Settings.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2Settings.h (original) +++ branches/tmp/coolo/qt4-port/src/QY2Settings.h Mon Nov 26 11:13:17 2007 @@ -22,11 +22,11 @@ #ifndef QY2Settings_h #define QY2Settings_h -#include -#include -#include +#include +#include +#include #include -#include +#include /** * Utility class that handles program settings in .ini file format: @@ -215,7 +215,7 @@ QString _name; }; - + /** @@ -232,9 +232,9 @@ /** * 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; - - typedef QDictIterator<Section> SectionIterator; + Q3Dict<Section> _sections; + + typedef Q3DictIterator<Section> SectionIterator; }; #endif // QY2Settings_h Modified: branches/tmp/coolo/qt4-port/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQApplication.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQApplication.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQApplication.cc Mon Nov 26 11:13:17 2007 @@ -17,8 +17,8 @@ /-*/ -#include -#include +#include +#include #include #define y2log_component "qt-ui" @@ -40,10 +40,10 @@ , _autoHeadingFontSize( -1 ) { y2debug( "YQApplication constructor start" ); - + setIconBasePath( ICONDIR "/icons/22x22/apps/" ); loadPredefinedQtTranslations(); - + y2debug( "YQApplication constructor end" ); } @@ -89,7 +89,7 @@ if ( ! _qtTranslations ) _qtTranslations = new QTranslator(); - + _qtTranslations->load( transFile, path ); if ( _qtTranslations->isEmpty() ) @@ -135,7 +135,7 @@ if ( ! _langFonts ) { _langFonts = new QY2Settings( LANG_FONTS_FILE ); - CHECK_PTR( _langFonts ); + Q_CHECK_PTR( _langFonts ); if ( _langFonts->readError() ) y2error( "Error reading %s", (const char *) _langFonts->fileName() ); @@ -144,17 +144,17 @@ } QString lang = language.c_str(); - + if ( ! encoding.empty() ) lang += QString( "." ) + encoding.c_str(); - + QString key; if ( ! _langFonts->hasKey( fontKey( lang ) ) ) // Try with encoding ("zh_CN.UTF8" etc.) { lang = language.c_str(); // Try without encoding ("zh_CN") - if ( ! _langFonts->hasKey( fontKey( lang ) ) ) + if ( ! _langFonts->hasKey( fontKey( lang ) ) ) lang.replace( QRegExp( "_.*$" ), "" ); // Cut off trailing country ("_CN") } @@ -320,7 +320,7 @@ #endif int x = 800; int y = 600; - + int normal = 10; int heading = 12; @@ -368,7 +368,7 @@ _autoNormalFontSize, _autoHeadingFontSize ); } - + #include "YQApplication.moc" Modified: branches/tmp/coolo/qt4-port/src/YQApplication.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQApplication.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQApplication.h (original) +++ branches/tmp/coolo/qt4-port/src/YQApplication.h Mon Nov 26 11:13:17 2007 @@ -20,8 +20,8 @@ #ifndef YQApplication_h #define YQApplication_h -#include -#include +#include +#include #include #include "QY2Settings.h" @@ -31,11 +31,11 @@ class YQApplication: public QObject, public YApplication { Q_OBJECT - + protected: friend class YQUI; - + /** * Constructor. * @@ -48,9 +48,9 @@ **/ virtual ~YQApplication(); - + public: - + /** * Set language and encoding for the locale environment ($LANG). * @@ -66,7 +66,7 @@ **/ virtual void setLanguage( const string & language, const string & encoding = string() ); - + /** * Load translations for Qt's predefined dialogs like file selection box * etc. @@ -124,7 +124,7 @@ **/ void setAutoFonts( bool useAutoFonts ); - + protected: /** @@ -142,9 +142,9 @@ // // Data members // - + // Fonts - + QFont * _currentFont; QFont * _headingFont; QFont * _boldFont; @@ -171,7 +171,7 @@ int _autoNormalFontSize; int _autoHeadingFontSize; - + }; Modified: branches/tmp/coolo/qt4-port/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQBarGraph.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQBarGraph.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQBarGraph.cc Mon Nov 26 11:13:17 2007 @@ -87,7 +87,7 @@ segWidth = totalWidth - x_off + YQBarGraphOuterMargin; } - + // // Fill the segment // @@ -99,18 +99,18 @@ { // If any of the colors is undefined, use the next default color // for both so some contrast is ensured. - + segmentColor = defaultSegmentColor( nextDefaultColor ); textColor = defaultTextColor ( nextDefaultColor++ ); } - + painter->setBrush( QColor( segmentColor.red(), segmentColor.green(), segmentColor.blue() ) ); painter->setPen( Qt::NoPen ); painter->drawRect( x_off, y_off, segWidth+2, segHeight+2 ); - + // // Draw the label // @@ -119,16 +119,17 @@ painter->setPen( QColor( textColor.red(), textColor.green(), textColor.blue() ) ); - QString txt = seg.label(); + + QString txt = QString::fromStdString( seg.label() ); if ( txt.contains( "%1" ) ) txt = txt.arg( seg.value() ); // substitute variable - + painter->drawText( x_off + YQBarGraphLabelHorizontalMargin, y_off + YQBarGraphLabelVerticalMargin, segWidth - 2 * YQBarGraphLabelHorizontalMargin + 1, segHeight - 2 * YQBarGraphLabelVerticalMargin + 1, - AlignCenter, txt ); + Qt::AlignCenter, txt ); // Prepare for the next segment @@ -137,7 +138,7 @@ } -YColor +YColor YQBarGraph::defaultSegmentColor( unsigned index ) { switch( index % 8 ) @@ -161,7 +162,7 @@ { YColor black = YColor( 0, 0, 0 ); YColor white = YColor( 255, 255, 255 ); - + switch( index % 8 ) { case 0: return white; @@ -194,11 +195,11 @@ for ( int i=0; i < segments(); i++ ) { - QString txt = segment(i).label(); - + QString txt = QString::fromStdString( segment(i).label() ); + if ( txt.contains( "%1" ) ) txt = txt.arg( segment(i).value() ); - + QSize segSize = metrics.size( 0, txt ); width += segSize.width(); } @@ -220,11 +221,11 @@ for ( int i=0; i < segments(); i++ ) { - QString txt = segment(i).label(); - + QString txt = QString::fromStdString( segment(i).label() ); + if ( txt.contains( "%1" ) ) txt = txt.arg( segment(i).value() ); - + QSize segSize = metrics.size( 0, txt ); height = max( height, segSize.height() ); } Modified: branches/tmp/coolo/qt4-port/src/YQCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQCheckBox.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBox.cc Mon Nov 26 11:13:17 2007 @@ -18,7 +18,7 @@ #include -#include +#include #define y2log_component "qt-ui" #include @@ -35,7 +35,7 @@ YQCheckBox::YQCheckBox( YWidget * parent, const string & label, bool checked ) - : QGroupBox( (QWidget *) parent->widgetRep() ) + : Q3GroupBox( (QWidget *) parent->widgetRep() ) , YCheckBox( parent, label ) { setWidgetRep( this ); @@ -45,7 +45,7 @@ _qt_checkBox = new QCheckBox( fromUTF8( label ), this ); YUI_CHECK_NEW( _qt_checkBox ); - + layout->addSpacing( SPACING ); layout->addWidget( _qt_checkBox ); layout->addSpacing( SPACING ); @@ -66,11 +66,11 @@ YCheckBoxState YQCheckBox::value() { - switch ( _qt_checkBox->state() ) + switch ( _qt_checkBox->checkState() ) { - case QButton::On: return YCheckBox_on; - case QButton::Off: return YCheckBox_off; - case QButton::NoChange: return YCheckBox_dont_care; + case Qt::Checked: return YCheckBox_on; + case Qt::Unchecked: return YCheckBox_off; + case Qt::PartiallyChecked: return YCheckBox_dont_care; } return YCheckBox_off; @@ -112,7 +112,7 @@ _qt_checkBox->setFont( useBold ? YQUI::yqApp()->boldFont() : YQUI::yqApp()->currentFont() ); - + YCheckBox::setUseBoldFont( useBold ); } @@ -154,7 +154,7 @@ void YQCheckBox::stateChanged( int newState ) { // y2milestone( "new state: %d", newState ); - + if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); } Modified: branches/tmp/coolo/qt4-port/src/YQCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQCheckBox.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBox.h Mon Nov 26 11:13:17 2007 @@ -20,18 +20,18 @@ #ifndef YQCheckBox_h #define YQCheckBox_h -#include +#include <Q3GroupBox> #include "YCheckBox.h" class QCheckBox; -class YQCheckBox : public QGroupBox, public YCheckBox +class YQCheckBox : public Q3GroupBox, public YCheckBox { Q_OBJECT public: - + /** * Constructor. **/ @@ -56,7 +56,7 @@ * Reimplemented from YCheckBox. **/ virtual YCheckBoxState value(); - + /** * Set the CheckBox value (on/off/don't care). * @@ -113,7 +113,7 @@ **/ virtual bool setKeyboardFocus(); - + private slots: /** @@ -121,9 +121,9 @@ **/ void stateChanged ( int newState ); - + protected: - + QCheckBox * _qt_checkBox; }; Modified: branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc Mon Nov 26 11:13:17 2007 @@ -20,6 +20,10 @@ #define y2log_component "qt-ui" #include #include +//Added by qt3to4: +#include +#include <Q3GroupBox> +#include #include "YQUI.h" #include "YEvent.h" #include "utf8.h" @@ -41,7 +45,7 @@ QGroupBox::setTitle( fromUTF8( label ) ); QGroupBox::setCheckable( true ); preventQGroupBoxAutoEnablement(); - + setValue( checked ); } @@ -72,15 +76,15 @@ { if ( enabled ) { - QFrame::setEnabled( true ); + QGroupBox::setEnabled( true ); handleChildrenEnablement( value() ); } else { - QFrame::setEnabled( true ); + QGroupBox::setEnabled( true ); YWidget::setChildrenEnabled( false ); } - + YWidget::setEnabled( enabled ); } @@ -158,13 +162,16 @@ if ( hasChildren() ) { +#warning possibly this hack is not needed + /* int newChildWidth = max ( 0, newWidth - 2 * frameWidth() - 1 ); int newChildHeight = max ( 0, newHeight - frameWidth() - fontMetrics().height() - TOP_MARGIN - 1 ); firstChild()->setSize( newChildWidth, newChildHeight ); - + QWidget * qChild = (QWidget *) firstChild()->widgetRep(); qChild->move( frameWidth(), fontMetrics().height() + TOP_MARGIN ); + */ } } @@ -176,7 +183,7 @@ preferredWidth = max( childPreferredWidth, (10 + fontMetrics().width( title() ) ) ); - preferredWidth += 2*frameWidth() + 1; + // preferredWidth += 2*frameWidth() + 1; return preferredWidth; } @@ -185,15 +192,15 @@ int YQCheckBoxFrame::preferredHeight() { int preferredHeight = hasChildren() ? firstChild()->preferredHeight() : 0; - preferredHeight += frameWidth() + fontMetrics().height() + TOP_MARGIN + 1; - + // preferredHeight += frameWidth() + fontMetrics().height() + TOP_MARGIN + 1; + return preferredHeight; } bool YQCheckBoxFrame::setKeyboardFocus() { - QGroupBox::setFocus(); + setFocus(); return true; } Modified: branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.h (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.h Mon Nov 26 11:13:17 2007 @@ -96,7 +96,7 @@ **/ virtual bool setKeyboardFocus(); - + private slots: /** Modified: branches/tmp/coolo/qt4-port/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQComboBox.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQComboBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQComboBox.cc Mon Nov 26 11:13:17 2007 @@ -34,26 +34,31 @@ #include "YQComboBox.h" #include "YQSignalBlocker.h" #include "YQWidgetCaption.h" - +#include <QVBoxLayout> YQComboBox::YQComboBox( YWidget * parent, const string & label, bool editable ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YComboBox( parent, label, editable ) , _validator(0) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); - + layout->addWidget( _caption ); + _qt_comboBox = new QComboBox( editable, this ); YUI_CHECK_NEW( _caption ); - + layout->addWidget( _qt_comboBox ); + _caption->setBuddy( _qt_comboBox ); #if SEND_SELECTION_CHANGED_EVENT @@ -102,7 +107,7 @@ { YComboBox::addItem( item ); QPixmap icon; - + if ( item->hasIconName() ) { string iconName = iconFullPath( item ); @@ -128,7 +133,7 @@ void YQComboBox::deleteAllItems() { YQSignalBlocker sigBlocker( _qt_comboBox ); - + _qt_comboBox->clear(); YComboBox::deleteAllItems(); } Modified: branches/tmp/coolo/qt4-port/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQComboBox.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQComboBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQComboBox.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQComboBox_h #define YQComboBox_h -#include +#include <QFrame> #include "YComboBox.h" class YQWidgetCaption; @@ -28,7 +28,7 @@ class QY2CharValidator; -class YQComboBox : public QVBox, public YComboBox +class YQComboBox : public QFrame, public YComboBox { Q_OBJECT @@ -81,7 +81,7 @@ /** * Returns 'true' if the given text is valid according to the current - * setting of ValidChars. + * setting of ValidChars. **/ bool isValidText( const QString & txt ) const; @@ -134,9 +134,9 @@ **/ void textChanged( const QString &new_text ); - + protected: - + /** * Return this ComboBox's current value as text. * Modified: branches/tmp/coolo/qt4-port/src/YQDateField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDateField.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDateField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDateField.cc Mon Nov 26 11:13:17 2007 @@ -21,6 +21,8 @@ #include #include +#include +#include <QVBoxLayout> #include "utf8.h" #include "YQUI.h" @@ -29,21 +31,26 @@ YQDateField::YQDateField( YWidget * parent, const string & label ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YDateField( parent, label ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _caption = new YQWidgetCaption( this, fromUTF8( label ) ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); - _qt_dateEdit = new QDateEdit( this ); + _qt_dateEdit = new Q3DateEdit( this ); YUI_CHECK_NEW( _qt_dateEdit ); + layout->addWidget( _qt_dateEdit ); - _qt_dateEdit->setAutoAdvance( true ); - _qt_dateEdit->setOrder( QDateEdit::DMY ); + //_qt_dateEdit->setAutoAdvance( true ); + _qt_dateEdit->setOrder( Q3DateEdit::DMY ); _caption->setBuddy( _qt_dateEdit ); } @@ -76,7 +83,7 @@ void YQDateField::setEnabled( bool enabled ) { - QVBox::setEnabled( enabled ); + QFrame::setEnabled( enabled ); YWidget::setEnabled( enabled ); } Modified: branches/tmp/coolo/qt4-port/src/YQDateField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDateField.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDateField.h (original) +++ branches/tmp/coolo/qt4-port/src/YQDateField.h Mon Nov 26 11:13:17 2007 @@ -20,14 +20,14 @@ #ifndef YQDateField_h #define YQDateField_h -#include +#include <QFrame> #include "YDateField.h" -class QDateEdit; +class Q3DateEdit; class YQWidgetCaption; -class YQDateField : public QVBox, public YDateField +class YQDateField : public QFrame, public YDateField { Q_OBJECT @@ -106,7 +106,7 @@ protected: YQWidgetCaption * _caption; - QDateEdit * _qt_dateEdit; + Q3DateEdit * _qt_dateEdit; }; Modified: branches/tmp/coolo/qt4-port/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.cc Mon Nov 26 11:13:17 2007 @@ -24,6 +24,7 @@ #include #include #include +#include <QDesktopWidget> #include "YQUI.h" #include "YQi18n.h" @@ -43,24 +44,25 @@ QWidget * qt_parent, bool default_size ) : QWidget( qt_parent, - 0, // name - default_size ? 0 : WStyle_Customize | WStyle_DialogBorder | WType_Modal | WStyle_Dialog ) // WFlags + default_size ? Qt::Widget : Qt::Window ) // WFlags , YDialog( opt ) { _userResized = false; _focusButton = 0; _defaultButton = 0; - setWidgetRep( this ); setCaption( hasDefaultSize() ? "YaST2" : "" ); - setFocusPolicy( QWidget::StrongFocus ); + setFocusPolicy( Qt::StrongFocus ); + + if ( ! default_size ) + 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() ) { @@ -75,7 +77,7 @@ setPalette( warnPalette ); } - _qFrame = new QFrame ( this ); + _qFrame = new Q3Frame ( this ); bool decorate = ! hasDefaultSize() && ! YQUI::ui()->haveWM(); #if 0 @@ -84,20 +86,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 ); } } @@ -637,7 +639,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/coolo/qt4-port/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDialog.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.h (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.h Mon Nov 26 11:13:17 2007 @@ -20,13 +20,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 @@ -228,7 +230,7 @@ // Data members // - QFrame * _qFrame; + Q3Frame * _qFrame; bool _userResized; QSize _userSize; Modified: branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc Mon Nov 26 11:13:17 2007 @@ -18,7 +18,7 @@ #include -#include +#include #include #define y2log_component "qt-ui" #include @@ -27,27 +27,33 @@ #include "YQUI.h" #include "YQDownloadProgress.h" #include "YQWidgetCaption.h" - +#include <QVBoxLayout> +#include <QProgressBar> YQDownloadProgress::YQDownloadProgress( YWidget * parent, const string & label, const string & filename, YFileSize_t expectedSize ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YDownloadProgress( parent, label, filename, expectedSize ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setMargin( YQWidgetMargin ); + layout->setMargin( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); _qt_progressBar = new QProgressBar( this ); YUI_CHECK_NEW( _qt_progressBar ); + layout->addWidget( _qt_progressBar ); _qt_progressBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); - _qt_progressBar->setTotalSteps( 100 ); // Using percent - _qt_progressBar->setProgress( currentPercent() ); + _qt_progressBar->setRange( 0, 100 ); // Using percent + _qt_progressBar->setValue( currentPercent() ); _timer = new QTimer( this ); @@ -77,14 +83,14 @@ YQDownloadProgress::setFilename( const string & filename ) { YDownloadProgress::setFilename( filename ); - _qt_progressBar->setProgress( currentPercent() ); + _qt_progressBar->setValue( currentPercent() ); } void YQDownloadProgress::setExpectedSize( YFileSize_t expectedSize ) { - _qt_progressBar->setProgress( currentPercent() ); + _qt_progressBar->setValue( currentPercent() ); YDownloadProgress::setExpectedSize( expectedSize ); } @@ -92,7 +98,7 @@ void YQDownloadProgress::pollFileSize() { - _qt_progressBar->setProgress( currentPercent() ); + _qt_progressBar->setValue( currentPercent() ); } Modified: branches/tmp/coolo/qt4-port/src/YQDownloadProgress.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDownloadProgress.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDownloadProgress.h (original) +++ branches/tmp/coolo/qt4-port/src/YQDownloadProgress.h Mon Nov 26 11:13:17 2007 @@ -20,14 +20,14 @@ #ifndef YQDownloadProgress_h #define YQDownloadProgress_h -#include +#include <QFrame> #include "YDownloadProgress.h" class YQWidgetCaption; class QProgressBar; -class YQDownloadProgress : public QVBox, public YDownloadProgress +class YQDownloadProgress : public QFrame, public YDownloadProgress { Q_OBJECT @@ -48,7 +48,7 @@ /** * Set the label (the text above the progress bar). - * + * * Reimplemented from YDownloadProgress. **/ virtual void setLabel( const string & label ); @@ -59,7 +59,7 @@ * Reimplemented from YDownloadProgress. **/ virtual void setFilename( const string & filename ); - + /** * Change the expected file size. * Modified: branches/tmp/coolo/qt4-port/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDumbTab.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDumbTab.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDumbTab.cc Mon Nov 26 11:13:17 2007 @@ -49,11 +49,11 @@ // _tabBar = new QTabBar( this ); - CHECK_PTR( _tabBar ); + Q_CHECK_PTR( _tabBar ); _tabBar->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); // hor/vert setFocusProxy( _tabBar ); - setFocusPolicy( TabFocus ); + setFocusPolicy( Qt::TabFocus ); connect( _tabBar, SIGNAL( selected ( int ) ), this, SLOT ( slotSelected( int ) ) ); @@ -71,17 +71,14 @@ { YQSignalBlocker sigBlocker( _tabBar ); YDumbTab::addItem( item ); - - QTab * tab = new QTab( fromUTF8( item->label() ) ); - YUI_CHECK_NEW( tab ); - y2debug( "Adding tab page [%s]", item->label().c_str() ); - tab->setIdentifier( item->index() ); - _tabBar->addTab( tab ); - item->setData( tab ); + _tabBar->insertTab( item->index(), fromUTF8( item->label() ) ); + y2debug( "Adding tab page [%s]", item->label().c_str() ); +#warning YItem::setData + // item->setData( tab ); if ( item->selected() ) - _tabBar->setCurrentTab( tab ); + _tabBar->setCurrentIndex( item->index() ); } @@ -92,13 +89,10 @@ { // Don't try to suppress any signals sent here with a YQSignalBlocker, // otherwise the application code that handles the event will never be executed. - - QTab * tab = (QTab *) item->data(); - if ( tab ) - _tabBar->setCurrentTab( tab ); + _tabBar->setCurrentIndex( item->index() ); } - + YDumbTab::selectItem( item, selected ); } @@ -110,12 +104,9 @@ it != itemsEnd(); ++it ) { - QTab * tab = (QTab *) (*it)->data(); - - if ( tab ) - _tabBar->removeTab( tab ); + _tabBar->removeTab( ( *it )->index() ); } - + YDumbTab::deleteAllItems(); } @@ -152,7 +143,7 @@ { int tabBarWidth = _tabBar->sizeHint().width(); int childWidth = hasChildren() ? firstChild()->preferredWidth() : 0; - + return max( tabBarWidth, childWidth ); } @@ -162,7 +153,7 @@ { int tabBarHeight = _tabBar->sizeHint().height(); int childHeight = hasChildren() ? firstChild()->preferredHeight() : 0; - + return tabBarHeight + YQDumbTabSpacing + childHeight; } @@ -198,12 +189,12 @@ // // _tabBar (fixed height) // - + int tabBarHeight = _tabBar->sizeHint().height(); if ( remainingHeight < tabBarHeight ) tabBarHeight = remainingHeight; - + _tabBar->resize( newWidth, tabBarHeight ); remainingHeight -= tabBarHeight; @@ -212,22 +203,22 @@ // // Spacing between tabBar and client area // - + remainingHeight -= YQDumbTabSpacing; y_offset = newHeight - remainingHeight; // // 3D border // - + remainingHeight -= 2 * YQDumbTabFrameMargin; remainingWidth -= 2 * YQDumbTabFrameMargin; x_offset += YQDumbTabFrameMargin; y_offset += YQDumbTabFrameMargin; - if ( remainingHeight < 0 ) + if ( remainingHeight < 0 ) remainingHeight = 0; - + if ( remainingWidth < 0 ) remainingWidth = 0; @@ -235,7 +226,7 @@ // Client area // - + firstChild()->setSize( remainingWidth, remainingHeight ); QWidget * qChild = (QWidget *) firstChild()->widgetRep(); Modified: branches/tmp/coolo/qt4-port/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFrame.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQFrame.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQFrame.cc Mon Nov 26 11:13:17 2007 @@ -21,6 +21,8 @@ #include #include "YQUI.h" #include "utf8.h" +//Added by qt3to4: +#include using std::max; @@ -29,7 +31,7 @@ YQFrame::YQFrame( YWidget * parent, const string & initialLabel ) - : QGroupBox( (QWidget *) parent->widgetRep() ) + : Q3GroupBox( (QWidget *) parent->widgetRep() ) , YFrame( parent, initialLabel ) { setWidgetRep ( this ); Modified: branches/tmp/coolo/qt4-port/src/YQFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFrame.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQFrame.h (original) +++ branches/tmp/coolo/qt4-port/src/YQFrame.h Mon Nov 26 11:13:17 2007 @@ -20,13 +20,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/coolo/qt4-port/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQGenericButton.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQGenericButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQGenericButton.cc Mon Nov 26 11:13:17 2007 @@ -20,6 +20,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #define y2log_component "qt-ui" #include @@ -127,7 +130,7 @@ if ( qIconName.isEmpty() ) { - _qPushButton->setIconSet( QIconSet() ); + _qPushButton->setIconSet( QIcon() ); return; } Modified: branches/tmp/coolo/qt4-port/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIconPool.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQIconPool.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQIconPool.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIconPool.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQIconPool.h (original) +++ branches/tmp/coolo/qt4-port/src/YQIconPool.h Mon Nov 26 11:13:17 2007 @@ -21,7 +21,7 @@ #define YQIconPool_h #include -#include +#include class YQIconPool { @@ -109,7 +109,7 @@ // static YQIconPool * _iconPool; - QPtrDict<QPixmap> _iconCache; + Q3PtrDict<QPixmap> _iconCache; }; Modified: branches/tmp/coolo/qt4-port/src/YQImage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQImage.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQImage.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQImage.cc Mon Nov 26 11:13:17 2007 @@ -20,6 +20,8 @@ #include #include #include +//Added by qt3to4: +#include #define y2log_component "qt-ui" #include @@ -67,7 +69,7 @@ else { y2debug( "Loading animation from %s", imageFileName().c_str() ); - QLabel::setMovie( movie ); + QLabel::setMovie( &movie ); } } else Modified: branches/tmp/coolo/qt4-port/src/YQInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQInputField.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQInputField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQInputField.cc Mon Nov 26 11:13:17 2007 @@ -33,6 +33,7 @@ #include "YQi18n.h" #include "YQSignalBlocker.h" #include "YQWidgetCaption.h" +#include <QVBoxLayout> // Include low-level X headers AFTER Qt headers: // X.h pollutes the global namespace (!!!) with pretty useless #defines @@ -48,21 +49,26 @@ YQInputField::YQInputField( YWidget * parent, const string & label, bool passwordMode ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YInputField( parent, label, passwordMode ) , _validator(0) , _displayingCapsLockWarning( false ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); - + layout->addWidget( _caption ); + _qt_lineEdit = new YQRawLineEdit( this ); YUI_CHECK_NEW( _qt_lineEdit ); + layout->addWidget( _qt_lineEdit ); _caption->setBuddy( _qt_lineEdit ); Modified: branches/tmp/coolo/qt4-port/src/YQInputField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQInputField.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQInputField.h (original) +++ branches/tmp/coolo/qt4-port/src/YQInputField.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQInputField_h #define YQInputField_h -#include +#include <QFrame> #include #include "YInputField.h" @@ -33,7 +33,7 @@ using std::string; -class YQInputField : public QVBox, public YInputField +class YQInputField : public QFrame, public YInputField { Q_OBJECT Modified: branches/tmp/coolo/qt4-port/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIntField.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQIntField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQIntField.cc Mon Nov 26 11:13:17 2007 @@ -28,28 +28,34 @@ #include "YQIntField.h" #include "YQSignalBlocker.h" #include "YQWidgetCaption.h" - +#include <QVBoxLayout> YQIntField::YQIntField( YWidget * parent, const string & label, int minValue, int maxValue, int initialValue ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YIntField( parent, label, minValue, maxValue ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); _qt_spinBox = new QSpinBox( minValue, maxValue, 1, // step this ); YUI_CHECK_NEW( _qt_spinBox ); + layout->addWidget( _qt_spinBox ); + _qt_spinBox->setValue( initialValue ); _caption->setBuddy( _qt_spinBox ); Modified: branches/tmp/coolo/qt4-port/src/YQIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIntField.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQIntField.h (original) +++ branches/tmp/coolo/qt4-port/src/YQIntField.h Mon Nov 26 11:13:17 2007 @@ -21,7 +21,7 @@ #define YQIntField_h #include -#include +#include <QFrame> #include "YIntField.h" @@ -30,7 +30,7 @@ class QSpinBox; -class YQIntField : public QVBox, public YIntField +class YQIntField : public QFrame, public YIntField { Q_OBJECT @@ -113,7 +113,7 @@ **/ virtual bool setKeyboardFocus(); - + signals: /** Modified: branches/tmp/coolo/qt4-port/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLabel.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLabel.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQLabel.cc Mon Nov 26 11:13:17 2007 @@ -24,6 +24,9 @@ #include "YQUI.h" #include "YQApplication.h" #include "YQLabel.h" +//Added by qt3to4: +#include +#include YQLabel::YQLabel( YWidget * parent, @@ -35,7 +38,7 @@ { setWidgetRep( this ); - setTextFormat( QLabel::PlainText ); + setTextFormat( Qt::PlainText ); QLabel::setText( fromUTF8( text ) ); setIndent(0); @@ -51,7 +54,7 @@ } setMargin( YQWidgetMargin ); - setAlignment( AlignLeft | AlignTop ); + setAlignment( Qt::AlignLeft | Qt::AlignTop ); } Modified: branches/tmp/coolo/qt4-port/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLogView.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQLogView.cc Mon Nov 26 11:13:17 2007 @@ -19,7 +19,8 @@ #include #include -#include +#include +#include <QVBoxLayout> #define y2log_component "qt-ui" #include @@ -35,19 +36,23 @@ const string & label, int visibleLines, int maxLines ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YLogView( parent, label, visibleLines, maxLines ) { setWidgetRep( this ); + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); - setSpacing( YQWidgetSpacing ); - setMargin( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); - _qt_text = new QMultiLineEdit( this ); + _qt_text = new Q3MultiLineEdit( this ); YUI_CHECK_NEW( _qt_text ); + layout->addWidget( _qt_text ); _qt_text->setReadOnly( true ); _qt_text->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); @@ -99,7 +104,7 @@ YQLogView::preferredHeight() { int hintHeight = visibleLines() * _qt_text->fontMetrics().lineSpacing(); - hintHeight += _qt_text->style().scrollBarExtent().height(); + hintHeight += _qt_text->style()->pixelMetric( QStyle::PM_ScrollBarExtent ); hintHeight += _qt_text->frameWidth() * 2; if ( _caption->isShown() ) Modified: branches/tmp/coolo/qt4-port/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLogView.h (original) +++ branches/tmp/coolo/qt4-port/src/YQLogView.h Mon Nov 26 11:13:17 2007 @@ -20,20 +20,20 @@ #ifndef YQLogView_h #define YQLogView_h -#include +#include <QFrame> #include "YLogView.h" class YQWidgetCaption; -class QMultiLineEdit; +class Q3MultiLineEdit; -class YQLogView : public QVBox, public YLogView +class YQLogView : public QFrame, public YLogView { Q_OBJECT - + public: - + /** * Constructor **/ @@ -73,7 +73,7 @@ * Reimplemented from YWidget. **/ virtual void setEnabled( bool enabled ); - + /** * Preferred width of the widget. * @@ -104,7 +104,7 @@ protected: YQWidgetCaption * _caption; - QMultiLineEdit * _qt_text; + Q3MultiLineEdit * _qt_text; }; Modified: branches/tmp/coolo/qt4-port/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMenuButton.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMenuButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMenuButton.cc Mon Nov 26 11:13:17 2007 @@ -18,8 +18,7 @@ #include -#include -#include +#include #include #include #define y2log_component "qt-ui" @@ -76,7 +75,7 @@ // Create toplevel menu // - QPopupMenu * menu = new QPopupMenu( _qt_button ); + Q3PopupMenu * menu = new Q3PopupMenu( _qt_button ); YUI_CHECK_NEW( menu ); _qt_button->setPopup( menu ); @@ -92,7 +91,7 @@ void -YQMenuButton::rebuildMenuTree( QPopupMenu * parentMenu, YItemIterator begin, YItemIterator end ) +YQMenuButton::rebuildMenuTree( Q3PopupMenu * parentMenu, YItemIterator begin, YItemIterator end ) { for ( YItemIterator it = begin; it != end; ++it ) { @@ -112,7 +111,7 @@ if ( item->hasChildren() ) { - QPopupMenu * subMenu = new QPopupMenu( parentMenu ); + Q3PopupMenu * subMenu = new Q3PopupMenu( parentMenu ); YUI_CHECK_NEW( subMenu ); if ( icon.isNull() ) @@ -128,7 +127,7 @@ else // No children - leaf entry { // item->index() is guaranteed to be unique within this YMenuButton's items, - // so it can easily be used as unique ID in all QPopupMenus that belong + // so it can easily be used as unique ID in all Q3PopupMenus that belong // to this YQMenuButton. if ( icon.isNull() ) Modified: branches/tmp/coolo/qt4-port/src/YQMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMenuButton.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMenuButton.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMenuButton.h Mon Nov 26 11:13:17 2007 @@ -25,7 +25,7 @@ class QPushButton; -class QPopupMenu; +class Q3PopupMenu; class YQMenuButton : public QWidget, public YMenuButton { @@ -110,7 +110,7 @@ /** * Recursively insert menu items into 'menu' from iterator 'begin' to iterator 'end'. **/ - void rebuildMenuTree( QPopupMenu * menu, YItemIterator begin, YItemIterator end ); + void rebuildMenuTree( Q3PopupMenu * menu, YItemIterator begin, YItemIterator end ); // Modified: branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc Mon Nov 26 11:13:17 2007 @@ -17,7 +17,9 @@ /-*/ -#include +#include +#include <QVBoxLayout> +#include <QTextEdit> #include #define y2log_component "qt-ui" #include @@ -33,22 +35,27 @@ YQMultiLineEdit::YQMultiLineEdit( YWidget * parent, const string & label ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YMultiLineEdit( parent, label ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); - + layout->addWidget( _caption ); + _qt_textEdit = new QTextEdit( this ); YUI_CHECK_NEW( _qt_textEdit ); - + layout->addWidget( _qt_textEdit ); + _qt_textEdit->setTextFormat( Qt::PlainText ); _qt_textEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - + _caption->setBuddy( _qt_textEdit ); connect( _qt_textEdit, SIGNAL( textChanged( void ) ), @@ -71,7 +78,7 @@ void YQMultiLineEdit::setValue( const string & text ) { YQSignalBlocker sigBlocker( _qt_textEdit ); - + _qt_textEdit->setText( fromUTF8( text ) ); } @@ -99,6 +106,7 @@ void YQMultiLineEdit::enforceMaxInputLength() { +#if FIXME if ( inputMaxLength() >= 0 && _qt_textEdit->length() > inputMaxLength() ) { int index; @@ -111,7 +119,7 @@ int pos = 0; // current positon in text int section =0; // section in text; // iterate over the string - + while ( pos != (int) text.length()+1 ) { // we reached the paragraph where the user entered @@ -143,6 +151,7 @@ // adjust to new cursor position before the removed character _qt_textEdit->setCursorPosition( para, index-1 ); } +#endif } Modified: branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQMultiLineEdit_h #define YQMultiLineEdit_h -#include +#include <QFrame> #include "YMultiLineEdit.h" class YQWidgetCaption; @@ -30,7 +30,7 @@ /** * MultiLineEdit - an input area for multi-line text. **/ -class YQMultiLineEdit : public QVBox, public YMultiLineEdit +class YQMultiLineEdit : public QFrame, public YMultiLineEdit { Q_OBJECT @@ -67,7 +67,7 @@ * Reimplemented from YMultiLineEdit. **/ virtual void setLabel( const string & label ); - + /** * Set the maximum input length, i.e., the maximum number of characters the * user can enter. -1 means no limit. @@ -75,7 +75,7 @@ * Reimplemented from YMultiLineEdit. **/ virtual void setInputMaxLength( int numberOfChars ); - + /** * Set enabled/disabled state. * Modified: branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc Mon Nov 26 11:13:17 2007 @@ -21,6 +21,10 @@ #include #include +//Added by qt3to4: +#include +#include +#include #include "YQUI.h" #include "YQMultiProgressMeter.h" @@ -254,7 +258,7 @@ { if ( fillStart < length ) { - QPointArray points( 4 ); + Q3PointArray points( 4 ); int p=0; points.setPoint( p++, offset + fillStart, border + fillHeight ); @@ -263,7 +267,7 @@ points.setPoint( p++, offset + length, border + indent ); painter.setBrush( palette().active().highlight() ); - painter.setPen( NoPen ); + painter.setPen( Qt::NoPen ); painter.drawConvexPolygon( points ); } } @@ -271,7 +275,7 @@ { if ( fillStart > 0 ) { - QPointArray points( 4 ); + Q3PointArray points( 4 ); int p=0; points.setPoint( p++, offset, border + thickness ); @@ -280,7 +284,7 @@ points.setPoint( p++, offset + fillStart, border + thickness - fillHeight ); painter.setBrush( palette().active().highlight() ); - painter.setPen( NoPen ); + painter.setPen( Qt::NoPen ); painter.drawConvexPolygon( points ); } } @@ -296,7 +300,7 @@ // Draw arrow base (left) painter.setPen( dark ); - painter.setPen( SolidLine ); + painter.setPen( Qt::SolidLine ); painter.drawLine( offset, border, offset, border + thickness ); @@ -329,7 +333,7 @@ const QColor & color = palette().active().foreground(); painter.setPen( color ); - painter.setPen( SolidLine ); + painter.setPen( Qt::SolidLine ); painter.setBrush( color ); // painter.setBrush( NoBrush ); @@ -337,7 +341,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/coolo/qt4-port/src/YQMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.h Mon Nov 26 11:13:17 2007 @@ -24,6 +24,9 @@ #include "YMultiProgressMeter.h" #include #include +//Added by qt3to4: +#include +#include class QPaintEvent; Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Mon Nov 26 11:13:17 2007 @@ -20,7 +20,8 @@ #include #include #include -#include +#include <QVBoxLayout> +#include #define y2log_component "qt-ui" #include @@ -39,20 +40,25 @@ YQMultiSelectionBox::YQMultiSelectionBox( YWidget * parent, const string & label ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YMultiSelectionBox( parent, label ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); - - _qt_listView = new QListView( this ); + layout->addWidget( _caption ); + + _qt_listView = new Q3ListView( this ); YUI_CHECK_NEW( _qt_listView ); - + layout->addWidget( _qt_listView ); + _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 ); @@ -96,13 +102,13 @@ YUI_CHECK_NEW( msbItem ); // Take care of the item's check box - + if ( yItem->selected() ) msbItem->setOn( true ); - + // Take care of the QListView's keyboard focus - + if ( ! _qt_listView->selectedItem() ) _qt_listView->setSelected( msbItem, true ); } @@ -123,8 +129,8 @@ { YQSignalBlocker sigBlocker( _qt_listView ); YMultiSelectionBox::deselectAllItems(); - - QListViewItemIterator it( _qt_listView ); + + Q3ListViewItemIterator it( _qt_listView ); while ( *it ) { @@ -172,8 +178,8 @@ // // For the purpose of this function, QListView::currentItem() is the // minimum requirement. - - QListViewItem * currentQItem = _qt_listView->currentItem(); + + Q3ListViewItem * currentQItem = _qt_listView->currentItem(); if ( currentQItem ) { @@ -195,7 +201,7 @@ // // This function uses QListView::selectedItem() for better visibility. // This implicitly also changes QListView::currentItem(). - + YQSignalBlocker sigBlocker( _qt_listView ); if ( ! yItem ) @@ -295,8 +301,8 @@ YQMultiSelectionBox::findItem( YItem * wantedItem ) { // FIXME: Don't search through all items, use the YItem::data() pointer instead - - QListViewItemIterator it( _qt_listView ); + + Q3ListViewItemIterator it( _qt_listView ); while ( *it ) { @@ -320,9 +326,9 @@ YQMultiSelectionBoxItem::YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - QListView * listView, + Q3ListView * listView, YItem * yItem ) - : QCheckListItem( listView, fromUTF8( yItem->label() ), QCheckListItem::CheckBox ) + : Q3CheckListItem( listView, fromUTF8( yItem->label() ), Q3CheckListItem::CheckBox ) , _yItem( yItem ) , _multiSelectionBox( parent ) { @@ -337,7 +343,7 @@ { _yItem->setSelected( newState ); _multiSelectionBox->sendValueChanged(); - QCheckListItem::stateChange( newState ); + Q3CheckListItem::stateChange( newState ); } Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,8 @@ #ifndef YQMultiSelectionBox_h #define YQMultiSelectionBox_h -#include +#include <QFrame> +#include <Q3CheckListItem> #include #include "YMultiSelectionBox.h" @@ -29,7 +30,7 @@ class YQMultiSelectionBoxItem; -class YQMultiSelectionBox : public QVBox, public YMultiSelectionBox +class YQMultiSelectionBox : public QFrame, public YMultiSelectionBox { Q_OBJECT @@ -44,7 +45,7 @@ * Destructor. **/ ~YQMultiSelectionBox(); - + /** * Change the label text. * @@ -53,7 +54,7 @@ virtual void setLabel( const string & label ); /** - * Add an item. + * Add an item. * * Reimplemented from YSelectionWidget. **/ @@ -79,7 +80,7 @@ * Reimplemented from YSelectionWidget. **/ virtual void deleteAllItems(); - + /** * Return the the item that currently has the keyboard focus * or 0 if no item currently has the keyboard focus. @@ -140,41 +141,41 @@ * Emitted upon when an item changes its state. **/ void valueChanged(); - + protected slots: /** * Send SelectionChanged event if `opt(`notify) is set. **/ void slotSelected(); - + /** * Send ValueChanged event if `opt(`notify) is set. **/ void slotValueChanged(); - + protected: /** * Find the counterpart of 'item'. Return 0 if there is none. **/ YQMultiSelectionBoxItem * findItem( YItem * item ); - + YQWidgetCaption * _caption; - QListView * _qt_listView; + Q3ListView * _qt_listView; }; -class YQMultiSelectionBoxItem: public QCheckListItem +class YQMultiSelectionBoxItem: public Q3CheckListItem { public: /** * Constructor. **/ YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - QListView * listView, + Q3ListView * listView, YItem * yItem ); /** @@ -187,7 +188,7 @@ **/ YItem * yItem() const { return _yItem; } - + protected: /** @@ -202,8 +203,8 @@ * Returns the sort key for any column. * In this case, maintain item creation order. * - * Reimplemented from QListViewItem. - **/ + * Reimplemented from Q3ListViewItem. + **/ virtual QString key ( int column, bool ascending ) const; @@ -214,7 +215,7 @@ YItem * _yItem; int _serial; YQMultiSelectionBox * _multiSelectionBox; - + /** * The next serial number to use Modified: branches/tmp/coolo/qt4-port/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQProgressBar.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQProgressBar.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQProgressBar.cc Mon Nov 26 11:13:17 2007 @@ -18,6 +18,8 @@ #include +#include <QVBoxLayout> + #include #define y2log_component "qt-ui" #include @@ -33,20 +35,26 @@ YQProgressBar::YQProgressBar( YWidget * parent, const string & label, int maxValue ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YProgressBar( parent, label, maxValue ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); - _qt_progressbar = new QProgressBar( maxValue, this ); + _qt_progressbar = new QProgressBar( this ); + _qt_progressbar->setRange(0, maxValue); YUI_CHECK_NEW( _qt_progressbar ); - + layout->addWidget( _qt_progressbar ); + _caption->setBuddy( _qt_progressbar ); } @@ -67,7 +75,7 @@ void YQProgressBar::setValue( int newValue ) { YProgressBar::setValue( newValue ); - _qt_progressbar->setProgress( value() ); + _qt_progressbar->setValue( value() ); } @@ -83,7 +91,7 @@ int YQProgressBar::preferredWidth() { int hintWidth = _caption->isShown() ? - _caption->sizeHint().width() + margin() : 0; + _caption->sizeHint().width() + layout()->margin() : 0; return max( 200, hintWidth ); } Modified: branches/tmp/coolo/qt4-port/src/YQProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQProgressBar.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQProgressBar.h (original) +++ branches/tmp/coolo/qt4-port/src/YQProgressBar.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQProgressBar_h #define YQProgressBar_h -#include +#include <QFrame> #include "YProgressBar.h" @@ -28,7 +28,7 @@ class YQWidgetCaption; class QProgressBar; -class YQProgressBar : public QVBox, public YProgressBar +class YQProgressBar : public QFrame, public YProgressBar { Q_OBJECT @@ -43,7 +43,7 @@ * Destructor. **/ virtual ~YQProgressBar(); - + /** * Set the label (the caption above the progress bar). * @@ -57,7 +57,7 @@ * Reimplemented from YProgressBar. **/ virtual void setValue( int newValue ); - + /** * Set enabled/disabled state. * @@ -91,7 +91,7 @@ **/ virtual bool setKeyboardFocus(); - + protected: YQWidgetCaption * _caption; Modified: branches/tmp/coolo/qt4-port/src/YQPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPushButton.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQPushButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQPushButton.cc Mon Nov 26 11:13:17 2007 @@ -35,7 +35,7 @@ setWidgetRep( this ); QPushButton * button = new QPushButton( fromUTF8( label ), this ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); setQPushButton( button ); Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadioButton.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButton.cc Mon Nov 26 11:13:17 2007 @@ -18,7 +18,8 @@ #include -#include +#include <QMouseEvent> +#include #define y2log_component "qt-ui" #include @@ -44,7 +45,7 @@ YQRadioButton::YQRadioButton( YWidget * parent, const string & label, bool checked ) - : QGroupBox( (QWidget *) (parent->widgetRep() ) ) + : Q3GroupBox( (QWidget *) (parent->widgetRep() ) ) , YRadioButton( parent, label ) { setWidgetRep( this ); Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadioButton.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButton.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButton.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQRadioButton_h #define YQRadioButton_h -#include +#include #include "YRadioButton.h" @@ -29,7 +29,7 @@ using std::string; -class YQRadioButton : public QGroupBox, public YRadioButton +class YQRadioButton : public Q3GroupBox, public YRadioButton { Q_OBJECT Modified: branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc Mon Nov 26 11:13:17 2007 @@ -18,7 +18,7 @@ #include -#include +#include #define y2log_component "qt-ui" #include Modified: branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h Mon Nov 26 11:13:17 2007 @@ -22,7 +22,7 @@ #include #include "YRadioButtonGroup.h" -class QButtonGroup; +class Q3ButtonGroup; class YQRadioButtonGroup : public QWidget, public YRadioButtonGroup { Modified: branches/tmp/coolo/qt4-port/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRichText.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.cc Mon Nov 26 11:13:17 2007 @@ -20,7 +20,12 @@ #define y2log_component "qt-ui" #include -#include "qregexp.h" +#include +#include +#include +#include +#include <QVBoxLayout> + #include "YEvent.h" #include "utf8.h" #include "YQUI.h" @@ -29,23 +34,28 @@ YQRichText::YQRichText( YWidget * parent, const string & text, bool plainTextMode ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YRichText( parent, text, plainTextMode ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + layout->setSpacing( 0 ); + setLayout( layout ); + setWidgetRep( this ); - setMargin( YQWidgetMargin ); + layout->setMargin( YQWidgetMargin ); _textBrowser = new YQTextBrowser( this ); YUI_CHECK_NEW( _textBrowser ); - - _textBrowser->setMimeSourceFactory( 0 ); + layout->addWidget( _textBrowser ); + + // FIXME _textBrowser->setMimeSourceFactory( 0 ); _textBrowser->installEventFilter( this ); if ( plainTextMode ) { _textBrowser->setTextFormat( Qt::PlainText ); - _textBrowser->setWordWrap( QTextEdit::NoWrap ); + _textBrowser->setWordWrapMode( QTextOption::NoWrap ); } else { @@ -62,19 +72,22 @@ 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 ); + +#ifdef FIXME // Set the text background to a light grey _textBrowser->setPaper( QColor( 234, 234, 234 ) ); +#endif // Propagate clicks on hyperlinks - connect( _textBrowser, SIGNAL( linkClicked( const QString & ) ), - this, SLOT ( linkClicked( const QString & ) ) ); + connect( _textBrowser, SIGNAL( anchorClicked( const QUrl & ) ), + this, SLOT ( linkClicked ( const QUrl & ) ) ); } @@ -112,7 +125,7 @@ if ( plainTextMode() ) { _textBrowser->setTextFormat( Qt::PlainText ); - _textBrowser->setWordWrap( QTextEdit::NoWrap ); + _textBrowser->setWordWrapMode( QTextOption::NoWrap ); } else { @@ -130,10 +143,10 @@ } -void YQRichText::linkClicked( const QString & url ) +void YQRichText::linkClicked( const QUrl & url ) { - // y2debug( "Selected hyperlink \"%s\"", (const char *) url ); - YQUI::ui()->sendEvent( new YMenuEvent( YCPString( (const char *) url ) ) ); + // y2debug( "Selected hyperlink \"%s\"", (const char *) url.toString() ); + YQUI::ui()->sendEvent( new YMenuEvent( YCPString( (const char *) url.toString() ) ) ); } @@ -165,7 +178,7 @@ { if ( plainTextMode() ) return false; - + return ( _textBrowser->text().contains( QRegExp( " 0 ); } Modified: branches/tmp/coolo/qt4-port/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRichText.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQRichText_h #define YQRichText_h -#include +#include <QFrame> #include #include "YRichText.h" @@ -29,7 +29,7 @@ class YQTextBrowser; -class YQRichText : public QVBox, public YRichText +class YQRichText : public QFrame, public YRichText { Q_OBJECT @@ -67,7 +67,7 @@ * Reimplemented from YRichText. **/ virtual void setAutoScrollDown( bool on = true ); - + /** * Preferred width of the widget. * @@ -122,7 +122,7 @@ /** * Notification that a hyperlink is clicked. **/ - void linkClicked( const QString & url ); + void linkClicked( const QUrl & url ); protected: Modified: branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc Mon Nov 26 11:13:17 2007 @@ -19,8 +19,14 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include +#include +#include <QVBoxLayout> #define y2log_component "qt-ui" #include @@ -42,19 +48,24 @@ YQSelectionBox::YQSelectionBox( YWidget * parent, const string & label ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YSelectionBox( parent, label ) { setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); - _qt_listBox = new QListBox( this ); + _qt_listBox = new Q3ListBox( this ); YUI_CHECK_NEW( _qt_listBox ); + layout->addWidget( _qt_listBox ); _qt_listBox->installEventFilter( this ); _qt_listBox->setVariableHeight( false ); @@ -66,8 +77,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() ) ); @@ -280,7 +291,7 @@ } -void YQSelectionBox::slotActivated( QListBoxItem * qItem ) +void YQSelectionBox::slotActivated( Q3ListBoxItem * qItem ) { selectItem( _qt_listBox->index( qItem ) ); Modified: branches/tmp/coolo/qt4-port/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSelectionBox.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSelectionBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQSelectionBox.h Mon Nov 26 11:13:17 2007 @@ -20,20 +20,20 @@ #ifndef YQSelectionBox_h #define YQSelectionBox_h -#include +#include <QFrame> #include #include "YSelectionBox.h" class YQWidgetCaption; -class QListBox; -class QListBoxItem; +class Q3ListBox; +class Q3ListBoxItem; -class YQSelectionBox : public QVBox, public YSelectionBox +class YQSelectionBox : public QFrame, public YSelectionBox { Q_OBJECT - + public: /** @@ -54,7 +54,7 @@ virtual void setLabel( const string & label ); /** - * Add an item. + * Add an item. * * Reimplemented from YSelectionWidget. **/ @@ -80,7 +80,7 @@ * Reimplemented from YSelectionWidget. **/ virtual void deleteAllItems(); - + /** * Set enabled/disabled state. * @@ -123,7 +123,7 @@ **/ virtual bool eventFilter( QObject * obj, QEvent * ev ); - + protected slots: /** @@ -135,21 +135,21 @@ /** * 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. * This is only relevant if `opt( `notify ) is set. **/ void returnDelayed(); - + /** * Return immediately. * This is only relevant if `opt( `notify ) is set. **/ void returnImmediately(); - + protected: /** @@ -157,13 +157,13 @@ **/ void selectItem( int index ); - + // // Data members // YQWidgetCaption * _caption; - QListBox * _qt_listBox; + Q3ListBox * _qt_listBox; QTimer _timer; }; Modified: branches/tmp/coolo/qt4-port/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSlider.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSlider.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQSlider.cc Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #include #include #include -#include +#include <QVBoxLayout> #define y2log_component "qt-ui" #include @@ -40,27 +40,37 @@ int initialValue, bool reverseLayout ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YSlider( parent, label, minValue, maxValue ) { setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); - _caption = new YQWidgetCaption( this, toUTF8( label ) ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); + + _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); - _hbox = new QHBox( this ); + _hbox = new QFrame( this ); YUI_CHECK_NEW( _hbox ); - - _hbox->setSpacing( YQWidgetSpacing ); + layout->addWidget( _hbox ); + + layout = new QVBoxLayout( _hbox ); + _hbox->setLayout( layout ); + + layout->setMargin ( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); if ( reverseLayout ) { _qt_spinBox = new QSpinBox( minValue, maxValue, 1, // step _hbox ); + layout->addWidget( _qt_spinBox ); } else { @@ -70,14 +80,16 @@ _qt_slider = new QSlider( minValue, maxValue, 1, // pageStep initialValue, - QSlider::Horizontal, _hbox ); + Qt::Horizontal, _hbox ); YUI_CHECK_NEW( _qt_slider ); + layout->addWidget( _qt_slider ); if ( ! reverseLayout ) { _qt_spinBox = new QSpinBox( minValue, maxValue, 1, // step _hbox ); + layout->addWidget( _qt_spinBox ); } YUI_CHECK_NEW( _qt_spinBox ); Modified: branches/tmp/coolo/qt4-port/src/YQSlider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSlider.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSlider.h (original) +++ branches/tmp/coolo/qt4-port/src/YQSlider.h Mon Nov 26 11:13:17 2007 @@ -20,16 +20,15 @@ #ifndef YQSlider_h #define YQSlider_h -#include +#include <QFrame> #include "YSlider.h" class YQWidgetCaption; class QSlider; class QSpinBox; -class QHBox; -class YQSlider : public QVBox, public YSlider +class YQSlider : public QFrame, public YSlider { Q_OBJECT @@ -72,7 +71,7 @@ virtual void setValueInternal( int val ); public: - + /** * Set the label (the caption above the input field). * @@ -86,7 +85,7 @@ * Reimplemented from YWidget. **/ virtual void setEnabled( bool enabled ); - + /** * Preferred width of the widget. * @@ -113,7 +112,7 @@ **/ virtual bool setKeyboardFocus(); - + public slots: /** * Slot for "value changed". This will send a ValueChanged event if @@ -128,7 +127,7 @@ **/ void setValueSlot( int newValue ); - + signals: /** @@ -142,7 +141,7 @@ YQWidgetCaption * _caption; QSlider * _qt_slider; QSpinBox * _qt_spinBox; - QHBox * _hbox; + QFrame * _hbox; }; Modified: branches/tmp/coolo/qt4-port/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTable.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTable.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTable.cc Mon Nov 26 11:13:17 2007 @@ -16,7 +16,8 @@ /-*/ -#include +#include +#include <QVBoxLayout> #define y2log_component "qt-ui" #include @@ -31,14 +32,19 @@ YQTable::YQTable( YWidget * parent, YTableHeader * tableHeader ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YTable( parent, tableHeader ) { setWidgetRep( this ); - setMargin( YQWidgetMargin ); + QVBoxLayout* layout = new QVBoxLayout( this ); + layout->setSpacing( 0 ); + setLayout( layout ); + + layout->setMargin( YQWidgetMargin ); _qt_listView = new QY2ListView( this ); YUI_CHECK_NEW( _qt_listView ); + layout->addWidget( _qt_listView ); _qt_listView->setAllColumnsShowFocus( true ); @@ -57,7 +63,7 @@ case YAlignBegin: qt_alignment = Qt::AlignLeft; break; case YAlignCenter: qt_alignment = Qt::AlignCenter; break; case YAlignEnd: qt_alignment = Qt::AlignRight; break; - + case YAlignUnchanged: break; } @@ -70,14 +76,14 @@ // Connect signals and slots // - connect( _qt_listView, SIGNAL( doubleClicked ( QListViewItem * ) ), - this, SLOT ( slotActivated ( QListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( doubleClicked ( Q3ListViewItem * ) ), + this, SLOT ( slotActivated ( Q3ListViewItem * ) ) ); - connect( _qt_listView, SIGNAL( spacePressed ( QListViewItem * ) ), - this, SLOT ( slotActivated ( QListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( spacePressed ( Q3ListViewItem * ) ), + this, SLOT ( slotActivated ( Q3ListViewItem * ) ) ); - connect( _qt_listView, SIGNAL( selectionChanged ( QListViewItem * ) ), - this, SLOT ( slotSelected ( QListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), + this, SLOT ( slotSelected ( Q3ListViewItem * ) ) ); } @@ -169,7 +175,7 @@ void -YQTable::selectOrigItem( QListViewItem * listViewItem ) +YQTable::selectOrigItem( Q3ListViewItem * listViewItem ) { if ( listViewItem ) { @@ -182,7 +188,7 @@ void -YQTable::slotSelected( QListViewItem * listViewItem ) +YQTable::slotSelected( Q3ListViewItem * listViewItem ) { selectOrigItem( listViewItem ); @@ -199,7 +205,7 @@ void -YQTable::slotActivated( QListViewItem * listViewItem ) +YQTable::slotActivated( Q3ListViewItem * listViewItem ) { selectOrigItem( listViewItem ); Modified: branches/tmp/coolo/qt4-port/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTable.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTable.h (original) +++ branches/tmp/coolo/qt4-port/src/YQTable.h Mon Nov 26 11:13:17 2007 @@ -19,17 +19,17 @@ #ifndef YQTable_h #define YQTable_h -#include +#include <QFrame> #include #include "YTable.h" class QY2ListView; -class QListViewItem; +class Q3ListViewItem; class YQListViewItem; -class YQTable : public QVBox, public YTable +class YQTable : public QFrame, public YTable { Q_OBJECT @@ -133,21 +133,21 @@ /** * Notification that an item is selected (single click or keyboard). **/ - void slotSelected( QListViewItem * ); + void slotSelected( Q3ListViewItem * ); /** * Notification that an item is activated (double click or keyboard). **/ - void slotActivated( QListViewItem * ); + void slotActivated( Q3ListViewItem * ); protected: - + /** * Select the original item (the YTableItem) that corresponds to the - * specified listViewItem. + * specified listViewItem. **/ - void selectOrigItem( QListViewItem * listViewItem ); + void selectOrigItem( Q3ListViewItem * listViewItem ); // // Data members @@ -186,7 +186,7 @@ * Update this item's display with the content of 'cell'. **/ void updateCell( const YTableCell * cell ); - + protected: YQTable * _table; Modified: branches/tmp/coolo/qt4-port/src/YQTimeField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTimeField.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTimeField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTimeField.cc Mon Nov 26 11:13:17 2007 @@ -26,24 +26,30 @@ #include "YQUI.h" #include "YQTimeField.h" #include "YQWidgetCaption.h" - +#include <QVBoxLayout> YQTimeField::YQTimeField( YWidget * parent, const string & label ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YTimeField( parent, label ) { setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _caption = new YQWidgetCaption( this, fromUTF8( label ) ); YUI_CHECK_NEW( _caption ); + layout->addWidget( _caption ); _qt_timeEdit = new QTimeEdit( this ); YUI_CHECK_NEW( _qt_timeEdit ); + layout->addWidget( _qt_timeEdit ); - _qt_timeEdit->setAutoAdvance( true ); +#warning FIXME setAutoAdvance does? + //_qt_timeEdit->setAutoAdvance( true ); _caption->setBuddy( _qt_timeEdit ); } @@ -75,7 +81,7 @@ void YQTimeField::setEnabled( bool enabled ) { - QVBox::setEnabled( enabled ); + QFrame::setEnabled( enabled ); YWidget::setEnabled( enabled ); } Modified: branches/tmp/coolo/qt4-port/src/YQTimeField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTimeField.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTimeField.h (original) +++ branches/tmp/coolo/qt4-port/src/YQTimeField.h Mon Nov 26 11:13:17 2007 @@ -20,14 +20,14 @@ #ifndef YQTimeField_h #define YQTimeField_h -#include +#include <QFrame> #include "YTimeField.h" class YQWidgetCaption; class QTimeEdit; -class YQTimeField : public QVBox, public YTimeField +class YQTimeField : public QFrame, public YTimeField { Q_OBJECT Modified: branches/tmp/coolo/qt4-port/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTree.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTree.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTree.cc Mon Nov 26 11:13:17 2007 @@ -17,11 +17,14 @@ /-*/ -#include +#include #include -#include -#include +#include +#include +#include <QVBoxLayout> #include +//Added by qt3to4: +#include #define y2log_component "qt-ui" #include @@ -40,36 +43,41 @@ YQTree::YQTree( YWidget * parent, const string & label ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YTree( parent, label ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + setLayout( layout ); + setWidgetRep( this ); - setSpacing( YQWidgetSpacing ); - setMargin ( YQWidgetMargin ); + layout->setSpacing( YQWidgetSpacing ); + layout->setMargin ( YQWidgetMargin ); _nextSerialNo = 0; _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); - - _qt_listView = new QListView( this ); + layout->addWidget( _caption ); + + _qt_listView = new Q3ListView( this ); YUI_CHECK_NEW( _qt_listView ); - + layout->addWidget( _qt_listView ); + _qt_listView->addColumn( "" ); _qt_listView->header()->hide(); _qt_listView->setRootIsDecorated ( true ); _caption->setBuddy ( _qt_listView ); - connect( _qt_listView, SIGNAL( selectionChanged ( QListViewItem * ) ), - this, SLOT ( slotSelected ( QListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), + this, SLOT ( slotSelected ( Q3ListViewItem * ) ) ); - connect( _qt_listView, SIGNAL( spacePressed ( QListViewItem * ) ), - this, SLOT ( slotActivated ( QListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( spacePressed ( Q3ListViewItem * ) ), + this, SLOT ( slotActivated ( Q3ListViewItem * ) ) ); - connect( _qt_listView, SIGNAL( doubleClicked ( QListViewItem * ) ), - this, SLOT ( slotActivated ( QListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( doubleClicked ( Q3ListViewItem * ) ), + this, SLOT ( slotActivated ( Q3ListViewItem * ) ) ); } @@ -89,7 +97,7 @@ void YQTree::rebuildTree() { // y2debug( "Rebuilding tree" ); - + YQSignalBlocker sigBlocker( _qt_listView ); _qt_listView->clear(); @@ -151,13 +159,13 @@ _qt_listView->setSelected( item, true ); openBranch( item ); YTree::selectItem( item->origItem(), true ); - + y2debug( "selected item: \"%s\"", item->origItem()->label().c_str() ); } } -void YQTree::openBranch( QListViewItem * item ) +void YQTree::openBranch( Q3ListViewItem * item ) { while ( item ) { @@ -185,7 +193,7 @@ } -void YQTree::slotSelected( QListViewItem * qItem ) +void YQTree::slotSelected( Q3ListViewItem * qItem ) { selectItem( dynamic_cast (qItem) ); @@ -194,7 +202,7 @@ } -void YQTree::slotActivated( QListViewItem * qItem ) +void YQTree::slotActivated( Q3ListViewItem * qItem ) { selectItem( dynamic_cast (qItem) ); @@ -248,13 +256,13 @@ YQTreeItem::YQTreeItem( YQTree * tree, - QListView * listView, + Q3ListView * listView, YTreeItem * orig, int serial ) - : QListViewItem( listView ) + : Q3ListViewItem( listView ) { init( tree, orig, serial ); - + #if VERBOSE_TREE_ITEMS y2debug( "Creating toplevel tree item \"%s\"", orig->label().c_str() ); #endif @@ -265,7 +273,7 @@ YQTreeItem * parentItem, YTreeItem * orig, int serial ) - : QListViewItem( parentItem ) + : Q3ListViewItem( parentItem ) { init( tree, orig, serial ); @@ -309,7 +317,7 @@ void YQTreeItem::setOpen( bool open ) { - QListViewItem::setOpen( open ); + Q3ListViewItem::setOpen( open ); _origItem->setOpen( open ); } Modified: branches/tmp/coolo/qt4-port/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTree.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTree.h (original) +++ branches/tmp/coolo/qt4-port/src/YQTree.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQTree_h #define YQTree_h -#include +#include <QFrame> #include #include "YTree.h" @@ -30,7 +30,7 @@ class YQTreeItem; -class YQTree : public QVBox, public YTree +class YQTree : public QFrame, public YTree { Q_OBJECT @@ -45,7 +45,7 @@ * Destructor. **/ virtual ~YQTree(); - + /** * Change the label text. * @@ -125,14 +125,14 @@ * * This will trigger a 'SelectionChanged' event if 'notify' is set. **/ - void slotSelected( QListViewItem * item ); + void slotSelected( Q3ListViewItem * item ); /** * Propagate a double click or pressing the space key on a tree item. - * + * * This will trigger an 'Activated' event if 'notify' is set. **/ - void slotActivated( QListViewItem * item); + void slotActivated( Q3ListViewItem * item); protected: @@ -145,8 +145,8 @@ /** * Open the branch of 'item' recursively to its toplevel item. **/ - void openBranch( QListViewItem * item ); - + void openBranch( Q3ListViewItem * item ); + /** * Build a tree of items that will be displayed (YQTreeItems) from the * original items between iterators 'begin' and 'end' as child items of @@ -161,12 +161,12 @@ // YQWidgetCaption * _caption; - QListView * _qt_listView; + Q3ListView * _qt_listView; int _nextSerialNo; }; -class YQTreeItem: public QListViewItem +class YQTreeItem: public Q3ListViewItem { public: @@ -174,7 +174,7 @@ * Constructor for a top level item. **/ YQTreeItem( YQTree * tree, - QListView * parent, + Q3ListView * parent, YTreeItem * origItem, int serial ); @@ -194,7 +194,7 @@ /** * Open this item. * - * Reimplemented from QListViewItem. + * Reimplemented from Q3ListViewItem. **/ virtual void setOpen( bool open ); @@ -214,11 +214,11 @@ /** * Sort key of this item. * - * Reimplemented from QListViewItem. + * Reimplemented from Q3ListViewItem. **/ QString key( int column, bool ascending ) const; - + // // Data members // Modified: branches/tmp/coolo/qt4-port/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI.h (original) +++ branches/tmp/coolo/qt4-port/src/YQUI.h Mon Nov 26 11:13:17 2007 @@ -20,8 +20,8 @@ #define YQUI_h #include -#include -#include +#include +#include #include <vector> #include "YSimpleEventHandler.h" @@ -32,8 +32,8 @@ #define YQButtonBorder 3 class QCursor; -class QVBox; -class QWidgetStack; +class QFrame; +class QStackedWidget; class QY2Settings; class YEvent; class YQOptionalWidgetFactory; @@ -105,7 +105,7 @@ * cannot be created. **/ static YQApplication * yqApp(); - + /** * Widget event handlers (slots) call this when an event occured that * should be the answer to a UserInput() / PollInput() (etc.) call. @@ -521,7 +521,6 @@ QMap screenShotNo; QString screenShotNameTemplate; - protected slots: /** @@ -534,12 +533,6 @@ **/ void userInputTimeout(); - /** - * Sets @ref #leave_idle_loop to true. - **/ - void leaveIdleLoop( int ); - - protected: /** @@ -552,6 +545,7 @@ **/ void calcDefaultSize(); + void init_ui(); // // Data members @@ -577,12 +571,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; + QFrame * _main_win; /** * Stack for the Qt widgets inside the main window. **/ - QWidgetStack * _widget_stack; + QStackedWidget * _widget_stack; /** * Stack to keep track of the stacking order of popup dialogs. @@ -590,23 +584,11 @@ vector _popup_stack; /** - * Numeric ID for defaultsize dialogs for the widget stack - **/ - int _main_dialog_id; - - /** * Size for `opt(`defaultsize) dialogs. **/ QSize _default_size; /** - * A flag used during the idle loop. If it is set to true, - * the idle loop is left. This happens, if the ycp-ui-communication - * pipe to the ui gets readable. - **/ - bool _leave_idle_loop; - - /** * This flag is set during @ref #userInput in order to tell * @ref #returnNow to call exit_loop, which only may be called * after enter_loop. @@ -614,6 +596,12 @@ bool _do_exit_loop; /** + * Event loop object. Required since a YaST2 UI needs to react to commands + * from the YCP command stream as well as to X11 / Qt events. + **/ + QEventLoop * _eventLoop; + + /** * Window manager close events blocked? **/ bool _wm_close_blocked; @@ -642,7 +630,7 @@ /** * Timer for delayed busy cursor **/ - QTimer _busy_cursor_timer; + QTimer *_busy_cursor_timer; /** * The handler for the single pending event this UI keeps track of @@ -668,7 +656,10 @@ * Flag: Was the user already asked if he wants to use a left-handed mouse? **/ bool _askedForLeftHandedMouse; -}; + bool _ui_inited; + int _ui_argc; + char **_ui_argv; +}; #endif // YQUI_h Modified: branches/tmp/coolo/qt4-port/src/YQUIComponent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUIComponent.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUIComponent.h (original) +++ branches/tmp/coolo/qt4-port/src/YQUIComponent.h Mon Nov 26 11:13:17 2007 @@ -19,6 +19,9 @@ #ifndef YQUIComponent_h #define YQUIComponent_h +#define y2log_component "qt-ui" +#include + #include #include "YQUI.h" Modified: branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc Mon Nov 26 11:13:17 2007 @@ -25,11 +25,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #define y2log_component "qt-ui" @@ -204,12 +204,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 } } @@ -317,7 +317,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 @@ -336,7 +336,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 @@ -368,7 +368,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 @@ -388,7 +388,7 @@ normalCursor(); QString file_name = - QFileDialog::getOpenFileName( fromUTF8( startWith->value() ), + Q3FileDialog::getOpenFileName( fromUTF8( startWith->value() ), fromUTF8( filter->value() ), _main_win, // parent "file_selector", // name @@ -433,7 +433,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/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_core.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Mon Nov 26 11:13:17 2007 @@ -22,9 +22,10 @@ #include #include -#include -#include -#include +#include +#include <QStackedWidget> +#include <QDesktopWidget> +#include <QThread> #include #include @@ -46,24 +47,20 @@ #define BUSY_CURSOR_TIMEOUT 200 // milliseconds -#define KYAST_EMBEDDING 0 - YQUI * YQUI::_ui = 0; - static void qMessageHandler( QtMsgType type, const char * msg ); YQUI::YQUI( int argc, char **argv, bool with_threads, const char * macro_file ) : QObject() , YUI( with_threads ) , _main_win( NULL ) - , _main_dialog_id(0) - , _do_exit_loop( false ) + , _eventLoop( 0 ) , _wm_close_blocked( false ) , _auto_activate_dialogs( true ) { - y2debug( "YQUI constructor start" ); + y2milestone( "YQUI constructor start" ); _ui = this; _fatal_error = false; @@ -77,45 +74,75 @@ qInstallMsgHandler( qMessageHandler ); - y2debug( "Creating QApplication" ); - new QApplication( argc, argv ); + // Copy command line arguments for QApplication + + _ui_argv = (char **) malloc( (argc+1) * sizeof( const char * ) ); + _ui_argc = argc + 1; + + for ( int i=0; i < argc; i++ ) + _ui_argv[i+1] = strdup( argv[i] ); + + _ui_argv[0] = strdup( "YaST2" ); + _ui_inited = false; + + topmostConstructorHasFinished(); +} + +void YQUI::init_ui() +{ + if (_ui_inited) + return; + + /* + Qt thinks the first QObject defines the main thread, but + the main thread in this case is the ycp thread, not UI + */ + //extern void qt_set_current_thread_to_main_thread(); + //qt_set_current_thread_to_main_thread(); + + _ui_inited = true; + + new QApplication( _ui_argc, _ui_argv); + _busy_cursor_timer = new QTimer( qApp ); _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( _ui_argc, _ui_argv ); calcDefaultSize(); + // Event loop object. Required since a YaST2 UI needs to react to commands + // from the YCP command stream as well as to X11 / Qt events. + _eventLoop = new QEventLoop( qApp ); + _do_exit_loop = false; // Create main window for `opt(`defaultsize) dialogs. // // 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::Window; if ( ! _decorate_toplevel_window ) { y2debug( "Suppressing WM decorations for toplevel window" ); - wflags |= WStyle_Customize | WStyle_NoBorder; + wflags |= Qt::FramelessWindowHint; } - // if we have a window already, delete it - if (_main_win) - delete _main_win; - - _main_win = new QVBox( 0, 0, wflags ); // parent, name, wflags - + _main_win = new Q3VBox( 0, 0, wflags ); // parent, name, wflags + _main_win->setFocusPolicy( Qt::StrongFocus ); // Create widget stack for `opt(`defaultsize) dialogs - _widget_stack = new QWidgetStack( _main_win ); - _widget_stack->setFocusPolicy( QWidget::StrongFocus ); - qApp->setMainWidget( _main_win ); + _widget_stack = new QStackedWidget( _main_win ); + _widget_stack->setFocusPolicy( Qt::StrongFocus ); +#if 0 _main_win->installEventFilter( this ); +#endif + _main_win->resize( _default_size ); if ( _fullscreen || ! _have_wm ) @@ -170,12 +197,11 @@ // Workaround: Keep one more reference to libqt-mt open - dlopen() it here // and make sure there is no corresponding dlclose(). - 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, + QString qt_lib_name = QString( QTLIBDIR "/libQtGui.so.%1" ).arg( QT_VERSION >> 16 );; + void * qt_lib = dlopen( qt_lib_name.utf8().constData(), RTLD_GLOBAL ); + y2milestone( "Forcing %s open %s", qt_lib_name.utf8().constData(), qt_lib ? "successful" : "failed" ); - // Init other stuff qApp->setFont( yqApp()->currentFont() ); @@ -184,16 +210,15 @@ connect( & _user_input_timer, SIGNAL( timeout() ), this, SLOT ( userInputTimeout() ) ); - connect( & _busy_cursor_timer, SIGNAL( timeout() ), + connect( _busy_cursor_timer, SIGNAL( timeout() ), this, SLOT ( busyCursor() ) ); - if ( macro_file ) - playMacro( macro_file ); - - - topmostConstructorHasFinished(); +#warning macro_file + // if ( macro_file ) + // playMacro( macro_file ); - y2debug( "YQUI constructor end" ); + y2milestone( "YQUI constructor end %ld", QThread::currentThreadId () ); + qApp->processEvents(); } @@ -371,31 +396,27 @@ } } - void YQUI::idleLoop( int fd_ycp ) { - _leave_idle_loop = false; + init_ui(); - // process Qt events until fd_ycp is readable. - QSocketNotifier * notifier = new QSocketNotifier( fd_ycp, QSocketNotifier::Read ); - QObject::connect( notifier, SIGNAL( activated ( int ) ), - this, SLOT ( leaveIdleLoop( int ) ) ); + // runs in main thread + _eventLoop->wakeUp(); - notifier->setEnabled( true ); + fd_set rfds; - while ( !_leave_idle_loop ) - qApp->processOneEvent(); + FD_ZERO(&rfds); + FD_SET(fd_ycp, &rfds); - delete notifier; -} - - -void YQUI::leaveIdleLoop( int ) -{ - _leave_idle_loop = true; + while (true) + { + int retval = select(fd_ycp+1, &rfds, NULL, NULL, NULL); + if (retval) + break; + } + _eventLoop->exit(); } - void YQUI::sendEvent( YEvent * event ) { if ( event ) @@ -403,13 +424,17 @@ _event_handler.sendEvent( event ); if ( _do_exit_loop ) - qApp->exit_loop(); + _eventLoop->exit( 1 ); } } YEvent * YQUI::userInput( unsigned long timeout_millisec ) { + init_ui(); + + //y2milestone( "userInput %ld", QThread::currentThreadId () ); + YEvent * event = 0; YQDialog * dialog = dynamic_cast ( YDialog::currentDialog( false ) ); @@ -429,19 +454,17 @@ normalCursor(); _do_exit_loop = true; // should exit_loop() be called in sendEvent()? - while ( ! pendingEvent() ) - { - qApp->enter_loop(); - } + _eventLoop->processEvents(); _do_exit_loop = false; + event = _event_handler.consumePendingEvent(); dialog->activate( false ); // Display a busy cursor, but only if there is no other activity within // BUSY_CURSOR_TIMEOUT milliseconds (avoid cursor flicker) - _busy_cursor_timer.start( BUSY_CURSOR_TIMEOUT, true ); // single shot + _busy_cursor_timer->start( BUSY_CURSOR_TIMEOUT, true ); // single shot } if ( _user_input_timer.isActive() ) @@ -465,7 +488,7 @@ if ( dialog ) { dialog->activate( true ); - qApp->processEvents(); + //qApp->processEvents(); event = _event_handler.consumePendingEvent(); dialog->activate( false ); } @@ -487,23 +510,19 @@ YDialog * YQUI::createDialog( YWidgetOpt & opt ) { - bool has_defaultsize = opt.hasDefaultSize.value(); - QWidget * qt_parent = _main_win; + init_ui(); - // Popup dialogs get the topmost other popup dialog as their parent since - // some window managers (e.g., fvwm2 as used in the inst-sys) otherwise - // tend to confuse the stacking order of popup dialogs. - // - // This _popup_stack handling would be better placed in showDialog(), but we - // need the parent here for QWidget creation. libyui guarantees that each - // createDialog() will be followed by showDialog() for the same dialog - // without any chance for other dialogs to get in between. + y2milestone( "createDialog %ld", QThread::currentThreadId () ); + bool has_defaultsize = opt.hasDefaultSize.value(); + QWidget * qt_parent = + has_defaultsize ? _widget_stack : _main_win; + // FIXME: Probably obsolete if ( ! has_defaultsize && ! _popup_stack.empty() ) 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() ); @@ -524,8 +543,8 @@ if ( dialog->hasDefaultSize() ) { - _widget_stack->addWidget ( qw, ++_main_dialog_id ); - _widget_stack->raiseWidget( qw ); // maybe this is not necessary (?) + _widget_stack->addWidget ( qw ); + _widget_stack->setCurrentWidget( qw ); if ( ! _main_win->isVisible() ) { @@ -545,7 +564,8 @@ } ( (YQDialog *) dialog)->ensureOnlyOneDefaultButton(); - qApp->processEvents(); + + //qApp->processEvents(); } @@ -562,18 +582,6 @@ if ( dialog->hasDefaultSize() ) { _widget_stack->removeWidget( qw ); - - if ( --_main_dialog_id < 1 ) // nothing left on the stack - { - // y2milestone( "Hiding main window" ); - _main_win->hide(); - _main_dialog_id = 0; // this should not be necessary - but better be safe than sorry - } - else - { - // FIXME: This is anti-social behaviour - do this only in the inst-sys - _widget_stack->raiseWidget( _main_dialog_id ); - } } else // non-defaultsize dialog { @@ -634,10 +642,14 @@ switch (type) { case QtDebugMsg: - y2debug ("qt-debug: %s\n", msg); + y2milestone ("qt-debug: %s\n", msg); break; case QtWarningMsg: y2warning ("qt-warning: %s\n", msg); + //abort(); + break; + case QtCriticalMsg: + y2warning ("qt-critical: %s\n", msg); break; case QtFatalMsg: y2internal ("qt-fatal: %s\n", msg); Modified: branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc Mon Nov 26 11:13:17 2007 @@ -18,6 +18,7 @@ #define y2log_component "qt-ui" #include +#include #include "YQUI.h" Modified: branches/tmp/coolo/qt4-port/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_x11.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_x11.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_x11.cc Mon Nov 26 11:13:17 2007 @@ -19,14 +19,16 @@ /-*/ +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include +#include #define y2log_component "qt-ui" @@ -58,13 +60,13 @@ int YQUI::getDisplayDepth() { - return QColor::numBitPlanes(); + return qApp->desktop()->depth(); } long YQUI::getDisplayColors() { - return 1L << QColor::numBitPlanes(); + return 1L << qApp->desktop()->depth(); } @@ -104,15 +106,15 @@ void YQUI::busyCursor( void ) { - qApp->setOverrideCursor( Qt::busyCursor ); + qApp->setOverrideCursor( Qt::BusyCursor ); } void YQUI::normalCursor( void ) { - if ( _busy_cursor_timer.isActive() ) - _busy_cursor_timer.stop(); + if ( _busy_cursor_timer->isActive() ) + _busy_cursor_timer->stop(); while ( qApp->overrideCursor() ) qApp->restoreOverrideCursor(); @@ -222,23 +224,24 @@ { if ( obj == _main_win ) { - if ( _main_dialog_id > 0 ) +#ifdef FIXME_PROBABLY_OBSOLETE + if ( _widget_stack->count() > 0 ) { // Work around QWidgetStack bug: The last raiseWidget() call // (from closeDialog() ) might have failed if the widget was // invisible at that time, e.g., because the user had switched to // some other virtual desktop (bugzilla bug #11310) - _widget_stack->raiseWidget( _main_dialog_id ); + _widget_stack->setCurrentWidget( whatever ); } +#endif } else { return showEventFilter( obj, ev ); } } - - return false; // Don't stop event processing + return QObject::eventFilter( obj, ev ); } Modified: branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc Mon Nov 26 11:13:17 2007 @@ -24,11 +24,11 @@ #include "utf8.h" -YQWidgetCaption::YQWidgetCaption( QWidget * parent, +YQWidgetCaption::YQWidgetCaption( QWidget * parent, const string & text ) : QLabel( fromUTF8( text ), parent ) { - setTextFormat( QLabel::PlainText ); + setTextFormat( Qt::PlainText ); handleVisibility( text ); } @@ -36,7 +36,7 @@ YQWidgetCaption::YQWidgetCaption( QWidget * parent, const QString & text ) : QLabel( text, parent ) { - setTextFormat( QLabel::PlainText ); + setTextFormat( Qt::PlainText ); handleVisibility( text ); } Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWizard.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Mon Nov 26 11:13:17 2007 @@ -41,24 +41,30 @@ #include #include -#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" @@ -122,13 +128,18 @@ YWidgetID * abortButtonId, const string & abortButtonLabel, YWidgetID * nextButtonId, const string & nextButtonLabel, YWizardMode wizardMode ) - : QVBox( (QWidget *) parent->widgetRep() ) + : QFrame( (QWidget *) parent->widgetRep() ) , YWizard( parent, backButtonId, backButtonLabel, abortButtonId, abortButtonLabel, nextButtonId, nextButtonLabel, wizardMode ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + layout->setSpacing( 0 ); + layout->setMargin( 0 ); + setLayout( layout ); + setWidgetRep( this ); _stepsEnabled = (wizardMode == YWizardMode_Steps); @@ -193,15 +204,16 @@ else { QWidget * spacer = addVSpacing( this, WORK_AREA_TOP_MARGIN ); - CHECK_PTR( spacer ); + Q_CHECK_PTR( spacer ); # if ENABLE_GRADIENTS spacer->setPaletteBackgroundColor( _gradientTopColor ); # endif } - QHBox * hBox = new QHBox( this ); + Q3HBox * hBox = new Q3HBox( this ); YUI_CHECK_NEW( hBox ); + layout->addWidget( hBox ); layoutSideBar( hBox ); layoutWorkArea( hBox ); @@ -229,7 +241,7 @@ } - QHBox * titleBar = new QHBox( parent ); + Q3HBox * titleBar = new Q3HBox( parent ); YUI_CHECK_NEW( titleBar ); #if ENABLE_GRADIENTS @@ -283,7 +295,7 @@ void YQWizard::layoutSideBar( QWidget * parent ) { - _sideBar = new QWidgetStack( parent ); + _sideBar = new Q3WidgetStack( parent ); YUI_CHECK_NEW( _sideBar ); _sideBar->setMinimumWidth( YQUI::ui()->defaultSize( YD_HORIZ ) / 5 ); _sideBar->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred ) ); // hor/vert @@ -308,7 +320,7 @@ void YQWizard::layoutStepsPanel() { - _stepsPanel = new QVBox( _sideBar ); + _stepsPanel = new Q3VBox( _sideBar ); YUI_CHECK_NEW( _stepsPanel ); @@ -318,7 +330,7 @@ // Top gradient QLabel * topGradient = new QLabel( _stepsPanel ); - CHECK_PTR( topGradient ); + Q_CHECK_PTR( topGradient ); setGradient( topGradient, _topGradientPixmap ); } #endif @@ -328,7 +340,7 @@ _sideBar->addWidget( _stepsPanel ); - _stepsBox = new QVBox( _stepsPanel ); + _stepsBox = new Q3VBox( _stepsPanel ); YUI_CHECK_NEW( _stepsBox ); #if ENABLE_GRADIENTS _stepsBox->setPaletteBackgroundColor( _gradientCenterColor ); @@ -470,7 +482,7 @@ // 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 YUI_CHECK_NEW( _stepsGrid ); @@ -671,26 +683,26 @@ void YQWizard::layoutHelpPanel() { - _helpPanel = new QHBox( _sideBar ); + _helpPanel = new Q3HBox( _sideBar ); YUI_CHECK_NEW( _helpPanel ); _sideBar->addWidget( _helpPanel ); addGradientColumn( _helpPanel ); - QVBox * vbox = new QVBox( _helpPanel ); + Q3VBox * vbox = new Q3VBox( _helpPanel ); YUI_CHECK_NEW( vbox ); // Help browser - _helpBrowser = new QTextBrowser( vbox ); + _helpBrowser = new Q3TextBrowser( vbox ); YUI_CHECK_NEW( _helpBrowser ); _helpBrowser->setMimeSourceFactory( 0 ); _helpBrowser->installEventFilter( this ); _helpBrowser->setTextFormat( Qt::RichText ); _helpBrowser->setMargin( 4 ); - _helpBrowser->setResizePolicy( QScrollView::Manual ); + _helpBrowser->setResizePolicy( Q3ScrollView::Manual ); // Set help browser text color @@ -810,14 +822,14 @@ void YQWizard::layoutTreePanel() { - _treePanel = new QHBox( _sideBar ); + _treePanel = new Q3HBox( _sideBar ); YUI_CHECK_NEW( _treePanel ); _sideBar->addWidget( _treePanel ); // Left margin (with gradients) addGradientColumn( _treePanel ); - QVBox * vbox = new QVBox( _treePanel ); + Q3VBox * vbox = new Q3VBox( _treePanel ); YUI_CHECK_NEW( vbox ); @@ -834,11 +846,11 @@ 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 @@ -939,7 +951,7 @@ } -void YQWizard::sendTreeEvent( QListViewItem * listViewItem ) +void YQWizard::sendTreeEvent( Q3ListViewItem * listViewItem ) { if ( listViewItem ) { @@ -962,7 +974,7 @@ { if ( _tree ) { - QListViewItem * sel = _tree->selectedItem(); + Q3ListViewItem * sel = _tree->selectedItem(); if ( sel ) { @@ -979,14 +991,14 @@ -void YQWizard::layoutWorkArea( QHBox * parentHBox ) +void YQWizard::layoutWorkArea( QFrame * parentHBox ) { - QVBox * workAreaVBox = new QVBox( parentHBox ); + Q3VBox * workAreaVBox = new Q3VBox( parentHBox ); YUI_CHECK_NEW( workAreaVBox ); // An extra QVBox inside the workAreaVBox is needed for frame and margin - QVBox * workArea = new QVBox( workAreaVBox ); + Q3VBox * workArea = new Q3VBox( workAreaVBox ); YUI_CHECK_NEW( workArea ); #if ENABLE_GRADIENTS @@ -1004,7 +1016,7 @@ // 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 ); + _menuBarBox = new Q3VBox( workArea ); YUI_CHECK_NEW( _menuBarBox ); _menuBar = new QMenuBar( _menuBarBox ); @@ -1017,7 +1029,7 @@ // Dialog icon and heading // - QHBox * headingHBox = new QHBox( workArea ); + Q3HBox * headingHBox = new Q3HBox( workArea ); YUI_CHECK_NEW( headingHBox ); headingHBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert @@ -1042,7 +1054,7 @@ #if USE_SEPARATOR - QHBox * hbox = new QHBox( workArea ); + Q3HBox * hbox = new Q3HBox( workArea ); addHSpacing( hbox, SEPARATOR_MARGIN ); @@ -1079,7 +1091,7 @@ void YQWizard::layoutClientArea( QWidget * parent ) { - _clientArea = new QVBox( parent ); + _clientArea = new Q3VBox( parent ); YUI_CHECK_NEW( _clientArea ); _clientArea->setMargin( 4 ); @@ -1129,7 +1141,7 @@ YUI_CHECK_NEW( buttonBox ); // Using old-style layouts to enable a seamless background with the - // gradient pixmap: Any sub-widgets (QVBox, QHBox) would have to get yet + // gradient pixmap: Any sub-widgets (Q3VBox, 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. @@ -1353,7 +1365,7 @@ if ( ! parent ) return; - QVBox * vbox = new QVBox( parent ); + Q3VBox * vbox = new Q3VBox( parent ); YUI_CHECK_NEW( vbox ); #if ENABLE_GRADIENTS @@ -1401,7 +1413,7 @@ bool YQWizard::highColorDisplay() const { - return QColor::numBitPlanes() > 8; + return depth() > 8; } @@ -1454,7 +1466,7 @@ { if ( _dialogHeading ) { - if ( headingText ) + if ( ! headingText.isEmpty() ) _dialogHeading->setText( headingText ); else _dialogHeading->clear(); @@ -1484,7 +1496,7 @@ { if ( _helpBrowser ) { - if ( helpText ) + if ( ! helpText.isEmpty() ) { helpText.replace( "&product;", YQUI::ui()->productName() ); _helpBrowser->setText( helpText ); @@ -1569,7 +1581,7 @@ { if ( _menuBar ) { - QPopupMenu * menu = new QPopupMenu( _menuBar ); + Q3PopupMenu * menu = new Q3PopupMenu( _menuBar ); YUI_CHECK_NEW( menu ); _menuIDs.insert( id, menu ); @@ -1591,11 +1603,11 @@ const QString & text, const QString & id ) { - QPopupMenu * parentMenu = _menuIDs[ parentMenuID ]; + Q3PopupMenu * parentMenu = _menuIDs[ parentMenuID ]; if ( parentMenu ) { - QPopupMenu * menu = new QPopupMenu( _menuBar ); + Q3PopupMenu * menu = new Q3PopupMenu( _menuBar ); YUI_CHECK_NEW( menu ); _menuIDs.insert( id, menu ); @@ -1615,7 +1627,7 @@ const QString & text, const QString & idString ) { - QPopupMenu * parentMenu = _menuIDs[ parentMenuID ]; + Q3PopupMenu * parentMenu = _menuIDs[ parentMenuID ]; if ( parentMenu ) { @@ -1632,7 +1644,7 @@ void YQWizard::addMenuSeparator( const QString & parentMenuID ) { - QPopupMenu * parentMenu = _menuIDs[ parentMenuID ]; + Q3PopupMenu * parentMenu = _menuIDs[ parentMenuID ]; if ( parentMenu ) { @@ -1876,13 +1888,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() ); @@ -1896,7 +1908,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/coolo/qt4-port/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWizard.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.h (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.h Mon Nov 26 11:13:17 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 QFrame; 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 QFrame, public YWizard { Q_OBJECT @@ -365,7 +370,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. @@ -400,7 +405,7 @@ void layoutStepsPanel(); void layoutHelpPanel(); void layoutTreePanel(); - void layoutWorkArea ( QHBox * parentHBox ); + void layoutWorkArea ( QFrame * parentHBox ); void layoutClientArea( QWidget * parent ); void layoutButtonBox( QWidget * parent ); @@ -591,21 +596,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; @@ -616,10 +621,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; @@ -706,7 +711,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/coolo/qt4-port/src/YQWizardButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWizardButton.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizardButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizardButton.cc Mon Nov 26 11:13:17 2007 @@ -36,7 +36,7 @@ , _wizard( wizard ) { QPushButton * button = new QPushButton( fromUTF8( label ), buttonParent ); - CHECK_PTR( button ); + Q_CHECK_PTR( button ); setQPushButton( button ); setWidgetRep( button ); Modified: branches/tmp/coolo/qt4-port/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/Makefile.am?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/Makefile.am (original) +++ branches/tmp/coolo/qt4-port/src/pkg/Makefile.am Mon Nov 26 11:13:17 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,8 +21,7 @@ libpy2qt_pkg_la_LIBADD = \ -L$(plugindir) -lpy2UI \ - -L$(QTLIBDIR) -lqt-mt \ - -lX11 -lXext -lSM -lICE \ + -L$(QTLIBDIR) -lQtGui -lQt3Support \ ${ZYPP_LIBS} noinst_HEADERS = $(wildcard *.h) @@ -187,4 +183,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/coolo/qt4-port/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc Mon Nov 26 11:13:17 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 @@ -214,8 +216,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 ); @@ -228,19 +230,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 ); @@ -253,7 +255,7 @@ YQPackageSelector::layoutFilters( QWidget * parent ) { _filters = new QY2ComboTabWidget( _( "Fi<er:" ), parent ); - CHECK_PTR( _filters ); + Q_CHECK_PTR( _filters ); // @@ -266,7 +268,7 @@ || testMode() ) { _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); - CHECK_PTR( _updateProblemFilterView ); + Q_CHECK_PTR( _updateProblemFilterView ); _filters->addPage( _( "Update Problems" ), _updateProblemFilterView ); } } @@ -291,7 +293,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() ), @@ -316,7 +318,7 @@ { _selList = new YQPkgSelList( parent, true ); - CHECK_PTR( _selList ); + Q_CHECK_PTR( _selList ); _filters->addPage( _( "Selections" ), _selList ); connect( _selList, SIGNAL( statusChanged() ), @@ -338,7 +340,7 @@ // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); - CHECK_PTR( _rpmGroupTagsFilterView ); + Q_CHECK_PTR( _rpmGroupTagsFilterView ); _filters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); connect( this, SIGNAL( loadData() ), @@ -350,7 +352,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 @@ -367,7 +369,7 @@ // _repoFilterView = new YQPkgRepoFilterView( parent ); - CHECK_PTR( _repoFilterView ); + Q_CHECK_PTR( _repoFilterView ); _filters->addPage( _( "Repositories" ), _repoFilterView ); @@ -376,7 +378,7 @@ // _searchFilterView = new YQPkgSearchFilterView( parent ); - CHECK_PTR( _searchFilterView ); + Q_CHECK_PTR( _searchFilterView ); _filters->addPage( _( "Search" ), _searchFilterView ); @@ -385,7 +387,7 @@ // _statusFilterView = new YQPkgStatusFilterView( parent ); - CHECK_PTR( _statusFilterView ); + Q_CHECK_PTR( _statusFilterView ); _filters->addPage( _( "Installation Summary" ), _statusFilterView ); @@ -402,15 +404,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 ); @@ -426,7 +428,7 @@ YQPackageSelector::layoutPkgList( QWidget * parent ) { _pkgList= new YQPkgList( parent ); - CHECK_PTR( _pkgList ); + Q_CHECK_PTR( _pkgList ); connect( _pkgList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -438,14 +440,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 ); @@ -456,7 +458,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 @@ -469,7 +471,7 @@ // _pkgTechnicalDetailsView = new YQPkgTechnicalDetailsView( _detailsViews ); - CHECK_PTR( _pkgTechnicalDetailsView ); + Q_CHECK_PTR( _pkgTechnicalDetailsView ); _detailsViews->addTab( _pkgTechnicalDetailsView, _( "&Technical Data" ) ); @@ -482,7 +484,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 @@ -498,7 +500,7 @@ _pkgVersionsView = new YQPkgVersionsView( _detailsViews, true ); // userCanSwitchVersions - CHECK_PTR( _pkgVersionsView ); + Q_CHECK_PTR( _pkgVersionsView ); _detailsViews->addTab( _pkgVersionsView, _( "&Versions" ) ); @@ -513,7 +515,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 @@ -530,7 +532,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 @@ -544,14 +546,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(); @@ -562,13 +564,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() ), @@ -576,7 +578,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() ), @@ -590,7 +592,7 @@ YQPackageSelector::layoutMenuBar( QWidget * parent ) { _menuBar = new QMenuBar( parent ); - CHECK_PTR( _menuBar ); + Q_CHECK_PTR( _menuBar ); _fileMenu = 0; _viewMenu = 0; @@ -609,8 +611,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() ) ); @@ -628,24 +630,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 ); @@ -653,8 +655,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 ); @@ -671,8 +673,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 ); @@ -683,8 +685,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 @@ -705,8 +707,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 ); @@ -727,12 +729,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(); @@ -763,8 +765,8 @@ // Help menu // - _helpMenu = new QPopupMenu( _menuBar ); - CHECK_PTR( _helpMenu ); + _helpMenu = new Q3PopupMenu( _menuBar ); + Q_CHECK_PTR( _helpMenu ); _menuBar->insertSeparator(); _menuBar->insertItem( _( "&Help" ), _helpMenu ); @@ -772,10 +774,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() ) ); @@ -914,9 +916,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() ) ); @@ -1000,11 +1002,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(); } @@ -1101,8 +1103,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 } } } @@ -1111,7 +1113,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 Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h Mon Nov 26 11:13:17 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; @@ -314,12 +317,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/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Mon Nov 26 11:13:17 2007 @@ -19,11 +19,13 @@ /-*/ #include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include -#include +#include #include "QY2LayoutUtils.h" #include "YQPackageSelectorBase.h" @@ -48,7 +50,7 @@ YQPackageSelectorBase::YQPackageSelectorBase( YWidget * parent, long modeFlags ) - : QVBox( (QWidget *) parent->widgetRep() ) + : Q3VBox( (QWidget *) parent->widgetRep() ) , YPackageSelector( parent, modeFlags ) { setWidgetRep( this ); @@ -63,14 +65,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() ) ); @@ -134,7 +136,7 @@ YQUI::ui()->busyCursor(); int result = _pkgConflictDialog->verifySystem(); YQUI::ui()->normalCursor(); - + if ( result == QDialog::Accepted ) { QMessageBox::information( this, "", @@ -311,7 +313,7 @@ YQPackageSelectorBase::showPendingLicenseAgreements( ZyppPoolIterator begin, ZyppPoolIterator end ) { bool allConfirmed = true; - + for ( ZyppPoolIterator it = begin; it != end; ++it ) { ZyppSel sel = (*it); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h Mon Nov 26 11:13:17 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 @@ -196,7 +198,7 @@ bool _showChangesDialog; YQPkgConflictDialog * _pkgConflictDialog; YQPkgDiskUsageList * _diskUsageList; - QAction * _actionResetIgnoredDependencyProblems; + Q3Action * _actionResetIgnoredDependencyProblems; }; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.cc Mon Nov 26 11:13:17 2007 @@ -20,8 +20,8 @@ /-*/ #include -#include -#include +#include +#include #include #include @@ -106,8 +106,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 ); @@ -127,8 +127,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() ) @@ -140,7 +140,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(); } @@ -160,7 +160,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(); } @@ -172,11 +172,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() ) ); @@ -192,8 +192,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 ); @@ -201,11 +201,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 ); @@ -214,12 +214,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 ); @@ -232,14 +232,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() ), @@ -249,7 +249,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() ), @@ -257,7 +257,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/coolo/qt4-port/src/pkg/YQPatternSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPatternSelector.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQPatternSelector_h #define YQPatternSelector_h -#include +#include #include #include Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgChangesDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgChangesDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgChangesDialog.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc Mon Nov 26 11:13:17 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,10 +145,13 @@ // Busy popup - _busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent, 0, - WStyle_Customize | WStyle_DialogBorder | WStyle_Dialog ); + _busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent, 0 +#ifdef FIXME + , WType_Dialog +#endif + ); + Q_CHECK_PTR( _busyPopup ); - CHECK_PTR( _busyPopup ); _busyPopup->setCaption( "" ); _busyPopup->resize( _busyPopup->sizeHint() ); YQDialog::center( _busyPopup, parent ); @@ -180,7 +187,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 ); @@ -254,7 +261,7 @@ void YQPkgConflictDialog::prepareSolving() { - CHECK_PTR( _conflictList ); + Q_CHECK_PTR( _conflictList ); YQUI::ui()->busyCursor(); if ( isVisible() ) Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.h Mon Nov 26 11:13:17 2007 @@ -21,11 +21,14 @@ #define YQPkgConflictDialog_h #include +//Added by qt3to4: +#include +#include class YQPkgConflictList; class PMManager; class QPushButton; -class QPopupMenu; +class Q3PopupMenu; class QLabel; @@ -149,7 +152,7 @@ // YQPkgConflictList * _conflictList; - QPopupMenu * _expertMenu; + Q3PopupMenu * _expertMenu; QLabel * _busyPopup; double _totalSolveTime; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc Mon Nov 26 11:13:17 2007 @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -82,7 +84,7 @@ while ( it != problemList.end() ) { YQPkgConflict * conflict = new YQPkgConflict( this, *it ); - CHECK_PTR( conflict ); + Q_CHECK_PTR( conflict ); ++it; } @@ -94,7 +96,7 @@ { zypp::ProblemSolutionList userChoices; - QListViewItem * child = firstChild(); + Q3ListViewItem * child = firstChild(); while ( child ) { @@ -165,7 +167,7 @@ // Recursively write all items - const QListViewItem * item = firstChild(); + const Q3ListViewItem * item = firstChild(); while ( item ) { @@ -188,7 +190,7 @@ void YQPkgConflictList::saveItemToFile( FILE * file, - const QListViewItem * item ) const + const Q3ListViewItem * item ) const { if ( ! item || ! file ) return; @@ -201,16 +203,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: @@ -225,7 +227,7 @@ { // Recursively write children - const QListViewItem * child = item->firstChild(); + const Q3ListViewItem * child = item->firstChild(); while ( child ) { @@ -237,7 +239,7 @@ void -YQPkgConflictList::dumpList( QListViewItem * parent, +YQPkgConflictList::dumpList( Q3ListViewItem * parent, const QString & longText, const QString & header, int splitThreshold ) @@ -254,15 +256,15 @@ if ( ! header.isEmpty() ) { parent = new QY2ListViewItem( parent, header ); - 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(); + QList<QString>::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; @@ -331,8 +333,8 @@ // Heading for the choices // how to resolve this conflict _( "Conflict Resolution:" ), - QCheckListItem::Controller ); - CHECK_PTR( _resolutionsHeader ); + Q3CheckListItem::Controller ); + Q_CHECK_PTR( _resolutionsHeader ); _resolutionsHeader->setOpen( true ); _resolutionsHeader->setBackgroundColor( LIGHT_GREY ); @@ -362,7 +364,7 @@ zypp::ProblemSolution_Ptr YQPkgConflict::userSelectedResolution() { - QListViewItem * item = _resolutionsHeader->firstChild(); + Q3ListViewItem * item = _resolutionsHeader->firstChild(); while ( item ) { @@ -393,7 +395,7 @@ zypp::ProblemSolution_Ptr solution ) : QY2CheckListItem( parent, fromUTF8( solution->description() ), - QCheckListItem::RadioButton ) + Q3CheckListItem::RadioButton ) , _solution( solution ) { YQPkgConflictList::dumpList( this, fromUTF8( solution->details() ) ); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h Mon Nov 26 11:13:17 2007 @@ -30,7 +30,7 @@ #include -class QAction; +class Q3Action; class YQPkgConflict; class YQPkgConflictResolution; class YQPkgConflictDialog; @@ -108,7 +108,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 ); @@ -118,7 +118,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/coolo/qt4-port/src/pkg/YQPkgDescriptionDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionDialog.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDescriptionView.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.h Mon Nov 26 11:13:17 2007 @@ -22,7 +22,9 @@ #include #include -#include +#include +//Added by qt3to4: +#include typedef zypp::DiskUsageCounter::MountPoint ZyppPartitionDu; class YQPkgDiskUsageListItem; @@ -187,7 +189,7 @@ // Data members - QAsciiDict<YQPkgDiskUsageListItem> _items; + Q3AsciiDict<YQPkgDiskUsageListItem> _items; bool _debug; }; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageWarningDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageWarningDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageWarningDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageWarningDialog.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.cc Mon Nov 26 11:13:17 2007 @@ -31,7 +31,7 @@ YQPkgGenericDetailsView::YQPkgGenericDetailsView( QWidget * parent ) - : QTextBrowser( parent ) + : Q3TextBrowser( parent ) { _selectable = 0; _parentTab = dynamic_cast (parent); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQPkgGenericDetailsView_h #define YQPkgGenericDetailsView_h -#include +#include #include #include @@ -34,7 +34,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/coolo/qt4-port/src/pkg/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgLangList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgLangList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgLangList.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgList.h Mon Nov 26 11:13:17 2007 @@ -21,6 +21,8 @@ #define YQPkgList_h #include +//Added by qt3to4: +#include class YQPkgListItem; @@ -63,7 +65,7 @@ * * Reimplemented from YQPkgObjList. **/ - virtual QPopupMenu * addAllInListSubMenu( QPopupMenu * menu ); + virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); /** * Returns 'true' if there are any installed packages. @@ -117,7 +119,7 @@ * Reimplemented from YQPkgObjList. **/ virtual void pkgObjClicked( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -196,15 +198,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; }; @@ -267,7 +269,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h Mon Nov 26 11:13:17 2007 @@ -22,6 +22,9 @@ #include #include +//Added by qt3to4: +#include +#include #include <map> #include <list> #include @@ -30,8 +33,8 @@ #include class YQPkgObjListItem; -class QAction; -class QPopupMenu; +class Q3Action; +class Q3PopupMenu; using std::string; using std::list; @@ -102,7 +105,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 @@ -136,7 +139,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 @@ -174,7 +177,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 ); @@ -249,7 +252,7 @@ /** * Dispatcher slot for selection change - internal only. **/ - virtual void selectionChangedInternal( QListViewItem * item ); + virtual void selectionChangedInternal( Q3ListViewItem * item ); signals: @@ -287,13 +290,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. @@ -316,7 +319,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 ); @@ -324,7 +327,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, @@ -350,28 +353,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: @@ -526,7 +529,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; @@ -627,7 +630,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. @@ -718,7 +721,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: @@ -733,8 +736,8 @@ { public: - typedef std::map ItemMap; - typedef std::pair ItemPair; + typedef std::map ItemMap; + typedef std::pair ItemPair; typedef ItemMap::iterator iterator; /** @@ -754,13 +757,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. @@ -770,13 +773,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/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.cc Mon Nov 26 11:13:17 2007 @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -50,34 +52,27 @@ YQPkgPatchFilterView::YQPkgPatchFilterView( QWidget * parent ) - : QVBox( parent ) + : Q3VBox( parent ) { - QVBox * vbox; - _haveUpdateStackPatches = YQPkgPatchList::haveUpdateStackPatches(); + 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 ); - int index = 0; - - if ( _haveUpdateStackPatches ) - // Translators: This is about patches that patch the update engine (libzypp, YaST) itself - _patchFilter->insertItem( _( "Update Stack Patches" ), index++ ); - - _patchFilter->insertItem( _( "Installable Patches" ), index++ ); - _patchFilter->insertItem( _( "Installable and Installed Patches" ), index++ ); - _patchFilter->insertItem( _( "All Patches" ), index++ ); + _patchFilter->insertItem( _( "Installable Patches" ), 0 ); + _patchFilter->insertItem( _( "Installable and Installed Patches" ), 1 ); + _patchFilter->insertItem( _( "All Patches" ), 2 ); _patchFilter->setCurrentItem( 0 ); _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert label->setBuddy( _patchFilter ); @@ -85,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" ) ); @@ -103,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 @@ -125,7 +120,6 @@ connect( _patchList, SIGNAL( statusChanged() ), this, SLOT ( updateTotalDownloadSize() ) ); - fillPatchList(); updateTotalDownloadSize(); } @@ -218,14 +212,8 @@ void YQPkgPatchFilterView::fillPatchList() { - int currentIndex = _patchFilter->currentItem(); - - if ( _haveUpdateStackPatches ) - currentIndex--; - - switch ( currentIndex ) + switch ( _patchFilter->currentItem() ) { - case -1: _patchList->setFilterCriteria( YQPkgPatchList::UpdateStackPatches ); break; case 0: _patchList->setFilterCriteria( YQPkgPatchList::RelevantPatches ); break; case 1: _patchList->setFilterCriteria( YQPkgPatchList::RelevantAndInstalledPatches ); break; case 2: _patchList->setFilterCriteria( YQPkgPatchList::AllPatches ); break; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchFilterView.h Mon Nov 26 11:13:17 2007 @@ -22,7 +22,9 @@ #include "YQZypp.h" #include "YQPkgSelMapper.h" -#include +#include +//Added by qt3to4: +#include class YQPkgPatchList; @@ -37,7 +39,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 @@ -90,7 +92,6 @@ QLabel * _totalDownloadSize; YQPkgSelMapper _selMapper; - bool _haveUpdateStackPatches; }; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.cc Mon Nov 26 11:13:17 2007 @@ -22,8 +22,10 @@ #define y2log_component "qt-pkg" #include -#include -#include +#include +#include +//Added by qt3to4: +#include #include #include <set> @@ -34,8 +36,7 @@ #include "YQPkgTextDialog.h" -#define VERBOSE_PATCH_LIST 1 -#define DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES 0 +#define VERBOSE_PATCH_LIST 1 typedef zypp::ui::PatchContents ZyppPatchContents; @@ -69,10 +70,11 @@ setAllColumnsShowFocus( true ); setColumnAlignment( sizeCol(), Qt::AlignRight ); - connect( this, SIGNAL( selectionChanged ( QListViewItem * ) ), + connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); setSorting( categoryCol() ); + fillList(); y2debug( "Creating patch list done" ); } @@ -122,35 +124,6 @@ switch ( _filterCriteria ) { - case UpdateStackPatches: - - if ( zyppPatch->affects_pkg_manager() ) - { -#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES - displayPatch = true; -#endif - if ( selectable->hasCandidateObj() && - selectable->candidatePoolItem().status().isNeeded() ) - { - displayPatch = true; - - y2milestone( "Found YaST patch that should be installed: %s - %s", - zyppPatch->name().c_str(), - zyppPatch->summary().c_str() ); - } - - if ( selectable->hasInstalledObj() && - selectable->installedPoolItem().status().isIncomplete() ) // patch broken? - { - displayPatch = true; - - y2warning( "Installed YaST patch is broken: %s - %s", - zyppPatch->name().c_str(), - zyppPatch->summary().c_str() ); - } - } - break; - case RelevantPatches: // needed + broken + satisfied (but not installed) if ( selectable->hasInstalledObj() ) // installed? @@ -273,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 ) ); @@ -376,38 +349,10 @@ } -bool -YQPkgPatchList::haveUpdateStackPatches() -{ - for ( ZyppPoolIterator it = zyppPatchesBegin(); - it != zyppPatchesEnd(); - ++it ) - { - ZyppSel selectable = *it; - ZyppPatch zyppPatch = tryCastToZyppPatch( selectable->theObj() ); - - if ( zyppPatch && zyppPatch->affects_pkg_manager() ) - { -#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES - return true; -#else - if ( selectable->hasCandidateObj() && - selectable->candidatePoolItem().status().isNeeded() ) - { - return true; - } -#endif - } - } - - return false; -} - - YQPkgPatchListItem * YQPkgPatchList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; @@ -419,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 ); @@ -433,8 +378,8 @@ void YQPkgPatchList::createInstalledContextMenu() { - _installedContextMenu = new QPopupMenu( this ); - CHECK_PTR( _installedContextMenu ); + _installedContextMenu = new Q3PopupMenu( this ); + Q_CHECK_PTR( _installedContextMenu ); actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); @@ -449,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 ); @@ -482,7 +427,7 @@ #if ! ENABLE_DELETING_PATCHES if ( event->ascii() == '-' ) { - QListViewItem * selectedListViewItem = selectedItem(); + Q3ListViewItem * selectedListViewItem = selectedItem(); if ( selectedListViewItem ) { @@ -545,6 +490,13 @@ YQPkgPatchCategory +YQPkgPatchListItem::patchCategory( const string & category ) +{ + return patchCategory( fromUTF8( category ) ); +} + + +YQPkgPatchCategory YQPkgPatchListItem::patchCategory( QString category ) { category = category.lower(); @@ -636,7 +588,7 @@ * +1 if this > other **/ int -YQPkgPatchListItem::compare( QListViewItem * otherListViewItem, +YQPkgPatchListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h Mon Nov 26 11:13:17 2007 @@ -23,6 +23,9 @@ #include <string> #include "YQPkgObjList.h" #include "YQPkgSelMapper.h" +//Added by qt3to4: +#include +#include #define ENABLE_DELETING_PATCHES 1 @@ -66,7 +69,6 @@ enum FilterCriteria { - UpdateStackPatches, // zypp or YaST2 RelevantPatches, // needed + broken RelevantAndInstalledPatches, // needed + broken + installed AllPatches // all @@ -112,12 +114,6 @@ public: /** - * Return 'true' if there is any patch for the update stack in the pool - * that is not installed yet or that could be updated. - **/ - static bool haveUpdateStackPatches(); - - /** * Set the filter criteria for fillList(). **/ void setFilterCriteria( FilterCriteria filterCriteria ); @@ -143,7 +139,7 @@ * * Reimplemented from YQPkgObjList. **/ - virtual QPopupMenu * addAllInListSubMenu( QPopupMenu * menu ); + virtual Q3PopupMenu * addAllInListSubMenu( Q3PopupMenu * menu ); /** * Delayed initialization after the dialog is fully created. @@ -241,6 +237,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. @@ -275,7 +272,7 @@ * * Reimplemented from QListViewItem. **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.cc Mon Nov 26 11:13:17 2007 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "YQi18n.h" @@ -70,7 +70,7 @@ if ( autoFilter ) { - connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), + connect( this, SIGNAL( selectionChanged( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); } @@ -135,7 +135,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 ); } @@ -214,7 +214,7 @@ YQPkgPatternListItem * YQPkgPatternList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; @@ -225,7 +225,7 @@ void YQPkgPatternList::pkgObjClicked( int button, - QListViewItem * listViewItem, + Q3ListViewItem * listViewItem, int col, const QPoint & pos ) { @@ -252,7 +252,7 @@ void YQPkgPatternList::selectSomething() { - QListViewItemIterator it( this ); + Q3ListViewItemIterator it( this ); while ( *it ) { @@ -332,7 +332,7 @@ * +1 if this > other **/ int -YQPkgPatternListItem::compare( QListViewItem * otherListViewItem, +YQPkgPatternListItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -346,7 +346,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 ); } @@ -403,7 +403,7 @@ void YQPkgPatternCategoryItem::setOpen( bool open ) { - QListViewItem::setOpen( open ); + Q3ListViewItem::setOpen( open ); setTreeIcon(); } @@ -428,7 +428,7 @@ * +1 if this > other **/ int -YQPkgPatternCategoryItem::compare( QListViewItem * otherListViewItem, +YQPkgPatternCategoryItem::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { @@ -443,7 +443,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/coolo/qt4-port/src/pkg/YQPkgPatternList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatternList.h Mon Nov 26 11:13:17 2007 @@ -21,7 +21,7 @@ #define YQPkgPatternList_h #include "YQPkgObjList.h" -#include +#include class YQPkgPatternListItem; @@ -92,7 +92,7 @@ * Reimplemented from YQPkgObjList. **/ virtual void pkgObjClicked( int button, - QListViewItem * item, + Q3ListViewItem * item, int col, const QPoint & pos ); @@ -146,7 +146,7 @@ // Data members // - QDict<YQPkgPatternCategoryItem> _categories; + Q3Dict<YQPkgPatternCategoryItem> _categories; }; @@ -190,7 +190,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; @@ -259,7 +259,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/coolo/qt4-port/src/pkg/YQPkgProductDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgProductDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgProductDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgProductDialog.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoFilterView.h Mon Nov 26 11:13:17 2007 @@ -21,7 +21,7 @@ #define YQPkgRepoFilterView_h #include "YQZypp.h" -#include +#include class YQPkgRepoList; @@ -31,7 +31,7 @@ class YQPkgStatusFilterView; -class YQPkgRepoFilterView : public QVBox +class YQPkgRepoFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc Mon Nov 26 11:13:17 2007 @@ -51,7 +51,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()) ); @@ -118,7 +118,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 ) { @@ -204,7 +204,7 @@ YQPkgRepoListItem * YQPkgRepoList::selection() const { - QListViewItem * item = selectedItem(); + Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRpmGroupTagsFilterView.h Mon Nov 26 11:13:17 2007 @@ -21,7 +21,7 @@ #define YQPkgRpmGroupTagsFilterView_h #include "YQZypp.h" -#include +#include #include @@ -35,7 +35,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 @@ -69,7 +69,7 @@ **/ const string & selectedRpmGroup() const { return _selectedRpmGroup; } - + public slots: /** @@ -95,7 +95,7 @@ /** * Returns the internal RPM groups tree and fills it - * if it doesn't exist yet. + * if it doesn't exist yet. **/ static YRpmGroupsTree * rpmGroupsTree(); @@ -125,14 +125,14 @@ /** * Update _selectedRpmGroup and filter data **/ - void slotSelectionChanged( QListViewItem * newSelection ); + void slotSelectionChanged( Q3ListViewItem * newSelection ); + - protected: /** * Fill the internal RPM groups tree with RPM groups of all packages - * currently in the pool + * currently in the pool **/ static void fillRpmGroupsTree(); @@ -147,15 +147,15 @@ // // Data members // - + string _selectedRpmGroup; - + static YRpmGroupsTree * _rpmGroupsTree; }; -class YQPkgRpmGroupTag: public QListViewItem +class YQPkgRpmGroupTag: public Q3ListViewItem { public: Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.cc Mon Nov 26 11:13:17 2007 @@ -24,10 +24,11 @@ #include #include #include -#include -#include -#include +#include +#include #include +//Added by qt3to4: +#include #define y2log_component "qt-pkg" #include @@ -48,7 +49,7 @@ YQPkgSearchFilterView::YQPkgSearchFilterView( QWidget * parent ) - : QVBox( parent ) + : Q3VBox( parent ) { _matchCount = 0; setMargin( MARGIN ); @@ -58,25 +59,25 @@ // Headline QLabel * label = new QLabel( _( "Searc&h:" ), this ); - CHECK_PTR( label ); + Q_CHECK_PTR( label ); label->setFont( YQUI::yqApp()->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() ) ); @@ -87,19 +88,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 ); @@ -112,10 +113,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 ); @@ -133,7 +134,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 ); @@ -163,7 +164,7 @@ } - QVBox::keyPressEvent( event ); + Q3VBox::keyPressEvent( event ); } @@ -200,7 +201,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 @@ -213,7 +214,7 @@ progress.setMinimumDuration( 2000 ); // millisec QTime timer; - QRegExp regexp = _searchText->currentText(); + QRegExp regexp( _searchText->currentText() ); regexp.setCaseSensitive( _caseSensitive->isChecked() ); regexp.setWildcard( _searchMode->currentItem() == UseWildcards ); @@ -267,7 +268,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/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgSearchFilterView.h Mon Nov 26 11:13:17 2007 @@ -21,8 +21,10 @@ #define YQPkgSearchFilterView_h #include "YQZypp.h" -#include +#include #include +//Added by qt3to4: +#include class QComboBox; @@ -37,7 +39,7 @@ /** * @short Filter view for searching within packages **/ -class YQPkgSearchFilterView : public QVBox +class YQPkgSearchFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelDescriptionView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelDescriptionView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelDescriptionView.cc Mon Nov 26 11:13:17 2007 @@ -95,7 +95,7 @@ icon.replace( ' ', '_' ); } - if ( icon ) + if ( ! icon.isEmpty() ) { if ( icon.startsWith( "./" ) ) icon.replace( QRegExp( "^\\./" ), "" ); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgSelList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgSelList.h Mon Nov 26 11:13:17 2007 @@ -144,7 +144,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/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgStatusFilterView.h Mon Nov 26 11:13:17 2007 @@ -21,8 +21,10 @@ #define YQPkgStatusFilterView_h #include "YQZypp.h" -#include +#include #include +//Added by qt3to4: +#include class QComboBox; @@ -33,7 +35,7 @@ /** * @short Filter view for packages that made problems during update **/ -class YQPkgStatusFilterView : public QVBox +class YQPkgStatusFilterView : public Q3VBox { Q_OBJECT Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgTechnicalDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgTechnicalDetailsView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgTechnicalDetailsView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgTechnicalDetailsView.cc Mon Nov 26 11:13:17 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/coolo/qt4-port/src/pkg/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.cc Mon Nov 26 11:13:17 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() ), @@ -152,13 +156,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 ) { @@ -195,7 +199,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; } @@ -218,7 +222,7 @@ parent, acceptButtonLabel, rejectButtonLabel ); - CHECK_PTR( dia ); + Q_CHECK_PTR( dia ); bool confirmed = ( dia->exec() == QDialog::Accepted ); delete dia; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgTextDialog.h Mon Nov 26 11:13:17 2007 @@ -22,10 +22,12 @@ #include "YQZypp.h" #include +//Added by qt3to4: +#include #include class QPushButton; -class QTextBrowser; +class Q3TextBrowser; using std::string; @@ -173,7 +175,7 @@ QPushButton * _acceptButton; QPushButton * _rejectButton; - QTextBrowser * _textBrowser; + Q3TextBrowser * _textBrowser; }; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.cc Mon Nov 26 11:13:17 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='blue'>\n\ The packages in this list cannot be updated automatically.\n\ </font>\n\ </p>\n\ Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgUpdateProblemFilterView.h Mon Nov 26 11:13:17 2007 @@ -22,14 +22,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/coolo/qt4-port/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.cc Mon Nov 26 11:13:17 2007 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "YQPkgVersionsView.h" #include "YQPkgRepoList.h" @@ -119,8 +119,8 @@ return; QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str(), - QCheckListItem::Controller ); - CHECK_PTR( root ); + Q3CheckListItem::Controller ); + Q_CHECK_PTR( root ); root->setOpen( true ); bool installedIsAvailable = false; @@ -158,7 +158,7 @@ if ( ! firstChild() || ! _selectable ) return; - QListViewItem * item = firstChild()->firstChild(); + Q3ListViewItem * item = firstChild()->firstChild(); while ( item ) { @@ -241,8 +241,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 ) @@ -257,12 +257,12 @@ ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() ); if ( product ) - setText( productCol(), product->summary() ); + setText( productCol(), QString::fromStdString( product->summary() ) ); } if ( urlCol() >= 0 ) { zypp::Url repoUrl; - + if ( ! zyppObj->repository().info().baseUrlsEmpty() ) repoUrl = *zyppObj->repository().info().baseUrlsBegin(); @@ -308,7 +308,7 @@ * +1 if this > other **/ int -YQPkgVersion::compare( QListViewItem * otherListViewItem, +YQPkgVersion::compare( Q3ListViewItem * otherListViewItem, int col, bool ascending ) const { Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h Mon Nov 26 11:13:17 2007 @@ -167,7 +167,7 @@ * * Reimplemented from QListViewItem **/ - virtual int compare( QListViewItem * other, + virtual int compare( Q3ListViewItem * other, int col, bool ascending ) const; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.cc?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.cc Mon Nov 26 11:13:17 2007 @@ -19,8 +19,8 @@ /-*/ #include -#include -#include +#include +#include #include #include @@ -93,23 +93,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 ); @@ -119,12 +119,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 @@ -142,11 +142,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() ) ); @@ -163,14 +163,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() ), @@ -180,7 +180,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() ), @@ -188,7 +188,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/coolo/qt4-port/src/pkg/YQSimplePatchSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQSimplePatchSelector.h Mon Nov 26 11:13:17 2007 @@ -20,7 +20,7 @@ #ifndef YQSimplePatchSelector_h #define YQSimplePatchSelector_h -#include +#include #include #include Modified: branches/tmp/coolo/qt4-port/src/utf8.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/utf8.h?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/utf8.h (original) +++ branches/tmp/coolo/qt4-port/src/utf8.h Mon Nov 26 11:13:17 2007 @@ -23,16 +23,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/coolo/qt4-port/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/yast2-qt.spec.in?rev=42380&r1=42379&r2=42380&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/yast2-qt.spec.in (original) +++ branches/tmp/coolo/qt4-port/yast2-qt.spec.in Mon Nov 26 11:13:17 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