use hardcoded namespace
The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "icons.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
/// Works in conjunction with `genicons.sh` to generate and utilize icons of specific sizes
|
||||
const int ICON_SIZE_COUNT = 4;
|
||||
@@ -140,4 +140,4 @@ QIcon icon::Create(const QString& theme, const QString &name)
|
||||
return icon;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "common/define.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
namespace icon {
|
||||
|
||||
@@ -125,6 +125,6 @@ void LoadAll(const QString &theme);
|
||||
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // ICONS_H
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "config/config.h"
|
||||
#include "ui/icons/icons.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
const char* StyleManager::kDefaultStyle = "olive-dark";
|
||||
QString StyleManager::current_style_;
|
||||
@@ -192,4 +192,4 @@ void StyleManager::SetStyle(const QString &style_path)
|
||||
}
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include "common/define.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
class StyleManager : public QObject {
|
||||
public:
|
||||
@@ -58,6 +58,6 @@ private:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // STYLEMANAGER_H
|
||||
|
||||
Reference in New Issue
Block a user