Author: coolo
Date: Fri Nov 30 13:18:22 2007
New Revision: 42552
URL: http://svn.opensuse.org/viewcvs/yast?rev=42552&view=rev
Log:
compile some more
Modified:
branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc
branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h
branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc
branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc
branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc
branches/tmp/coolo/qt4-port/src/YQProgressBar.cc
branches/tmp/coolo/qt4-port/src/YQRadioButton.cc
branches/tmp/coolo/qt4-port/src/YQRichText.cc
branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc
branches/tmp/coolo/qt4-port/src/YQSlider.cc
branches/tmp/coolo/qt4-port/src/YQTable.cc
branches/tmp/coolo/qt4-port/src/YQTree.cc
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/YQWidgetFactory.cc
branches/tmp/coolo/qt4-port/src/YQWizard.cc
branches/tmp/coolo/qt4-port/src/YQWizardButton.cc
branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc
branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h
branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h
branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc
branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Fri Nov 30 13:18:22 2007
@@ -16,6 +16,7 @@
/-*/
+#define QT3_SUPPORT 1
#include
#include
@@ -55,15 +56,15 @@
YUI_CHECK_NEW( _caption );
layout->addWidget( _caption );
- _qt_listView = new QTreeWidget( this );
+ _qt_listView = new Q3ListView( this );
YUI_CHECK_NEW( _qt_listView );
layout->addWidget( _qt_listView );
_qt_listView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
- _qt_listView->setHeaderLabels( QStringList("") ); // QListView doesn't have one single column by default!
- _qt_listView->setSorting(0, false );
-// FIXME _qt_listView->header()->setStretchEnabled( true );
-// FIXME _qt_listView->header()->hide();
+ _qt_listView->addColumn( "" ); // QListView doesn't have one single column by default!
+ _qt_listView->setSorting( 0, false );
+ _qt_listView->header()->setStretchEnabled( true );
+ _qt_listView->header()->hide();
_caption->setBuddy( _qt_listView );
// Very small default size if specified
@@ -110,7 +111,7 @@
// Take care of the QListView's keyboard focus
if ( ! _qt_listView->selectedItem() )
- msbItem->setSelected( true );
+ _qt_listView->setSelected( msbItem, true );
}
@@ -130,7 +131,7 @@
YQSignalBlocker sigBlocker( _qt_listView );
YMultiSelectionBox::deselectAllItems();
- QTreeWidgetItemIterator it( _qt_listView );
+ Q3ListViewItemIterator it( _qt_listView );
while ( *it )
{
@@ -179,7 +180,7 @@
// For the purpose of this function, QListView::currentItem() is the
// minimum requirement.
- QTreeWidgetItem * currentQItem = _qt_listView->currentItem();
+ Q3ListViewItem * currentQItem = _qt_listView->currentItem();
if ( currentQItem )
{
@@ -213,7 +214,7 @@
YQMultiSelectionBoxItem * msbItem = findItem( yItem );
if ( msbItem )
- msbItem->setSelected( true );
+ _qt_listView->setSelected( msbItem, true );
// This does NOT change the item's check box!
// (see explanations in YQMultiSelectionBox::currentItem() avove)
@@ -226,14 +227,14 @@
{
_caption->setEnabled( enabled );
_qt_listView->setEnabled( enabled );
- //FIXME _qt_listView->triggerUpdate();
+ _qt_listView->triggerUpdate();
YWidget::setEnabled( enabled );
}
int YQMultiSelectionBox::preferredWidth()
{
- int hintWidth = !_caption->isHidden() ?
+ int hintWidth = _caption->isShown() ?
_caption->sizeHint().width() + frameWidth() : 0;
return max( 80, hintWidth );
@@ -242,7 +243,7 @@
int YQMultiSelectionBox::preferredHeight()
{
- int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0;
+ int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0;
int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES;
hintHeight += visibleLines * _qt_listView->fontMetrics().lineSpacing();
hintHeight += _qt_listView->frameWidth() * 2;
@@ -301,7 +302,7 @@
YQMultiSelectionBox::findItem( YItem * wantedItem )
{
// FIXME: Don't search through all items, use the YItem::data() pointer instead
- QTreeWidgetItemIterator it( _qt_listView );
+ Q3ListViewItemIterator it( _qt_listView );
while ( *it )
{
@@ -325,9 +326,9 @@
YQMultiSelectionBoxItem::YQMultiSelectionBoxItem( YQMultiSelectionBox * parent,
- QTreeWidget * listView,
+ Q3ListView * listView,
YItem * yItem )
- : QTreeWidgetItem( listView, fromUTF8( yItem->label() ) )
+ : Q3CheckListItem( listView, fromUTF8( yItem->label() ), Q3CheckListItem::CheckBox )
, _yItem( yItem )
, _multiSelectionBox( parent )
{
@@ -342,7 +343,7 @@
{
_yItem->setSelected( newState );
_multiSelectionBox->sendValueChanged();
- //FIXME Q3CheckListItem::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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Fri Nov 30 13:18:22 2007
@@ -21,7 +21,8 @@
#define YQMultiSelectionBox_h
#include <QFrame>
-#include <QTreeWidgetItem>
+#include <QColorGroup>
+#include <Q3CheckListItem>
#include
#include "YMultiSelectionBox.h"
@@ -163,19 +164,19 @@
YQWidgetCaption * _caption;
- QTreeWidget * _qt_listView;
+ Q3ListView * _qt_listView;
};
-class YQMultiSelectionBoxItem: public QTreeWidgetItem
+class YQMultiSelectionBoxItem: public Q3CheckListItem
{
public:
/**
* Constructor.
**/
YQMultiSelectionBoxItem( YQMultiSelectionBox * parent,
- QTreeWidget * listView,
+ Q3ListView * listView,
YItem * yItem );
/**
Modified: branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc?rev=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc Fri Nov 30 13:18:22 2007
@@ -16,6 +16,8 @@
/-*/
+#define QT3_SUPPORT
+
#include "YQOptionalWidgetFactory.h"
#include "YQUI.h"
#include "YUIException.h"
Modified: branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc?rev=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc Fri Nov 30 13:18:22 2007
@@ -18,6 +18,8 @@
/-*/
+#define QT3_SUPPORT 1
+
#include "YQPackageSelectorPlugin.h"
#define y2log_component "qt-ui"
#include
Modified: branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc?rev=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc Fri Nov 30 13:18:22 2007
@@ -16,6 +16,7 @@
/-*/
+#define QT3_SUPPORT
#define y2log_component "qt-ui"
#include
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQProgressBar.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQProgressBar.cc Fri Nov 30 13:18:22 2007
@@ -49,7 +49,7 @@
_caption = new YQWidgetCaption( this, label );
YUI_CHECK_NEW( _caption );
layout->addWidget( _caption );
-
+
_qt_progressbar = new QProgressBar( this );
_qt_progressbar->setRange(0, maxValue);
YUI_CHECK_NEW( _qt_progressbar );
@@ -90,7 +90,7 @@
int YQProgressBar::preferredWidth()
{
- int hintWidth = _caption->isShown() ?
+ int hintWidth = !_caption->isHidden() ?
_caption->sizeHint().width() + layout()->margin() : 0;
return max( 200, hintWidth );
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQRadioButton.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQRadioButton.cc Fri Nov 30 13:18:22 2007
@@ -16,6 +16,7 @@
/-*/
+#define QT3_SUPPORT
#include
#include <QMouseEvent>
@@ -54,7 +55,7 @@
QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight );
_qt_radioButton = new QRadioButton( fromUTF8( label ), this );
-
+
layout->addSpacing( SPACING );
layout->addWidget( _qt_radioButton );
layout->addSpacing( SPACING );
@@ -73,7 +74,7 @@
_qt_radioButton->setFont( useBold ?
YQUI::yqApp()->boldFont() :
YQUI::yqApp()->currentFont() );
-
+
YRadioButton::setUseBoldFont( useBold );
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQRichText.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQRichText.cc Fri Nov 30 13:18:22 2007
@@ -16,10 +16,12 @@
/-*/
+#define QT3_SUPPORT
#define y2log_component "qt-ui"
#include
+#include <QColorGroup>
#include
#include
#include
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc Fri Nov 30 13:18:22 2007
@@ -16,6 +16,7 @@
/-*/
+#define QT3_SUPPORT
#include
#include
@@ -187,7 +188,7 @@
int YQSelectionBox::preferredWidth()
{
- int hintWidth = _caption->isShown() ?
+ int hintWidth = !_caption->isHidden() ?
_caption->sizeHint().width() + frameWidth() : 0;
return max( 80, hintWidth );
@@ -196,7 +197,7 @@
int YQSelectionBox::preferredHeight()
{
- int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0;
+ int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0;
int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES;
hintHeight += visibleLines * _qt_listBox->fontMetrics().lineSpacing();
hintHeight += _qt_listBox->frameWidth() * 2;
@@ -316,7 +317,8 @@
void YQSelectionBox::returnDelayed()
{
y2debug( "Starting selbox timer" );
- _timer.start( 250, true ); // millisec, singleShot
+ _timer.setSingleShot( true );
+ _timer.start( 250 ); // millisec
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQSlider.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQSlider.cc Fri Nov 30 13:18:22 2007
@@ -16,7 +16,7 @@
/-*/
-
+#define QT3_SUPPORT
#include
#include
#include
@@ -54,7 +54,7 @@
_caption = new YQWidgetCaption( this, label );
YUI_CHECK_NEW( _caption );
layout->addWidget( _caption );
-
+
_hbox = new QFrame( this );
YUI_CHECK_NEW( _hbox );
layout->addWidget( _hbox );
@@ -76,7 +76,7 @@
{
_caption->setAlignment( Qt::AlignRight );
}
-
+
_qt_slider = new QSlider( minValue, maxValue,
1, // pageStep
initialValue,
@@ -92,7 +92,7 @@
layout->addWidget( _qt_spinBox );
}
YUI_CHECK_NEW( _qt_spinBox );
-
+
_qt_spinBox->setValue( initialValue );
_caption->setBuddy( _qt_spinBox );
@@ -137,7 +137,7 @@
{
if ( notify() )
YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) );
-
+
emit valueChanged( newValue );
}
@@ -155,8 +155,8 @@
int
YQSlider::preferredWidth()
{
- int hintWidth = _caption->isShown() ? _caption->sizeHint().width() : 0;
-
+ int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() : 0;
+
// Arbitrary value - there is no really good default
return max( 200, hintWidth );
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQTable.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQTable.cc Fri Nov 30 13:18:22 2007
@@ -56,7 +56,7 @@
{
//FIXME _qt_listView->addColumn( fromUTF8( header( i ) ) );
- int qt_alignment = Qt::Left;
+ int qt_alignment = Qt::AlignLeft;
switch ( alignment( i ) )
{
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQTree.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQTree.cc Fri Nov 30 13:18:22 2007
@@ -16,7 +16,8 @@
/-*/
-
+#define QT3_SUPPORT
+#include <QColorGroup>
#include
#include
#include
@@ -213,7 +214,7 @@
int YQTree::preferredWidth()
{
- int hintWidth = _caption->isShown() ? _caption->sizeHint().width() : 0;
+ int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() : 0;
return max( 200, hintWidth );
}
@@ -223,7 +224,7 @@
// 300 is an arbitrary value. Use a MinSize or MinHeight widget to set a
// size that is useful for the application.
- int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0;
+ int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0;
return 300 + hintHeight;
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc Fri Nov 30 13:18:22 2007
@@ -17,6 +17,7 @@
Textdomain "packages-qt"
/-*/
+#define QT3_SUPPORT
#define USE_QT_CURSORS 1
#define FORCE_UNICODE_FONT 0
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Fri Nov 30 13:18:22 2007
@@ -16,6 +16,7 @@
/-*/
+#define QT3_SUPPORT
#include // MAXHOSTNAMELEN
#include
#include
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc Fri Nov 30 13:18:22 2007
@@ -15,6 +15,7 @@
Author: Stefan Hundhammer
/-*/
+#define QT3_SUPPORT
#define y2log_component "qt-ui"
#include
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQUI_x11.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQUI_x11.cc Fri Nov 30 13:18:22 2007
@@ -18,7 +18,7 @@
/-*/
-
+#define QT3_SUPPORT
#include
#include
#include
@@ -28,6 +28,7 @@
#include
#include
#include
+#include <QColorGroup>
#include
@@ -316,7 +317,7 @@
if ( button == QMessageBox::Yes )
{
- const char * command =
+ const char * command =
_leftHandedMouse ?
"xmodmap -e \"pointer = 1 2 3\"": // switch back to right-handed mouse
"xmodmap -e \"pointer = 3 2 1\""; // switch to left-handed mouse
@@ -324,7 +325,7 @@
_leftHandedMouse = ! _leftHandedMouse; // might be set repeatedly!
_askedForLeftHandedMouse = false; // give the user a chance to switch back
y2milestone( "Switching mouse buttons: %s", command );
-
+
system( command );
}
else if ( button == 1 ) // No
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc Fri Nov 30 13:18:22 2007
@@ -76,12 +76,12 @@
{
if ( textIsEmpty )
{
- if ( isShown() )
+ if ( !isHidden() )
hide();
}
else
{
- if ( ! isShown() )
+ if ( isHidden() )
show();
}
}
Modified: branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc?rev=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc Fri Nov 30 13:18:22 2007
@@ -16,7 +16,8 @@
/-*/
-
+#define QT3_SUPPORT
+#include <QColorGroup>
#include "YQWidgetFactory.h"
#include "YQUI.h"
#include "YUIException.h"
@@ -223,7 +224,7 @@
{
YQIntField * intField = new YQIntField( parent, label, minVal, maxVal, initialVal );
YUI_CHECK_NEW( intField );
-
+
return intField;
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Fri Nov 30 13:18:22 2007
@@ -18,6 +18,7 @@
/-*/
+#define QT3_SUPPORT
#include "YQWizard.h"
#define y2log_component "qt-wizard"
@@ -1788,7 +1789,7 @@
void YQWizard::hideReleaseNotesButton()
{
- if ( _releaseNotesButton && _releaseNotesButton->isShown() )
+ if ( _releaseNotesButton && !_releaseNotesButton->isHidden() )
_releaseNotesButton->hide();
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQWizardButton.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQWizardButton.cc Fri Nov 30 13:18:22 2007
@@ -36,14 +36,14 @@
{
QPushButton * button = new QPushButton( fromUTF8( label ), buttonParent );
Q_CHECK_PTR( button );
-
+
setQPushButton( button );
setWidgetRep( button );
connect( button, SIGNAL( clicked() ),
this, SIGNAL( clicked() ) );
-
+
// This widget itself will never be visible, only its button - which is not
// a child of this widget.
QWidget::hide();
@@ -74,7 +74,7 @@
bool YQWizardButton::isShown() const
{
if ( qPushButton() )
- return qPushButton()->isShown();
+ return !qPushButton()->isHidden();
else
return false;
}
@@ -90,7 +90,7 @@
{
// This widget doesn't have a YWidget-based visual representation, it's
// only a YWidget for shortcut checking etc.
-
+
return 0;
}
@@ -99,7 +99,7 @@
{
// This widget doesn't have a YWidget-based visual representation, it's
// only a YWidget for shortcut checking etc.
-
+
return 0;
}
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc (original)
+++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc Fri Nov 30 13:18:22 2007
@@ -18,6 +18,7 @@
/-*/
+#define QT3_SUPPORT
#define y2log_component "qt-pkg"
#include
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h (original)
+++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h Fri Nov 30 13:18:22 2007
@@ -58,6 +58,8 @@
**/
virtual ~YQPkgObjList();
+ // avoiding warning about virtuals
+ using QTreeView::selectionChanged;
public:
@@ -249,7 +251,6 @@
**/
virtual void selectionChangedInternal( QTreeWidgetItem * item );
-
signals:
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h (original)
+++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h Fri Nov 30 13:18:22 2007
@@ -24,6 +24,7 @@
#include "YQPkgObjList.h"
#include "YQPkgSelMapper.h"
//Added by qt3to4:
+#include <Q3ListViewItem>
#include
#include
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc (original)
+++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc Fri Nov 30 13:18:22 2007
@@ -26,6 +26,7 @@
#include
#include
+#include <Q3ListView>
#include "YQPkgRepoList.h"
#include "YQi18n.h"
#include "utf8.h"
@@ -243,7 +244,7 @@
if ( urlCol() >= 0 )
{
zypp::Url repoUrl;
-
+
if ( ! repo.info().baseUrlsEmpty() )
repoUrl = *repo.info().baseUrlsBegin();
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=42552&r1=42551&r2=42552&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h (original)
+++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h Fri Nov 30 13:18:22 2007
@@ -22,7 +22,7 @@
#include "QY2ListView.h"
#include "YQZypp.h"
-
+#include <Q3ListViewItem>
class QTabWidget;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org