napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] Move definitions inside namespace {}

Browse Source 
- Remove the extra Calamares:: namespace specifier from half the
   definitions.
This commit is contained in:
Adriaan de Groot 2020-02-07 21:33:34 +01:00
parent 12675be516
commit 1f34c2834e
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libcalamaresui/viewpages/QmlViewStep.cpp
View File

@ -23,6 +23,7 @@
#include "utils/Dirs.h" #include "utils/Dirs.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/NamedEnum.h" #include "utils/NamedEnum.h"
#include "utils/Qml.h"
#include "utils/Variant.h" #include "utils/Variant.h"
#include "widgets/WaitingWidget.h" #include "widgets/WaitingWidget.h"
@ -80,57 +81,56 @@ QmlViewStep::prettyName() const
} }
} // namespace Calamares
bool bool
Calamares::QmlViewStep::isAtBeginning() const QmlViewStep::isAtBeginning() const
{ {
return true; return true;
} }
bool bool
Calamares::QmlViewStep::isAtEnd() const QmlViewStep::isAtEnd() const
{ {
return true; return true;
} }
bool bool
Calamares::QmlViewStep::isBackEnabled() const QmlViewStep::isBackEnabled() const
{ {
return true; return true;
} }
bool bool
Calamares::QmlViewStep::isNextEnabled() const QmlViewStep::isNextEnabled() const
{ {
return true; return true;
} }
Calamares::JobList Calamares::JobList
Calamares::QmlViewStep::jobs() const QmlViewStep::jobs() const
{ {
return JobList(); return JobList();
} }
void void
Calamares::QmlViewStep::onActivate() QmlViewStep::onActivate()
{ {
// TODO: call into QML // TODO: call into QML
} }
void void
Calamares::QmlViewStep::onLeave() QmlViewStep::onLeave()
{ {
// TODO: call into QML // TODO: call into QML
} }
QWidget* QWidget*
Calamares::QmlViewStep::widget() QmlViewStep::widget()
{ {
return m_widget; return m_widget;
} }
void void
Calamares::QmlViewStep::loadComplete() QmlViewStep::loadComplete()
{ {
cDebug() << "QML component" << m_qmlFileName << m_qmlComponent->status(); cDebug() << "QML component" << m_qmlFileName << m_qmlComponent->status();
if ( m_qmlComponent->status() == QQmlComponent::Error ) if ( m_qmlComponent->status() == QQmlComponent::Error )
@ -163,7 +163,7 @@ Calamares::QmlViewStep::loadComplete()
} }
void void
Calamares::QmlViewStep::showQml() QmlViewStep::showQml()
{ {
if ( !m_qmlWidget || !m_qmlObject ) if ( !m_qmlWidget || !m_qmlObject )
{ {
@ -190,7 +190,7 @@ Calamares::QmlViewStep::showQml()
* is badly configured). * is badly configured).
*/ */
QString QString
searchQmlFile( Calamares::QmlViewStep::QmlSearch method, const QString& configuredName, const QString& moduleName ) searchQmlFile( QmlViewStep::QmlSearch method, const QString& configuredName, const QString& moduleName )
{ {
using QmlSearch = Calamares::QmlViewStep::QmlSearch; using QmlSearch = Calamares::QmlViewStep::QmlSearch;
@ -235,7 +235,7 @@ searchQmlFile( Calamares::QmlViewStep::QmlSearch method, const QString& configur
} }
void void
Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
bool ok = false; bool ok = false;
m_searchMethod = searchNames().find( CalamaresUtils::getString( configurationMap, "search" ), ok ); m_searchMethod = searchNames().find( CalamaresUtils::getString( configurationMap, "search" ), ok );
@ -270,8 +270,10 @@ Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap
} }
void void
Calamares::QmlViewStep::showFailedQml() QmlViewStep::showFailedQml()
{ {
cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed."; cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed.";
m_spinner->setText( prettyName() + ' ' + tr( "Loading failed." ) ); m_spinner->setText( prettyName() + ' ' + tr( "Loading failed." ) );
} }
} // namespace Calamares