oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use hardcoded namespace

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/about/about.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QLabel>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent)
@@ -67,4 +67,4 @@ AboutDialog::AboutDialog(QWidget *parent) :
connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/about/about.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The AboutDialog class
@@ -49,6 +49,6 @@ public:
explicit AboutDialog(QWidget *parent = nullptr);
};
OLIVE_NAMESPACE_EXIT
}
#endif // ABOUTDIALOG_H
app/dialog/actionsearch/actionsearch.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QMenuBar>
#include <QLabel>
OLIVE_NAMESPACE_ENTER
namespace olive {
ActionSearch::ActionSearch(QWidget *parent) :
QDialog(parent),
@@ -254,4 +254,4 @@ void ActionSearchList::mouseDoubleClickEvent(QMouseEvent *) {
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/actionsearch/actionsearch.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ActionSearchList;
@@ -182,6 +182,6 @@ signals:
void moveSelectionDown();
};
OLIVE_NAMESPACE_EXIT
}
#endif // ACTIONSEARCH_H
app/dialog/color/colordialog.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ColorDialog::ColorDialog(ColorManager* color_manager, const ManagedColor& start, QWidget *parent) :
QDialog(parent),
@@ -160,4 +160,4 @@ void ColorDialog::ColorSpaceChanged(const QString &input, const ColorTransform &
color_values_widget_->SetColorProcessor(input_to_ref_processor_, ref_to_display, nullptr, ref_to_input);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/color/colordialog.h
+2 -2
View File
@@ -31,7 +31,7 @@
#include "widget/colorwheel/colorvalueswidget.h"
#include "widget/colorwheel/colorwheelwidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ColorDialog : public QDialog
{
@@ -87,6 +87,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // COLORDIALOG_H
app/dialog/crashhandler/crashhandler.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include "common/crashpadutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CrashHandlerDialog::CrashHandlerDialog(const char *report_dir, const char* crash_time)
{
@@ -208,4 +208,4 @@ void CrashHandlerDialog::SendErrorReport()
manager->post(request, multipart);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/crashhandler/crashhandler.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CrashHandlerDialog : public QDialog
{
@@ -72,6 +72,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CRASHHANDLERDIALOG_H
app/dialog/crashhandler/crashhandlermain.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
QApplication a(argc, argv);
OLIVE_NAMESPACE::CrashHandlerDialog chd(argv[1], argv[2]);
olive::CrashHandlerDialog chd(argv[1], argv[2]);
chd.open();
return a.exec();
app/dialog/diskcache/diskcachedialog.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
DiskCacheDialog::DiskCacheDialog(DiskCacheFolder *folder, QWidget* parent) :
QDialog(parent),
@@ -104,4 +104,4 @@ void DiskCacheDialog::ClearDiskCache()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/diskcache/diskcachedialog.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "render/diskmanager.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class DiskCacheDialog : public QDialog
{
@@ -53,6 +53,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // DISKCACHEDIALOG_H
app/dialog/export/codec/codecsection.cpp
+2 -2
View File
@@ -20,11 +20,11 @@
#include "codecsection.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CodecSection::CodecSection(QWidget *parent) :
QWidget(parent)
{
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/codec/codecsection.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "codec/encoder.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CodecSection : public QWidget
{
@@ -37,6 +37,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CODECSECTION_H
app/dialog/export/codec/h264section.cpp
+2 -2
View File
@@ -28,7 +28,7 @@
#include "common/qtutils.h"
#include "widget/slider/integerslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
H264Section::H264Section(QWidget *parent) :
CodecSection(parent)
@@ -208,4 +208,4 @@ int64_t H264FileSizeSection::GetFileSize() const
return qRound64(file_size_->GetValue() * 1024.0 * 1024.0 * 8.0);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/codec/h264section.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "codecsection.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class H264CRFSection : public QWidget
{
@@ -112,6 +112,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // H264SECTION_H
app/dialog/export/codec/imagesection.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QGridLayout>
#include <QLabel>
OLIVE_NAMESPACE_ENTER
namespace olive {
ImageSection::ImageSection(QWidget* parent) :
CodecSection(parent)
@@ -44,4 +44,4 @@ QCheckBox *ImageSection::image_sequence_checkbox() const
return image_sequence_checkbox_;
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/codec/imagesection.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "codecsection.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ImageSection : public CodecSection
{
@@ -40,6 +40,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // IMAGESECTION_H
app/dialog/export/export.cpp
+2 -2
View File
@@ -37,7 +37,7 @@
#include "project/project.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportDialog::ExportDialog(ViewerOutput *viewer_node, TimelinePoints *points, QWidget *parent) :
QDialog(parent),
@@ -507,4 +507,4 @@ void ExportDialog::UpdateViewerDimensions()
preview_viewer_->SetMatrix(transform);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/export.h
+2 -2
View File
@@ -34,7 +34,7 @@
#include "task/export/export.h"
#include "widget/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportDialog : public QDialog
{
@@ -95,6 +95,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTDIALOG_H
app/dialog/export/exportadvancedvideodialog.cpp
+2 -2
View File
@@ -5,7 +5,7 @@
#include <QGroupBox>
#include <QLabel>
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportAdvancedVideoDialog::ExportAdvancedVideoDialog(const QList<QString> &pix_fmts, QWidget *parent) :
QDialog(parent)
@@ -59,4 +59,4 @@ ExportAdvancedVideoDialog::ExportAdvancedVideoDialog(const QList<QString> &pix_f
layout->addWidget(buttons);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/exportadvancedvideodialog.h
+2 -2
View File
@@ -6,7 +6,7 @@
#include "widget/slider/integerslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportAdvancedVideoDialog : public QDialog
{
@@ -42,6 +42,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTADVANCEDVIDEODIALOG_H
app/dialog/export/exportaudiotab.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportAudioTab::ExportAudioTab(QWidget* parent) :
QWidget(parent)
@@ -64,4 +64,4 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) :
outer_layout->addStretch();
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/exportaudiotab.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/define.h"
#include "widget/standardcombos/standardcombos.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportAudioTab : public QWidget
{
@@ -57,6 +57,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTAUDIOTAB_H
app/dialog/export/exportvideotab.cpp
+2 -2
View File
@@ -31,7 +31,7 @@
#include "render/colormanager.h"
#include "task/export/exportparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportVideoTab::ExportVideoTab(ColorManager* color_manager, QWidget *parent) :
QWidget(parent),
@@ -206,4 +206,4 @@ void ExportVideoTab::VideoCodecChanged()
qDebug() << "Set default pix fmt" << pix_fmt_;
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/exportvideotab.h
+2 -2
View File
@@ -33,7 +33,7 @@
#include "widget/slider/integerslider.h"
#include "widget/standardcombos/standardcombos.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportVideoTab : public QWidget
{
@@ -167,6 +167,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTVIDEOTAB_H
app/dialog/footageproperties/footageproperties.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include "streamproperties/audiostreamproperties.h"
#include "streamproperties/videostreamproperties.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
FootagePropertiesDialog::FootagePropertiesDialog(QWidget *parent, Footage *footage) :
QDialog(parent),
@@ -198,4 +198,4 @@ void FootagePropertiesDialog::StreamEnableChangeCommand::undo_internal()
stream_->set_enabled(old_enabled_);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/footageproperties/footageproperties.h
+2 -2
View File
@@ -32,7 +32,7 @@
#include "project/item/footage/footage.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The MediaPropertiesDialog class
@@ -132,6 +132,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MEDIAPROPERTIESDIALOG_H
app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "audiostreamproperties.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioStreamProperties::AudioStreamProperties(AudioStreamPtr stream) :
stream_(stream)
@@ -31,4 +31,4 @@ void AudioStreamProperties::Accept(QUndoCommand*)
{
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/footageproperties/streamproperties/audiostreamproperties.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "project/item/footage/audiostream.h"
#include "streamproperties.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class AudioStreamProperties : public StreamProperties
{
@@ -37,6 +37,6 @@ private:
AudioStreamPtr stream_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOSTREAMPROPERTIES_H
app/dialog/footageproperties/streamproperties/streamproperties.cpp
+2 -2
View File
@@ -20,11 +20,11 @@
#include "streamproperties.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
StreamProperties::StreamProperties(QWidget *parent) :
QWidget(parent)
{
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/footageproperties/streamproperties/streamproperties.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class StreamProperties : public QWidget
{
@@ -39,6 +39,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // STREAMPROPERTIES_H
app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+2 -2
View File
@@ -32,7 +32,7 @@
#include "project/project.h"
#include "undo/undostack.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
VideoStreamProperties::VideoStreamProperties(VideoStreamPtr stream) :
stream_(stream),
@@ -253,4 +253,4 @@ void VideoStreamProperties::ImageSequenceChangeCommand::undo_internal()
video_stream_->set_timebase(old_frame_rate_.flipped());
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/footageproperties/streamproperties/videostreamproperties.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "widget/slider/integerslider.h"
#include "widget/standardcombos/standardcombos.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class VideoStreamProperties : public StreamProperties
{
@@ -143,6 +143,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // VIDEOSTREAMPROPERTIES_H
app/dialog/footagerelink/footagerelinkdialog.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include <QPushButton>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
FootageRelinkDialog::FootageRelinkDialog(const QList<FootagePtr>& footage, QWidget* parent) :
QDialog(parent),
@@ -100,4 +100,4 @@ void FootageRelinkDialog::BrowseForFootage()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/footagerelink/footagerelinkdialog.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "project/item/footage/footage.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FootageRelinkDialog : public QDialog
{
@@ -44,6 +44,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // FOOTAGERELINKDIALOG_H
app/dialog/keyframeproperties/keyframeproperties.cpp
+2 -2
View File
@@ -28,7 +28,7 @@
#include "widget/keyframeview/keyframeviewundo.h"
#include "widget/nodeparamview/nodeparamviewundo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
KeyframePropertiesDialog::KeyframePropertiesDialog(const QList<NodeKeyframePtr> &keys, const rational &timebase, QWidget *parent) :
QDialog(parent),
@@ -240,4 +240,4 @@ void KeyframePropertiesDialog::KeyTypeChanged(int index)
bezier_group_->setEnabled(type_select_->itemData(index) == NodeKeyframe::kBezier);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/keyframeproperties/keyframeproperties.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include "widget/slider/floatslider.h"
#include "widget/slider/timeslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class KeyframePropertiesDialog : public QDialog
{
@@ -66,6 +66,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYFRAMEPROPERTIESDIALOG_H
app/dialog/preferences/keysequenceeditor.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include <QAction>
OLIVE_NAMESPACE_ENTER
namespace olive {
KeySequenceEditor::KeySequenceEditor(QWidget* parent, QAction* a)
: QKeySequenceEdit(parent), action(a) {
@@ -49,4 +49,4 @@ QString KeySequenceEditor::export_shortcut() {
return nullptr;
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/keysequenceeditor.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/debug.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The KeySequenceEditor class
@@ -101,6 +101,6 @@ private:
QAction* action;
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYSEQUENCEEDITOR_H
app/dialog/preferences/preferences.cpp
+2 -2
View File
@@ -33,7 +33,7 @@
#include "tabs/preferencesaudiotab.h"
#include "tabs/preferenceskeyboardtab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesDialog::PreferencesDialog(QWidget *parent, QMenuBar* main_menu_bar) :
QDialog(parent)
@@ -98,4 +98,4 @@ void PreferencesDialog::AddTab(PreferencesTab *tab, const QString &title)
tabs_.append(tab);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/preferences.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "tabs/preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The PreferencesDialog class
@@ -69,6 +69,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESDIALOG_H
app/dialog/preferences/tabs/preferencesappearancetab.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "node/node.h"
#include "widget/colorbutton/colorbutton.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesAppearanceTab::PreferencesAppearanceTab()
{
@@ -122,4 +122,4 @@ void PreferencesAppearanceTab::ColorButtonClicked()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferencesappearancetab.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "preferencestab.h"
#include "ui/style/style.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesAppearanceTab : public PreferencesTab
{
@@ -60,6 +60,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESAPPEARANCETAB_H
app/dialog/preferences/tabs/preferencesaudiotab.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#include "audio/audiomanager.h"
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesAudioTab::PreferencesAudioTab()
{
@@ -206,4 +206,4 @@ void PreferencesAudioTab::PopulateComboBox(QComboBox *cb, bool still_refreshing,
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferencesaudiotab.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesAudioTab : public PreferencesTab
{
@@ -79,6 +79,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESAUDIOTAB_H
app/dialog/preferences/tabs/preferencesbehaviortab.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesBehaviorTab::PreferencesBehaviorTab()
{
@@ -156,4 +156,4 @@ QTreeWidgetItem *PreferencesBehaviorTab::AddParent(const QString &text, QTreeWid
return AddParent(text, QString(), parent);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferencesbehaviortab.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesBehaviorTab : public PreferencesTab
{
@@ -48,6 +48,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESBEHAVIORTAB_H
app/dialog/preferences/tabs/preferencesdisktab.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "common/filefunctions.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesDiskTab::PreferencesDiskTab()
{
@@ -117,4 +117,4 @@ void PreferencesDiskTab::Accept()
Config::Current()["DiskCacheAhead"] = QVariant::fromValue(rational::fromDouble(cache_ahead_slider_->GetValue()));
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferencesdisktab.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "widget/slider/floatslider.h"
#include "widget/path/pathwidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesDiskTab : public PreferencesTab
{
@@ -53,6 +53,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESDISKTAB_H
app/dialog/preferences/tabs/preferencesgeneraltab.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "dialog/sequence/sequence.h"
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesGeneralTab::PreferencesGeneralTab()
{
@@ -128,4 +128,4 @@ void PreferencesGeneralTab::AddLanguage(const QString &locale_name)
language_combobox_->setItemData(language_combobox_->count() - 1, locale_name);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferencesgeneraltab.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include "project/item/sequence/sequence.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesGeneralTab : public PreferencesTab
{
@@ -52,6 +52,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESGENERALTAB_H
app/dialog/preferences/tabs/preferenceskeyboardtab.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include <QPushButton>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesKeyboardTab::PreferencesKeyboardTab(QMenuBar *menubar)
{
@@ -239,4 +239,4 @@ void PreferencesKeyboardTab::save_shortcut_file() {
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferenceskeyboardtab.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "preferencestab.h"
#include "../keysequenceeditor.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesKeyboardTab : public PreferencesTab
{
@@ -134,6 +134,6 @@ private:
QVector<KeySequenceEditor*> key_shortcut_fields_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESKEYBOARDTAB_H
app/dialog/preferences/tabs/preferencestab.cpp
+2 -2
View File
@@ -20,11 +20,11 @@
#include "preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
bool PreferencesTab::Validate()
{
return true;
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/preferences/tabs/preferencestab.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesTab : public QWidget
{
@@ -37,6 +37,6 @@ public:
virtual void Accept() = 0;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESTAB_H
app/dialog/progress/progress.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWidget *parent) :
QDialog(parent)
@@ -101,4 +101,4 @@ void ProgressDialog::ShowErrorMessage(const QString &title, const QString &messa
b.exec();
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/progress/progress.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/debug.h"
#include "widget/taskview/elapsedcounterwidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProgressDialog : public QDialog
{
@@ -56,6 +56,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROGRESSDIALOG_H
app/dialog/projectproperties/projectproperties.cpp
+2 -2
View File
@@ -35,7 +35,7 @@
#include "render/colormanager.h"
#include "render/diskmanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
QDialog(parent),
@@ -242,4 +242,4 @@ void ProjectPropertiesDialog::OCIOFilenameUpdated()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/projectproperties/projectproperties.h
+2 -2
View File
@@ -31,7 +31,7 @@
#include "project/project.h"
#include "widget/path/pathwidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectPropertiesDialog : public QDialog
{
@@ -68,6 +68,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTPROPERTIESDIALOG_H
app/dialog/rendercancel/rendercancel.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "rendercancel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
RenderCancelDialog::RenderCancelDialog(QWidget *parent) :
ProgressDialog(tr("Waiting for workers to finish..."), tr("Renderer"), parent),
@@ -79,4 +79,4 @@ void RenderCancelDialog::UpdateProgress()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/rendercancel/rendercancel.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "dialog/progress/progress.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class RenderCancelDialog : public ProgressDialog
{
@@ -54,6 +54,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // RENDERCANCELDIALOG_H
app/dialog/richtext/richtext.cpp
+2 -2
View File
@@ -28,7 +28,7 @@
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
QDialog(parent)
@@ -336,4 +336,4 @@ void RichTextDialog::UpdateButtons()
*/
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/richtext/richtext.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "common/define.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class RichTextDialog : public QDialog
{
@@ -82,6 +82,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // RICHTEXTDIALOG_H
app/dialog/sequence/presetmanager.h
+2 -2
View File
@@ -34,7 +34,7 @@
#include "common/filefunctions.h"
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Preset
{
@@ -234,6 +234,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PRESETMANAGER_H
app/dialog/sequence/sequence.cpp
+2 -2
View File
@@ -33,7 +33,7 @@
#include "common/rational.h"
#include "undo/undostack.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) :
QDialog(parent),
@@ -171,4 +171,4 @@ void SequenceDialog::SequenceParamCommand::undo_internal()
sequence_->set_name(old_name_);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/sequence/sequence.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "sequencedialogpresettab.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A dialog for editing Sequence parameters
@@ -133,6 +133,6 @@ private:
};
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEDIALOG_H
app/dialog/sequence/sequencedialogparametertab.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidget* parent) :
QWidget(parent)
@@ -143,4 +143,4 @@ void SequenceDialogParameterTab::UpdatePreviewResolutionLabel()
QString::number(test_param.effective_height())));
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/sequence/sequencedialogparametertab.h
+2 -2
View File
@@ -10,7 +10,7 @@
#include "widget/slider/integerslider.h"
#include "widget/standardcombos/standardcombos.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequenceDialogParameterTab : public QWidget
{
@@ -97,6 +97,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEDIALOGPARAMETERTAB_H
app/dialog/sequence/sequencedialogpresettab.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include "ui/icons/icons.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const int kDataIsPreset = Qt::UserRole;
const int kDataPresetIsCustomRole = Qt::UserRole + 1;
@@ -295,4 +295,4 @@ void SequenceDialogPresetTab::DeleteSelectedPreset()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/sequence/sequencedialogpresettab.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "presetmanager.h"
#include "sequencepreset.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequenceDialogPresetTab : public QWidget, public PresetManager<SequencePreset>
{
@@ -77,6 +77,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEDIALOGPRESETTAB_H
app/dialog/sequence/sequencepreset.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "dialog/sequence/presetmanager.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequencePreset : public Preset {
public:
@@ -174,6 +174,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEPARAM_H
app/dialog/task/task.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include <QtConcurrent/QtConcurrent>
OLIVE_NAMESPACE_ENTER
namespace olive {
TaskDialog::TaskDialog(Task* task, const QString& title, QWidget *parent) :
ProgressDialog(task->GetTitle(), title, parent),
@@ -85,4 +85,4 @@ void TaskDialog::TaskFinished()
close();
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/task/task.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "dialog/progress/progress.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TaskDialog : public ProgressDialog
{
@@ -77,6 +77,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TASKDIALOG_H