diff --git a/controls/AdaptiveWidget.h b/controls/AdaptiveWidget.h index 338c77050e8df8adfd3b07e31b19495a92749dc3..0d6476722e702f05d1f03ff9a558342ee0017d2c 100644 --- a/controls/AdaptiveWidget.h +++ b/controls/AdaptiveWidget.h @@ -47,10 +47,10 @@ protected: template <class T /*= QWidget*/> inline QList<T*> getTheSameWidgets(const QString& a_objName) { - QList<T*> widgets; + QList<T*> widgetsList; T* foundWidget = currentWidget()->findChild<T*>(a_objName); if (foundWidget) - widgets.append(foundWidget); + widgetsList.append(foundWidget); ///TODO: add horisontal rotation for mobile. @@ -60,7 +60,7 @@ protected: // if (foundWidget) // widgets.append(foundWidget); // } - return widgets; + return widgetsList; } template <class T /*= QWidget*/> diff --git a/screens/MultiScreenWindow.h b/screens/MultiScreenWindow.h index 40453d904239e29af04d004a6900d08dbd96ab17..79a3e9f02462bea2ab55ff2d0f4a93fce12cc340 100644 --- a/screens/MultiScreenWindow.h +++ b/screens/MultiScreenWindow.h @@ -15,8 +15,28 @@ public: MultiScreenAbstract* m_centralScreen; QString activeScreenName(); + + template <typename T> + T* screen(); + + template <typename T> + T* activateScreen(); + private: QString m_activeScreen; }; + +template <typename T> +T* MultiScreenWindow::screen(){ + return this->centralScreen()->subScreen<T>(); +} + +template <typename T> +T* MultiScreenWindow::activateScreen() +{ + return this->centralScreen()->activateScreen<T>(); +} + + #endif // MULTISCREENWINDOW_H