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:
itsmattkc
2020-11-17 20:24:42 +11:00
parent d241090a9f
commit 75d4cd899b
626 changed files with 1971 additions and 1972 deletions
@@ -41,7 +41,7 @@
#include "widget/timelinewidget/timelinewidget.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorer::ProjectExplorer(QWidget *parent) :
QWidget(parent),
@@ -683,4 +683,4 @@ void ProjectExplorer::DeleteSelected()
Core::instance()->undo_stack()->pushIfHasChildren(command);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -34,7 +34,7 @@
#include "widget/projectexplorer/projectexplorernavigation.h"
#include "widget/projecttoolbar/projecttoolbar.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A widget for browsing through a Project structure.
@@ -186,6 +186,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORER_H
@@ -20,7 +20,7 @@
#include "projectexplorericonview.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) :
ProjectExplorerListViewBase(parent)
@@ -30,4 +30,4 @@ ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) :
setItemDelegate(&delegate_);
}
OLIVE_NAMESPACE_EXIT
}
@@ -24,7 +24,7 @@
#include "projectexplorerlistviewbase.h"
#include "projectexplorericonviewitemdelegate.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The view widget used when ProjectExplorer is in Icon View
@@ -39,6 +39,6 @@ private:
ProjectExplorerIconViewItemDelegate delegate_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERICONVIEW_H
@@ -24,7 +24,7 @@
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerIconViewItemDelegate::ProjectExplorerIconViewItemDelegate(QObject *parent) :
QStyledItemDelegate (parent)
@@ -99,4 +99,4 @@ void ProjectExplorerIconViewItemDelegate::paint(QPainter *painter, const QStyleO
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The delegate that's used to draw items when ProjectExplorer is in Icon view
@@ -38,6 +38,6 @@ public:
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERICONVIEWITEMDELEGATE_H
@@ -20,7 +20,7 @@
#include "projectexplorerlistview.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) :
ProjectExplorerListViewBase(parent)
@@ -30,4 +30,4 @@ ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) :
setItemDelegate(&delegate_);
}
OLIVE_NAMESPACE_EXIT
}
@@ -24,7 +24,7 @@
#include "projectexplorerlistviewbase.h"
#include "projectexplorerlistviewitemdelegate.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The view widget used when ProjectExplorer is in List View
@@ -39,6 +39,6 @@ private:
ProjectExplorerListViewItemDelegate delegate_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERLISTVIEW_H
@@ -22,7 +22,7 @@
#include <QMouseEvent>
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerListViewBase::ProjectExplorerListViewBase(QWidget *parent) :
QListView(parent)
@@ -51,4 +51,4 @@ void ProjectExplorerListViewBase::mouseDoubleClickEvent(QMouseEvent *event)
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A QListView derivative that contains functionality used by both List view and Icon view (which are both based
@@ -57,6 +57,6 @@ signals:
void DoubleClickedEmptyArea();
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERLISTVIEWBASE_H
@@ -22,7 +22,7 @@
#include <QPainter>
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerListViewItemDelegate::ProjectExplorerListViewItemDelegate(QObject *parent) :
QStyledItemDelegate(parent)
@@ -80,4 +80,4 @@ void ProjectExplorerListViewItemDelegate::paint(QPainter *painter, const QStyleO
painter->drawText(text_rect, static_cast<int>(Qt::AlignLeft | Qt::AlignVCenter), text);
}
OLIVE_NAMESPACE_EXIT
}
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The delegate that's used to draw items when ProjectExplorer is in List view
@@ -39,6 +39,6 @@ public:
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERLISTVIEWITEMDELEGATE_H
@@ -26,7 +26,7 @@
#include "common/define.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerNavigation::ProjectExplorerNavigation(QWidget *parent) :
QWidget(parent)
@@ -96,4 +96,4 @@ void ProjectExplorerNavigation::UpdateIcons()
size_slider_->setValue(kProjectIconSizeDefault);
}
OLIVE_NAMESPACE_EXIT
}
@@ -28,7 +28,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A navigation bar widget for ProjectExplorer's Icon and List views
@@ -112,6 +112,6 @@ private:
QSlider* size_slider_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERLISTVIEWTOOLBAR_H
@@ -22,7 +22,7 @@
#include <QMouseEvent>
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectExplorerTreeView::ProjectExplorerTreeView(QWidget *parent) :
QTreeView(parent)
@@ -54,4 +54,4 @@ void ProjectExplorerTreeView::mouseDoubleClickEvent(QMouseEvent *event)
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The view widget used when ProjectExplorer is in Tree View
@@ -59,6 +59,6 @@ signals:
void DoubleClickedEmptyArea();
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERTREEVIEW_H
@@ -20,7 +20,7 @@
#include "projectexplorerundo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
OfflineFootageCommand::OfflineFootageCommand(const QList<MediaInput *> &media, QUndoCommand* parent) :
UndoCommand(parent)
@@ -51,4 +51,4 @@ void OfflineFootageCommand::undo_internal()
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -24,7 +24,7 @@
#include "node/input/media/media.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief An undo command for offlining footage when it is deleted from the project explorer
@@ -47,6 +47,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTEXPLORERUNDO_H