Removed C++17 nested namespace definitions. Should build on trusty again.
This commit is contained in:
+46
-43
@@ -28,69 +28,72 @@
|
||||
#include <QStringList>
|
||||
|
||||
|
||||
namespace glabels::model
|
||||
namespace glabels
|
||||
{
|
||||
|
||||
///
|
||||
/// Settings Singleton Class
|
||||
///
|
||||
class Settings : public QSettings
|
||||
namespace model
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
///
|
||||
/// Settings Singleton Class
|
||||
///
|
||||
class Settings : public QSettings
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
enum class PageSizeFamilty { ISO, US, };
|
||||
public:
|
||||
enum class PageSizeFamilty { ISO, US, };
|
||||
|
||||
|
||||
/////////////////////////////////
|
||||
// Life Cycle
|
||||
/////////////////////////////////
|
||||
private:
|
||||
Settings();
|
||||
/////////////////////////////////
|
||||
// Life Cycle
|
||||
/////////////////////////////////
|
||||
private:
|
||||
Settings();
|
||||
|
||||
public:
|
||||
static void init();
|
||||
static Settings* instance();
|
||||
public:
|
||||
static void init();
|
||||
static Settings* instance();
|
||||
|
||||
|
||||
/////////////////////////////////
|
||||
// Signals
|
||||
/////////////////////////////////
|
||||
signals:
|
||||
void changed();
|
||||
/////////////////////////////////
|
||||
// Signals
|
||||
/////////////////////////////////
|
||||
signals:
|
||||
void changed();
|
||||
|
||||
|
||||
/////////////////////////////////
|
||||
// Accessors
|
||||
/////////////////////////////////
|
||||
public:
|
||||
static Units units();
|
||||
static void setUnits( const Units& units );
|
||||
/////////////////////////////////
|
||||
// Accessors
|
||||
/////////////////////////////////
|
||||
public:
|
||||
static Units units();
|
||||
static void setUnits( const Units& units );
|
||||
|
||||
static bool searchIsoPaperSizes();
|
||||
static void setSearchIsoPaperSizes( bool searchIsoPaperSizes );
|
||||
static bool searchIsoPaperSizes();
|
||||
static void setSearchIsoPaperSizes( bool searchIsoPaperSizes );
|
||||
|
||||
static bool searchUsPaperSizes();
|
||||
static void setSearchUsPaperSizes( bool searchUsPaperSizes );
|
||||
static bool searchUsPaperSizes();
|
||||
static void setSearchUsPaperSizes( bool searchUsPaperSizes );
|
||||
|
||||
static bool searchOtherPaperSizes();
|
||||
static void setSearchOtherPaperSizes( bool searchOtherPaperSizes );
|
||||
static bool searchOtherPaperSizes();
|
||||
static void setSearchOtherPaperSizes( bool searchOtherPaperSizes );
|
||||
|
||||
static bool searchAllCategories();
|
||||
static void setSearchAllCategories( bool searchAllCategories );
|
||||
static bool searchAllCategories();
|
||||
static void setSearchAllCategories( bool searchAllCategories );
|
||||
|
||||
static QStringList searchCategoryList();
|
||||
static void setSearchCategoryList( const QStringList& searchCategoryList );
|
||||
static QStringList searchCategoryList();
|
||||
static void setSearchCategoryList( const QStringList& searchCategoryList );
|
||||
|
||||
static QStringList recentTemplateList();
|
||||
static void addToRecentTemplateList( const QString& name );
|
||||
static QStringList recentTemplateList();
|
||||
static void addToRecentTemplateList( const QString& name );
|
||||
|
||||
|
||||
private:
|
||||
static Settings* mInstance;
|
||||
private:
|
||||
static Settings* mInstance;
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user