From kde-commits Sun Jul 06 12:25:08 2008 From: Jesper Pedersen Date: Sun, 06 Jul 2008 12:25:08 +0000 To: kde-commits Subject: extragear/graphics/kphotoalbum/ImportExport Message-Id: <1215347108.136847.16704.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=121534712004947 SVN commit 828698 by blackie: use QScrollArea instead of Q3ScrollView for the ImportMatcher M +4 -4 ImportMatcher.cpp M +3 -3 ImportMatcher.h --- trunk/extragear/graphics/kphotoalbum/ImportExport/ImportMatcher.cpp #828697:828698 @@ -30,10 +30,10 @@ ImportMatcher::ImportMatcher( const QString& otherCategory, const QString& myCategory, const QStringList& otherItems, const QStringList& myItems, bool allowNew, QWidget* parent, const char* name ) - : Q3ScrollView( parent, name ), _otherCategory( otherCategory ), _myCategory( myCategory ) + : QScrollArea( parent ), _otherCategory( otherCategory ), _myCategory( myCategory ) { - setResizePolicy( AutoOneFit ); - + setObjectName(name); + setWidgetResizable(true); QWidget* top = new QWidget( viewport() ); QVBoxLayout* layout = new QVBoxLayout( top ); QWidget* grid = new QWidget; @@ -42,7 +42,7 @@ QGridLayout* gridLay = new QGridLayout(grid); gridLay->setColumnStretch( 1, 1 ); - addChild( top ); + setWidget( top ); QLabel* label = new QLabel( i18n("Key in file"), grid ); gridLay->addWidget( label, 0,0 ); --- trunk/extragear/graphics/kphotoalbum/ImportExport/ImportMatcher.h #828697:828698 @@ -19,9 +19,9 @@ #ifndef IMPORTMATCHER_H #define IMPORTMATCHER_H -#include +#include #include -#include + class QGridLayout; class QComboBox; class QCheckBox; @@ -38,7 +38,7 @@ }; -class ImportMatcher :public Q3ScrollView { +class ImportMatcher :public QScrollArea { Q_OBJECT public: