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:
@@ -26,7 +26,7 @@
|
||||
|
||||
#include "common/timerange.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
class Project;
|
||||
|
||||
@@ -71,13 +71,13 @@ public slots:
|
||||
void Shift(const rational& from, const rational& to);
|
||||
|
||||
signals:
|
||||
void Invalidated(const OLIVE_NAMESPACE::TimeRange& r);
|
||||
void Invalidated(const olive::TimeRange& r);
|
||||
|
||||
void Validated(const OLIVE_NAMESPACE::TimeRange& r);
|
||||
void Validated(const olive::TimeRange& r);
|
||||
|
||||
void Shifted(const OLIVE_NAMESPACE::rational& from, const OLIVE_NAMESPACE::rational& to);
|
||||
void Shifted(const olive::rational& from, const olive::rational& to);
|
||||
|
||||
void LengthChanged(const OLIVE_NAMESPACE::rational& r);
|
||||
void LengthChanged(const olive::rational& r);
|
||||
|
||||
protected:
|
||||
void Validate(const TimeRange& r);
|
||||
@@ -106,6 +106,6 @@ private:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // PLAYBACKCACHE_H
|
||||
|
||||
Reference in New Issue
Block a user