Author: dmacvicar
Date: Sun Dec 9 22:06:23 2007
New Revision: 42883
URL: http://svn.opensuse.org/viewcvs/yast?rev=42883&view=rev
Log:
misc compile
Modified:
trunk/qt4/src/QY2ComboTabWidget.cc
trunk/qt4/src/QY2ComboTabWidget.h
trunk/qt4/src/pkg/YQPackageSelectorBase.cc
trunk/qt4/src/pkg/YQPatternSelector.cc
trunk/qt4/src/pkg/YQPatternSelector.h
trunk/qt4/src/pkg/YQPkgDiskUsageList.cc
trunk/qt4/src/pkg/YQPkgDiskUsageList.h
trunk/qt4/src/pkg/YQPkgPatchList.h
trunk/qt4/src/pkg/YQPkgPatternList.h
trunk/qt4/src/pkg/YQPkgStatusFilterView.cc
trunk/qt4/src/pkg/YQPkgStatusFilterView.h
trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.cc
trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.h
trunk/qt4/src/pkg/YQSimplePatchSelector.cc
trunk/qt4/src/pkg/YQSimplePatchSelector.h
Modified: trunk/qt4/src/QY2ComboTabWidget.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/QY2ComboTabWidget.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/QY2ComboTabWidget.cc (original)
+++ trunk/qt4/src/QY2ComboTabWidget.cc Sun Dec 9 22:06:23 2007
@@ -96,7 +96,7 @@
void
-QY2ComboTabWidget::showPage( int index )
+QY2ComboTabWidget::showPageIndex( int index )
{
QWidget * page = pages[ index ];
Modified: trunk/qt4/src/QY2ComboTabWidget.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/QY2ComboTabWidget.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/QY2ComboTabWidget.h (original)
+++ trunk/qt4/src/QY2ComboTabWidget.h Sun Dec 9 22:06:23 2007
@@ -87,7 +87,7 @@
* Show a page identified by its index. Does NOT update the combo box
* contents.
**/
- void showPage( int index );
+ void showPageIndex( int index );
protected:
Modified: trunk/qt4/src/pkg/YQPackageSelectorBase.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPackageSelectorBase.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPackageSelectorBase.cc (original)
+++ trunk/qt4/src/pkg/YQPackageSelectorBase.cc Sun Dec 9 22:06:23 2007
@@ -19,7 +19,7 @@
/-*/
#include <QMessageBox>
-#include <QEvent>
+#include <QKeyEvent>
#define y2log_component "qt-pkg"
#include
Modified: trunk/qt4/src/pkg/YQPatternSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPatternSelector.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPatternSelector.cc (original)
+++ trunk/qt4/src/pkg/YQPatternSelector.cc Sun Dec 9 22:06:23 2007
@@ -246,14 +246,17 @@
void
YQPatternSelector::layoutButtons( QWidget * parent )
{
- Q3HBox * button_box = new Q3HBox( parent );
+ QWidget *button_box = new QWidget(parent);
+ QHBoxLayout *layout = new QHBoxLayout(button_box);
+
Q_CHECK_PTR( button_box );
- button_box->setMargin ( MARGIN );
- button_box->setSpacing( SPACING );
+ layout->setMargin ( MARGIN );
+ layout->setSpacing( SPACING );
- parent->layout()->addWidget( button_box );
+ button_box->setLayout(layout);
QPushButton * details_button = new QPushButton( _( "&Details..." ), button_box );
+ layout->addWidget(details_button);
Q_CHECK_PTR( details_button );
details_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
@@ -261,10 +264,11 @@
this, SLOT ( detailedPackageSelection() ) );
- addHStretch( button_box );
+ layout->addStretch();
QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box );
Q_CHECK_PTR( cancel_button );
+ layout->addWidget(cancel_button);
cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
connect( cancel_button, SIGNAL( clicked() ),
@@ -273,6 +277,7 @@
QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box );
Q_CHECK_PTR( accept_button );
+ layout->addWidget(accept_button);
accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
connect( accept_button, SIGNAL( clicked() ),
Modified: trunk/qt4/src/pkg/YQPatternSelector.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPatternSelector.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPatternSelector.h (original)
+++ trunk/qt4/src/pkg/YQPatternSelector.h Sun Dec 9 22:06:23 2007
@@ -20,8 +20,7 @@
#ifndef YQPatternSelector_h
#define YQPatternSelector_h
-#include
-#include
+#include <QColor>
#include
#include "YQPackageSelectorBase.h"
Modified: trunk/qt4/src/pkg/YQPkgDiskUsageList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgDiskUsageList.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgDiskUsageList.cc (original)
+++ trunk/qt4/src/pkg/YQPkgDiskUsageList.cc Sun Dec 9 22:06:23 2007
@@ -83,7 +83,7 @@
YQPkgDiskUsageListItem * item = new YQPkgDiskUsageListItem( this, partitionDu );
Q_CHECK_PTR( item );
item->updateData();
- _items.insert( partitionDu.dir.c_str(), item );
+ _items.insert( QByteArray(partitionDu.dir.c_str()), item );
}
}
Modified: trunk/qt4/src/pkg/YQPkgDiskUsageList.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgDiskUsageList.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgDiskUsageList.h (original)
+++ trunk/qt4/src/pkg/YQPkgDiskUsageList.h Sun Dec 9 22:06:23 2007
@@ -22,9 +22,9 @@
#include
#include
-#include
-//Added by qt3to4:
-#include
+#include <QKeyEvent>
+#include <QHash>
+#include <QByteArray>
typedef zypp::DiskUsageCounter::MountPoint ZyppPartitionDu;
class YQPkgDiskUsageListItem;
@@ -189,7 +189,7 @@
// Data members
- Q3AsciiDict<YQPkgDiskUsageListItem> _items;
+ QHash _items;
bool _debug;
};
Modified: trunk/qt4/src/pkg/YQPkgPatchList.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgPatchList.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgPatchList.h (original)
+++ trunk/qt4/src/pkg/YQPkgPatchList.h Sun Dec 9 22:06:23 2007
@@ -23,7 +23,6 @@
#include <string>
#include "YQPkgObjList.h"
#include "YQPkgSelMapper.h"
-//Added by qt3to4:
#include <QTreeWidgetItem>
#include <QEvent>
#include <QMenu>
Modified: trunk/qt4/src/pkg/YQPkgPatternList.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgPatternList.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgPatternList.h (original)
+++ trunk/qt4/src/pkg/YQPkgPatternList.h Sun Dec 9 22:06:23 2007
@@ -21,7 +21,7 @@
#define YQPkgPatternList_h
#include "YQPkgObjList.h"
-#include
+#include <QMap>
class YQPkgPatternListItem;
@@ -152,7 +152,7 @@
// Data members
//
- Q3Dict<YQPkgPatternCategoryItem> _categories;
+ QMap _categories;
};
Modified: trunk/qt4/src/pkg/YQPkgStatusFilterView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgStatusFilterView.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgStatusFilterView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgStatusFilterView.cc Sun Dec 9 22:06:23 2007
@@ -18,13 +18,12 @@
/-*/
-#include
-#include
-#include
-#include
-#include
-//Added by qt3to4:
-#include
+#include <QCheckBox>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QPixmap>
#define y2log_component "qt-pkg"
#include
@@ -42,12 +41,15 @@
YQPkgStatusFilterView::YQPkgStatusFilterView( QWidget * parent )
- : Q3VBox( parent )
+ : QWidget( parent )
{
- setMargin( MARGIN );
- setSpacing( SPACING );
+ QVBoxLayout *layout = new QVBoxLayout(this);
+ setLayout(layout);
+
+ layout->setMargin( MARGIN );
+ layout->setSpacing( SPACING );
- addVStretch( this );
+ layout->addStretch();
#if 0
// Headline
@@ -61,8 +63,10 @@
// Packages with what status to show
//
- Q3GroupBox * gbox = new Q3GroupBox( 3, Qt::Horizontal, _( "Show packages with status" ), this );
+ QGroupBox * gbox = new QGroupBox( _( "Show packages with status" ), this );
Q_CHECK_PTR( gbox );
+ QHBoxLayout *hlayout = new QHBoxLayout;
+ gbox->setLayout(hlayout);
_showDel = addStatusCheckBox( gbox, _( "Delete" ), YQIconPool::disabledPkgDel(), true );
_showInstall = addStatusCheckBox( gbox, _( "Install" ), YQIconPool::disabledPkgInstall(), true );
@@ -73,32 +77,43 @@
_showTaboo = addStatusCheckBox( gbox, _( "Taboo" ), YQIconPool::disabledPkgTaboo(), true );
_showProtected = addStatusCheckBox( gbox, _( "Protected" ), YQIconPool::disabledPkgProtected(), true );
- addVSpacing( gbox, 8 );
- addHStretch( gbox ); // For the other columns of the QGroupBox ( prevent wraparound )
- addHStretch( gbox );
+ hlayout->addWidget(_showDel);
+ hlayout->addWidget(_showInstall);
+ hlayout->addWidget(_showUpdate);
+ hlayout->addWidget(_showAutoDel);
+ hlayout->addWidget(_showAutoInstall);
+ hlayout->addWidget(_showAutoUpdate);
+ hlayout->addWidget(_showTaboo);
+ hlayout->addWidget(_showProtected);
+
+ hlayout->addSpacing( 8 );
+ hlayout->addStretch(); // For the other columns of the QGroupBox ( prevent wraparound )
+ hlayout->addStretch();
_showKeepInstalled = addStatusCheckBox( gbox, _( "Keep" ), YQIconPool::disabledPkgKeepInstalled(), false );
_showNoInst = addStatusCheckBox( gbox, _( "Do not install" ), YQIconPool::disabledPkgNoInst(), false );
- addVStretch( this );
+ layout->addStretch();
// Box for refresh button
- Q3HBox * hbox = new Q3HBox( this );
- Q_CHECK_PTR( hbox );
+ hlayout = new QHBoxLayout();
+ layout->addLayout(hlayout);
- addHStretch( hbox );
+ hlayout->addStretch();
// Refresh button
- _refreshButton = new QPushButton( _( "&Refresh List" ), hbox );
+ _refreshButton = new QPushButton( _( "&Refresh List" ), this );
Q_CHECK_PTR( _refreshButton );
- addHStretch( hbox );
+ hlayout->addWidget(_refreshButton);
+
+ hlayout->addStretch();
connect( _refreshButton, SIGNAL( clicked() ),
this, SLOT ( filter() ) );
for ( int i=0; i < 6; i++ )
- addVStretch( this );
+ layout->addStretch();
}
Modified: trunk/qt4/src/pkg/YQPkgStatusFilterView.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgStatusFilterView.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgStatusFilterView.h (original)
+++ trunk/qt4/src/pkg/YQPkgStatusFilterView.h Sun Dec 9 22:06:23 2007
@@ -21,10 +21,9 @@
#define YQPkgStatusFilterView_h
#include "YQZypp.h"
-#include
-#include
-//Added by qt3to4:
-#include
+#include <QWidget>
+#include <QRegExp>
+#include <QPixmap>
class QComboBox;
@@ -35,7 +34,7 @@
/**
* @short Filter view for packages that made problems during update
**/
-class YQPkgStatusFilterView : public Q3VBox
+class YQPkgStatusFilterView : public QWidget
{
Q_OBJECT
Modified: trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.cc Sun Dec 9 22:06:23 2007
@@ -33,7 +33,7 @@
YQPkgUpdateProblemFilterView::YQPkgUpdateProblemFilterView( QWidget * parent )
- : Q3TextBrowser( parent )
+ : QTextBrowser( parent )
{
QString html = _( "\
<br>\n\
@@ -56,8 +56,7 @@
</p>\
" );
- setTextFormat( Qt::RichText );
- setText( html );
+ setHtml( html );
}
Modified: trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.h (original)
+++ trunk/qt4/src/pkg/YQPkgUpdateProblemFilterView.h Sun Dec 9 22:06:23 2007
@@ -22,14 +22,14 @@
#include "YQZypp.h"
-#include
+#include <QTextBrowser>
#include "YQPkgSelMapper.h"
/**
* @short Filter view for packages that made problems during update
**/
-class YQPkgUpdateProblemFilterView : public Q3TextBrowser
+class YQPkgUpdateProblemFilterView : public QTextBrowser
{
Q_OBJECT
Modified: trunk/qt4/src/pkg/YQSimplePatchSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQSimplePatchSelector.cc?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQSimplePatchSelector.cc (original)
+++ trunk/qt4/src/pkg/YQSimplePatchSelector.cc Sun Dec 9 22:06:23 2007
@@ -174,24 +174,28 @@
void
YQSimplePatchSelector::layoutButtons( QWidget * parent )
{
- Q3HBox * button_box = new Q3HBox( parent );
+ QWidget * button_box = new QWidget( parent );
+ QHBoxLayout *layout = new QHBoxLayout;
Q_CHECK_PTR( button_box );
- button_box->setMargin ( MARGIN );
- button_box->setSpacing( SPACING );
+ button_box->setLayout(layout);
+ layout->setMargin ( MARGIN );
+ layout->setSpacing( SPACING );
QPushButton * details_button = new QPushButton( _( "&Details..." ), button_box );
Q_CHECK_PTR( details_button );
+ layout->addWidget(details_button);
details_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
connect( details_button, SIGNAL( clicked() ),
this, SLOT ( detailedPackageSelection() ) );
- addHStretch( button_box );
+ layout->addStretch();
QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box );
Q_CHECK_PTR( cancel_button );
+ layout->addWidget(cancel_button);
cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
connect( cancel_button, SIGNAL( clicked() ),
@@ -200,6 +204,7 @@
QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box );
Q_CHECK_PTR( accept_button );
+ layout->addWidget(accept_button);
accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
connect( accept_button, SIGNAL( clicked() ),
Modified: trunk/qt4/src/pkg/YQSimplePatchSelector.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQSimplePatchSelector.h?rev=42883&r1=42882&r2=42883&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQSimplePatchSelector.h (original)
+++ trunk/qt4/src/pkg/YQSimplePatchSelector.h Sun Dec 9 22:06:23 2007
@@ -20,8 +20,7 @@
#ifndef YQSimplePatchSelector_h
#define YQSimplePatchSelector_h
-#include
-#include
+#include <QColor>
#include
#include "YQPackageSelectorBase.h"
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
