[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [publictransport/0.11] libpublictransporthelper: Fix graphicaltimetableline build
From:       Friedrich_Karl_Tilman_Pülz <fpuelz () gmx ! de>
Date:       2012-12-01 1:56:46
Message-ID: 20121201015646.073ABA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 65a74e0f426df20497a3740afd60a2d5fd059090 by Friedrich Karl Tilman Pülz.
Committed on 01/12/2012 at 02:55.
Pushed by fkpulz into branch '0.11'.

Fix graphicaltimetableline build

Fix without changing graphicaltimetableline. Instead move the
(new) ServiceProviderModel* parameter for the StopWidget constructor
after the StopSettings parameter (used more often).

M  +6    -6    libpublictransporthelper/stopwidget.cpp
M  +3    -3    libpublictransporthelper/stopwidget.h
M  +1    -1    libpublictransporthelper/tests/PublicTransportHelperTest.cpp

http://commits.kde.org/publictransport/65a74e0f426df20497a3740afd60a2d5fd059090

diff --git a/libpublictransporthelper/stopwidget.cpp \
b/libpublictransporthelper/stopwidget.cpp index 8717cc1..3381de6 100644
--- a/libpublictransporthelper/stopwidget.cpp
+++ b/libpublictransporthelper/stopwidget.cpp
@@ -47,8 +47,8 @@ class StopWidgetPrivate
     Q_DECLARE_PUBLIC( StopWidget )
 
 public:
-    StopWidgetPrivate( StopWidget *q, ServiceProviderModel *providerModel,
-        const StopSettings& _stopSettings, FilterSettingsList \
*_filterConfigurations, +    StopWidgetPrivate( StopWidget *q, const StopSettings& \
_stopSettings, +        ServiceProviderModel *providerModel, FilterSettingsList \
*_filterConfigurations,  StopSettingsDialog::Options _stopSettingsDialogOptions,
         ServiceProviderDataDialog::Options _providerDataDialogOptions,
         QList<int> _settings, int _stopIndex,
@@ -146,13 +146,13 @@ protected:
     StopWidget *q_ptr;
 };
 
-StopWidget::StopWidget( QWidget* parent, ServiceProviderModel *providerModel,
-        const StopSettings& stopSettings, StopSettingsDialog::Options \
stopSettingsDialogOptions, +StopWidget::StopWidget( QWidget* parent, const \
StopSettings& stopSettings, +        ServiceProviderModel *providerModel, \
StopSettingsDialog::Options stopSettingsDialogOptions,  \
                ServiceProviderDataDialog::Options providerDataDialogOptions,
         FilterSettingsList *filterConfigurations, QList<int> settings, int \
stopIndex,  StopSettingsWidgetFactory::Pointer factory )
         : QWidget(parent),
-          d_ptr(new StopWidgetPrivate(this, providerModel, stopSettings, \
filterConfigurations, +          d_ptr(new StopWidgetPrivate(this, stopSettings, \
                providerModel, filterConfigurations,
                                       stopSettingsDialogOptions, \
providerDataDialogOptions,  settings, stopIndex, factory))
 {
@@ -483,7 +483,7 @@ QWidget* StopListWidget::createNewWidget()
 QWidget* StopListWidget::createNewWidget( const StopSettings &stopSettings )
 {
     Q_D( StopListWidget );
-    StopWidget *stopWidget = new StopWidget( this, d->providerModel, stopSettings,
+    StopWidget *stopWidget = new StopWidget( this, stopSettings, d->providerModel,
             d->stopSettingsDialogOptions, d->providerDataDialogOptions,
             d->filterConfigurations, d->settings, -1, d->factory );
     connect( stopWidget, SIGNAL(remove()), this, SLOT(removeLastWidget()) );
diff --git a/libpublictransporthelper/stopwidget.h \
b/libpublictransporthelper/stopwidget.h index 43470e3..c61c40a 100644
--- a/libpublictransporthelper/stopwidget.h
+++ b/libpublictransporthelper/stopwidget.h
@@ -59,9 +59,9 @@ public:
      * @brief Creates a new stop widget.
      *
      * @param parent The parent widget of the stop widget. Default is 0.
+     * @param stopSettings The stop settings to initialize the stop widget with.
      * @param providerModel A pointer to an already created ServiceProviderModel. If \
                this is 0,
      *   a new model gets created.
-     * @param stopSettings The stop settings to initialize the stop widget with.
      * @param stopSettingsDialogOptions Options for used StopSettingsDialog. The \
                user can open
      *   a stop settings dialog to change the stop settings.
      *   Default is StopSettingsDialog::DefaultOptions.
@@ -75,8 +75,8 @@ public:
      *   @ref StopSettingsWidgetFactory::widgetForSetting.
      *   To be used in StopSettingsDialogs.
      **/
-    explicit StopWidget( QWidget* parent = 0, ServiceProviderModel *providerModel = \
                0,
-            const StopSettings &stopSettings = StopSettings(),
+    explicit StopWidget( QWidget* parent = 0, const StopSettings &stopSettings = \
StopSettings(), +            ServiceProviderModel *providerModel = 0,
             StopSettingsDialog::Options stopSettingsDialogOptions = \
                StopSettingsDialog::DefaultOptions,
             ServiceProviderDataDialog::Options providerDataDialogOptions = \
ServiceProviderDataDialog::DefaultOptions,  FilterSettingsList *filterConfigurations \
                = 0,
diff --git a/libpublictransporthelper/tests/PublicTransportHelperTest.cpp \
b/libpublictransporthelper/tests/PublicTransportHelperTest.cpp index 8fb9075..4454eb2 \
                100644
--- a/libpublictransporthelper/tests/PublicTransportHelperTest.cpp
+++ b/libpublictransporthelper/tests/PublicTransportHelperTest.cpp
@@ -707,7 +707,7 @@ void \
PublicTransportHelperTest::stopSettingsDialogAddWidgetsLaterCustomFactoryTe  
 void PublicTransportHelperTest::stopWidgetTest()
 {
-    StopWidget stopWidget( 0, 0, m_stopSettings, StopSettingsDialog::DefaultOptions,
+    StopWidget stopWidget( 0, m_stopSettings, 0, StopSettingsDialog::DefaultOptions,
                            ServiceProviderDataDialog::DefaultOptions, \
&m_filterConfigurations );  
 //     QSignalSpy changedSpy( &stopWidget, SIGNAL(changed(StopSettings)) );


[prev in list] [next in list] [prev in thread] [next in thread]