added Q_OBJECT macro to classes that were missing it

2020-11-17 19:13:16 +11:00
parent d24178b1b1
commit 15a29288aa
32 changed files with 43 additions and 16 deletions
@@ -28,7 +28,9 @@

 OLIVE_NAMESPACE_ENTER

-class ExportCodec : public QObject {
+class ExportCodec : public QObject
+{
+  Q_OBJECT
 public:
  enum Codec {
    kCodecDNxHD,
@@ -29,7 +29,9 @@

 OLIVE_NAMESPACE_ENTER

-class ExportFormat : public QObject {
+class ExportFormat : public QObject
+{
+  Q_OBJECT
 public:
  enum Format {
    kFormatDNxHD,
@@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER

 class CodecSection : public QWidget
 {
+  Q_OBJECT
 public:
  CodecSection(QWidget* parent = nullptr);

@@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER

 class H264CRFSection : public QWidget
 {
+  Q_OBJECT
 public:
  H264CRFSection(QWidget* parent = nullptr);

@@ -49,6 +50,7 @@ private:

 class H264BitRateSection : public QWidget
 {
+  Q_OBJECT
 public:
  H264BitRateSection(QWidget* parent = nullptr);

@@ -71,6 +73,7 @@ private:

 class H264FileSizeSection : public QWidget
 {
+  Q_OBJECT
 public:
  H264FileSizeSection(QWidget* parent = nullptr);

@@ -86,6 +89,7 @@ private:

 class H264Section : public CodecSection
 {
+  Q_OBJECT
 public:
  enum CompressionMethod {
    kConstantRateFactor,
@@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER

 class ImageSection : public CodecSection
 {
+  Q_OBJECT
 public:
  ImageSection(QWidget* parent = nullptr);

@@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER

 class ExportAudioTab : public QWidget
 {
+  Q_OBJECT
 public:
  ExportAudioTab(QWidget* parent = nullptr);

@@ -34,6 +34,7 @@ OLIVE_NAMESPACE_ENTER

 class VideoStreamProperties : public StreamProperties
 {
+  Q_OBJECT
 public:
  VideoStreamProperties(VideoStreamPtr stream);

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class PanNode : public Node
 {
+  Q_OBJECT
 public:
  PanNode();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class VolumeNode : public MathNodeBase
 {
+  Q_OBJECT
 public:
  VolumeNode();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class CrossDissolveTransition : public TransitionBlock
 {
+  Q_OBJECT
 public:
  CrossDissolveTransition();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class DipToColorTransition : public TransitionBlock
 {
+  Q_OBJECT
 public:
  DipToColorTransition();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class TransitionBlock : public Block
 {
+  Q_OBJECT
 public:
  TransitionBlock();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class BlurFilterNode : public Node
 {
+  Q_OBJECT
 public:
  BlurFilterNode();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class StrokeFilterNode : public Node
 {
+  Q_OBJECT
 public:
  StrokeFilterNode();

@@ -28,6 +28,7 @@ OLIVE_NAMESPACE_ENTER

 class PolygonGenerator : public Node
 {
+  Q_OBJECT
 public:
  PolygonGenerator();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class SolidGenerator : public Node
 {
+  Q_OBJECT
 public:
  SolidGenerator();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class TextGenerator : public Node
 {
+  Q_OBJECT
 public:
  TextGenerator();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class AudioInput : public MediaInput
 {
+  Q_OBJECT
 public:
  AudioInput() = default;

@@ -30,6 +30,7 @@ OLIVE_NAMESPACE_ENTER

 class VideoInput : public MediaInput
 {
+  Q_OBJECT
 public:
  VideoInput() = default;

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class MathNode : public MathNodeBase
 {
+  Q_OBJECT
 public:
  MathNode();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class MergeNode : public Node
 {
+  Q_OBJECT
 public:
  MergeNode();

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class TrigonometryNode : public Node
 {
+  Q_OBJECT
 public:
  TrigonometryNode();

@@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER
 */
 class NodeOutput : public NodeParam
 {
+  Q_OBJECT
 public:
  /**
   * @brief NodeOutput Constructor
@@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER
 */
 class AudioMonitorPanel : public PanelWidget
 {
+  Q_OBJECT
 public:
  AudioMonitorPanel(QWidget* parent = nullptr);

@@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER

 class SequenceViewerPanel : public ViewerPanel
 {
+  Q_OBJECT
 public:
  SequenceViewerPanel(QWidget* parent);

@@ -509,7 +509,7 @@ ProjectViewModel::MoveItemCommand::MoveItemCommand(ProjectViewModel *model,
 {
  source_ = static_cast<Folder*>(item->parent());

-  setText(tr("Move Item"));
+  setText(QCoreApplication::translate("MoveItemCommand", "Move Item"));
 }

 Project *ProjectViewModel::MoveItemCommand::GetRelevantProject() const
@@ -535,7 +535,7 @@ ProjectViewModel::RenameItemCommand::RenameItemCommand(ProjectViewModel* model,
 {
  old_name_ = item->name();

-  setText(tr("Rename Item"));
+  setText(QCoreApplication::translate("RenameItemCommand", "Rename Item"));
 }

 Project *ProjectViewModel::RenameItemCommand::GetRelevantProject() const
@@ -39,6 +39,7 @@ OLIVE_NAMESPACE_ENTER
 */
 class ProjectViewModel : public QAbstractItemModel
 {
+  Q_OBJECT
 public:
  enum ColumnType {
    /// Media name
@@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER

 class ConformTask : public Task
 {
+  Q_OBJECT
 public:
  ConformTask(AudioStreamPtr stream, const AudioParams& params);

@@ -30,6 +30,7 @@ OLIVE_NAMESPACE_ENTER

 class PreCacheTask : public RenderTask
 {
+  Q_OBJECT
 public:
  PreCacheTask(VideoStreamPtr footage, Sequence* sequence);

@@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER

 class NodeTableView : public QTreeWidget
 {
+  Q_OBJECT
 public:
  NodeTableView(QWidget* parent = nullptr);

@@ -314,17 +314,17 @@ void ImportTool::DropGhosts(bool insert)
    DropWithoutSequenceBehavior behavior = static_cast<DropWithoutSequenceBehavior>(Config::Current()["DropWithoutSequenceBehavior"].toInt());

    if (behavior == kDWSAsk) {
-      QCheckBox* dont_ask_again_box = new QCheckBox(tr("Don't ask me again"));
+      QCheckBox* dont_ask_again_box = new QCheckBox(QCoreApplication::translate("ImportTool", "Don't ask me again"));

      QMessageBox mbox(parent());

      mbox.setIcon(QMessageBox::Question);
-      mbox.setWindowTitle(tr("No Active Sequence"));
-      mbox.setText(tr("No sequence is currently open. Would you like to create one?"));
+      mbox.setWindowTitle(QCoreApplication::translate("ImportTool", "No Active Sequence"));
+      mbox.setText(QCoreApplication::translate("ImportTool", "No sequence is currently open. Would you like to create one?"));
      mbox.setCheckBox(dont_ask_again_box);

-      QPushButton* auto_params_btn = mbox.addButton(tr("Automatically Detect Parameters From Footage"), QMessageBox::YesRole);
-      QPushButton* manual_params_btn = mbox.addButton(tr("Set Parameters Manually"), QMessageBox::NoRole);
+      QPushButton* auto_params_btn = mbox.addButton(QCoreApplication::translate("ImportTool", "Automatically Detect Parameters From Footage"), QMessageBox::YesRole);
+      QPushButton* manual_params_btn = mbox.addButton(QCoreApplication::translate("ImportTool", "Set Parameters Manually"), QMessageBox::NoRole);
      mbox.addButton(QMessageBox::Cancel);

      mbox.exec();
@@ -498,9 +498,4 @@ QList<ImportTool::DraggedFootage> ImportTool::FootageToDraggedFootage(QList<Foot
  return df;
 }

-QString ImportTool::tr(const char *s)
-{
-  return QCoreApplication::translate("ImportTool", s);
-}
-
 OLIVE_NAMESPACE_EXIT
@@ -72,8 +72,6 @@ private:
  static DraggedFootage FootageToDraggedFootage(Footage* f);
  static QList<DraggedFootage> FootageToDraggedFootage(QList<Footage*> footage);

-  QString tr(const char* s);
-
  void FootageToGhosts(rational ghost_start, const QList<DraggedFootage>& footage, const rational &dest_tb, const int &track_start);

  void PrepGhosts(const rational &frame, const int &track_index);