[libcalamares] Apply coding style
- minor space issues - drop a blank line after moc-warnings.h to avoid if being sorted downwards, after the MOC file it's protecting
This commit is contained in:
parent
1765412b61
commit
d8ecd302e1
@ -65,9 +65,9 @@ mount( const std::string& device_path,
|
|||||||
const std::string& options )
|
const std::string& options )
|
||||||
{
|
{
|
||||||
return CalamaresUtils::Partition::mount( QString::fromStdString( device_path ),
|
return CalamaresUtils::Partition::mount( QString::fromStdString( device_path ),
|
||||||
QString::fromStdString( mount_point ),
|
QString::fromStdString( mount_point ),
|
||||||
QString::fromStdString( filesystem_name ),
|
QString::fromStdString( filesystem_name ),
|
||||||
QString::fromStdString( options ) );
|
QString::fromStdString( options ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -94,8 +94,7 @@ private:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
QDebug&
|
QDebug& operator<<( QDebug& s, const Calamares::ModuleSystem::InstanceKey& i );
|
||||||
operator <<( QDebug& s, const Calamares::ModuleSystem::InstanceKey& i );
|
|
||||||
|
|
||||||
} // namespace ModuleSystem
|
} // namespace ModuleSystem
|
||||||
} // namespace Calamares
|
} // namespace Calamares
|
||||||
|
@ -138,4 +138,5 @@ ModuleSystemTests::testBadFromStringCases()
|
|||||||
QTEST_GUILESS_MAIN( ModuleSystemTests )
|
QTEST_GUILESS_MAIN( ModuleSystemTests )
|
||||||
|
|
||||||
#include "utils/moc-warnings.h"
|
#include "utils/moc-warnings.h"
|
||||||
|
|
||||||
#include "Tests.moc"
|
#include "Tests.moc"
|
||||||
|
@ -286,4 +286,5 @@ Manager::asynchronousGet( const QUrl& url, const CalamaresUtils::Network::Reques
|
|||||||
} // namespace CalamaresUtils
|
} // namespace CalamaresUtils
|
||||||
|
|
||||||
#include "utils/moc-warnings.h"
|
#include "utils/moc-warnings.h"
|
||||||
|
|
||||||
#include "Manager.moc"
|
#include "Manager.moc"
|
||||||
|
@ -47,6 +47,7 @@ NetworkTests::testPing()
|
|||||||
using namespace CalamaresUtils::Network;
|
using namespace CalamaresUtils::Network;
|
||||||
Logger::setupLogLevel( Logger::LOGVERBOSE );
|
Logger::setupLogLevel( Logger::LOGVERBOSE );
|
||||||
auto& nam = Manager::instance();
|
auto& nam = Manager::instance();
|
||||||
auto canPing_www_kde_org = nam.synchronousPing( QUrl( "https://www.kde.org" ), RequestOptions( RequestOptions::FollowRedirect ) );
|
auto canPing_www_kde_org
|
||||||
|
= nam.synchronousPing( QUrl( "https://www.kde.org" ), RequestOptions( RequestOptions::FollowRedirect ) );
|
||||||
QVERIFY( canPing_www_kde_org );
|
QVERIFY( canPing_www_kde_org );
|
||||||
}
|
}
|
||||||
|
@ -24,14 +24,14 @@
|
|||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
/// @brief Convenience to zero out and deleteLater of any QObject-derived-class
|
/// @brief Convenience to zero out and deleteLater of any QObject-derived-class
|
||||||
template< typename T >
|
template < typename T >
|
||||||
struct cqDeleter
|
struct cqDeleter
|
||||||
{
|
{
|
||||||
T*& p;
|
T*& p;
|
||||||
|
|
||||||
~cqDeleter()
|
~cqDeleter()
|
||||||
{
|
{
|
||||||
static_assert( std::is_base_of<QObject, T>::value, "Not a QObject-class" );
|
static_assert( std::is_base_of< QObject, T >::value, "Not a QObject-class" );
|
||||||
if ( p )
|
if ( p )
|
||||||
{
|
{
|
||||||
p->deleteLater();
|
p->deleteLater();
|
||||||
|
Loading…
Reference in New Issue
Block a user