From c2360f593cbe72ab174c947268bdbb36dde794cf Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Wed, 26 Nov 2014 00:46:49 +0100
Subject: [PATCH] Rename bb_track_container to BBTrackContainer

---
 ...b_track_container.h => BBTrackContainer.h} |  8 +-
 include/bb_editor.h                           |  6 +-
 include/engine.h                              |  6 +-
 plugins/HydrogenImport/HydrogenImport.cpp     |  2 +-
 plugins/flp_import/FlpImport.cpp              |  2 +-
 qt.cfg                                        | 81 +++++++++++++++++++
 src/core/AutomationPattern.cpp                |  2 +-
 ...ack_container.cpp => BBTrackContainer.cpp} | 34 ++++----
 src/core/FxMixer.cpp                          |  2 +-
 src/core/Song.cpp                             |  2 +-
 src/core/Track.cpp                            |  2 +-
 src/core/engine.cpp                           |  6 +-
 src/gui/AutomationEditor.cpp                  |  2 +-
 src/gui/FileBrowser.cpp                       |  2 +-
 src/gui/FxMixerView.cpp                       |  2 +-
 src/gui/PianoRoll.cpp                         |  2 +-
 src/gui/bb_editor.cpp                         |  4 +-
 src/gui/export_project_dialog.cpp             |  2 +-
 src/tracks/Pattern.cpp                        |  2 +-
 src/tracks/bb_track.cpp                       |  2 +-
 20 files changed, 126 insertions(+), 45 deletions(-)
 rename include/{bb_track_container.h => BBTrackContainer.h} (91%)
 create mode 100644 qt.cfg
 rename src/core/{bb_track_container.cpp => BBTrackContainer.cpp} (85%)

diff --git a/include/bb_track_container.h b/include/BBTrackContainer.h
similarity index 91%
rename from include/bb_track_container.h
rename to include/BBTrackContainer.h
index 465db8f48..56173c602 100644
--- a/include/bb_track_container.h
+++ b/include/BBTrackContainer.h
@@ -1,5 +1,5 @@
 /*
- * bb_track_container.h - model-component of BB-Editor
+ * BBTrackContainer.h - model-component of BB-Editor
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -30,13 +30,13 @@
 #include "combobox.h"
 
 
-class EXPORT bbTrackContainer : public TrackContainer
+class EXPORT BBTrackContainer : public TrackContainer
 {
 	Q_OBJECT
 	mapPropertyFromModel(int,currentBB,setCurrentBB,m_bbComboBoxModel);
 public:
-	bbTrackContainer();
-	virtual ~bbTrackContainer();
+	BBTrackContainer();
+	virtual ~BBTrackContainer();
 
 	virtual bool play( MidiTime _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _tco_num = -1 );
diff --git a/include/bb_editor.h b/include/bb_editor.h
index 993633b7b..6d2100e84 100644
--- a/include/bb_editor.h
+++ b/include/bb_editor.h
@@ -29,7 +29,7 @@
 #include "TrackContainerView.h"
 
 
-class bbTrackContainer;
+class BBTrackContainer;
 class comboBox;
 class toolButton;
 
@@ -38,7 +38,7 @@ class bbEditor : public TrackContainerView
 {
 	Q_OBJECT
 public:
-	bbEditor( bbTrackContainer * _tc );
+	bbEditor( BBTrackContainer * _tc );
 	virtual ~bbEditor();
 
 	virtual inline bool fixedTCOs() const
@@ -64,7 +64,7 @@ public slots:
 private:
 	virtual void keyPressEvent( QKeyEvent * _ke );
 
-	bbTrackContainer * m_bbtc;
+	BBTrackContainer * m_bbtc;
 	QWidget * m_toolBar;
 
 	toolButton * m_playButton;
diff --git a/include/engine.h b/include/engine.h
index 263345162..6ef3dc137 100644
--- a/include/engine.h
+++ b/include/engine.h
@@ -35,7 +35,7 @@
 
 class AutomationEditor;
 class bbEditor;
-class bbTrackContainer;
+class BBTrackContainer;
 class DummyTrackContainer;
 class FxMixer;
 class FxMixerView;
@@ -87,7 +87,7 @@ public:
 		return s_song;
 	}
 
-	static bbTrackContainer * getBBTrackContainer()
+	static BBTrackContainer * getBBTrackContainer()
 	{
 		return s_bbTrackContainer;
 	}
@@ -179,7 +179,7 @@ private:
 	static Mixer *s_mixer;
 	static FxMixer * s_fxMixer;
 	static Song * s_song;
-	static bbTrackContainer * s_bbTrackContainer;
+	static BBTrackContainer * s_bbTrackContainer;
 	static ProjectJournal * s_projectJournal;
 	static DummyTrackContainer * s_dummyTC;
 	static ControllerRackView * s_controllerRackView;
diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp
index 076f21e6d..edb8bdb17 100644
--- a/plugins/HydrogenImport/HydrogenImport.cpp
+++ b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -16,7 +16,7 @@
 #include "Pattern.h"
 #include "Track.h"
 #include "bb_track.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "Instrument.h"
 
 #define MAX_LAYERS 4
diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp
index ff5399544..9c5b7c233 100644
--- a/plugins/flp_import/FlpImport.cpp
+++ b/plugins/flp_import/FlpImport.cpp
@@ -34,7 +34,7 @@
 #include "AutomationPattern.h"
 #include "basic_filters.h"
 #include "bb_track.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "combobox.h"
 #include "ConfigManager.h"
 #include "debug.h"
diff --git a/qt.cfg b/qt.cfg
new file mode 100644
index 000000000..d01ae5c55
--- /dev/null
+++ b/qt.cfg
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<def>
+
+  <markup ext=".qml" reporterrors="false" aftercode="true">
+
+    <!-- keywords in QML code to ignore -->
+    <keywords>
+      <keyword name="if"/>
+      <keyword name="while"/>
+      <keyword name="typeof"/>
+      <keyword name="for"/>
+    </keywords>
+
+    <!-- code blocks are meta-code/pseudo code placed in the library
+         that is used/called by the native c/c++ code -->
+    <codeblocks>
+      <!-- need to add all the QML function names below -->
+      <block name="onClicked"/>
+      <block name="onFinished"/>
+      <block name="onTriggered"/>
+      <block name="onRetrieveTriggered"/>
+      <block name="onPressed"/>
+      <block name="onTouch"/>
+      <block name="onFocusedChanged"/>
+      <block name="onSubmittedNewStatusChanged"/>
+      <block name="onCreationCompleted"/>
+      <block name="onFileSelected"/>
+      <!-- code block structure in QML is:
+            onClicked: {
+              call(var)
+            } -->
+      <structure offset="3" start="{" end="}"/>
+      <!-- the start block is '3' tokens after the
+           name token so we skip them -->
+    </codeblocks>
+
+    <codeblocks>
+      <block name="function"/>
+      <!-- code block structure in QML is:
+            funnction x(args): {
+              call(var)
+            } -->
+      <structure offset="2" start="{" end="}"/>
+    </codeblocks>
+
+    <!-- Qt Properties have the format :
+           Q_PROPERTY(<type> <name> READ <func> WRITE <func> NOTIFY <func>)
+           the READ/WRITE/NOTIFY parts are optional -->
+    <exported>
+      <exporter prefix="Q_PROPERTY">
+        <suffix>READ</suffix> <!-- catch the element before READ if present -->
+        <prefix>READ</prefix>
+        <prefix>WRITE</prefix>
+        <prefix>NOTIFY</prefix>
+      </exporter>
+    </exported>
+
+    <!-- qml files can call connect on the c++ code -->
+    <imported>
+      <importer>connect</importer>
+    </imported>
+  </markup>
+
+  <!-- qt can call methods as strings using invokeMethod -->
+  <reflection>
+    <call arg="2">invokeMethod</call>
+  </reflection>
+
+  <!-- the SLOT/SIGNAL methods can be cause false-positives for pure
+  virtual functions being called in the constructor because it sees
+  the macro as a function. -->
+  <function name="SLOT">
+    <ignorefunction>true</ignorefunction>
+  </function>
+  <function name="SIGNAL">
+    <ignorefunction>true</ignorefunction>
+  </function>
+
+  <define name="Q_DECL_EXPORT" value=""/>
+  <define name="Q_DECL_IMPORT" value=""/>
+</def>
diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp
index d89df1dde..79f009e05 100644
--- a/src/core/AutomationPattern.cpp
+++ b/src/core/AutomationPattern.cpp
@@ -33,7 +33,7 @@
 #include "AutomationEditor.h"
 #include "AutomationTrack.h"
 #include "ProjectJournal.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "Song.h"
 #include "text_float.h"
 #include "embed.h"
diff --git a/src/core/bb_track_container.cpp b/src/core/BBTrackContainer.cpp
similarity index 85%
rename from src/core/bb_track_container.cpp
rename to src/core/BBTrackContainer.cpp
index 56015add1..dc43ac660 100644
--- a/src/core/bb_track_container.cpp
+++ b/src/core/BBTrackContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * bb_track_container.cpp - model-component of BB-Editor
+ * BBTrackContainer.cpp - model-component of BB-Editor
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
@@ -23,7 +23,7 @@
  */
 
 
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "bb_track.h"
 #include "combobox.h"
 #include "embed.h"
@@ -32,7 +32,7 @@
 
 
 
-bbTrackContainer::bbTrackContainer() :
+BBTrackContainer::BBTrackContainer() :
 	TrackContainer(),
 	m_bbComboBoxModel( this )
 {
@@ -47,14 +47,14 @@ bbTrackContainer::bbTrackContainer() :
 
 
 
-bbTrackContainer::~bbTrackContainer()
+BBTrackContainer::~BBTrackContainer()
 {
 }
 
 
 
 
-bool bbTrackContainer::play( MidiTime _start, fpp_t _frames,
+bool BBTrackContainer::play( MidiTime _start, fpp_t _frames,
 								f_cnt_t _offset, int _tco_num )
 {
 	bool played_a_note = false;
@@ -80,7 +80,7 @@ bool bbTrackContainer::play( MidiTime _start, fpp_t _frames,
 
 
 
-void bbTrackContainer::updateAfterTrackAdd()
+void BBTrackContainer::updateAfterTrackAdd()
 {
 	if( numOfBBs() == 0 && !engine::getSong()->isLoadingProject() )
 	{
@@ -97,7 +97,7 @@ void bbTrackContainer::updateAfterTrackAdd()
 
 
 
-tact_t bbTrackContainer::lengthOfBB( int _bb )
+tact_t BBTrackContainer::lengthOfBB( int _bb )
 {
 	MidiTime max_length = MidiTime::ticksPerTact();
 
@@ -114,7 +114,7 @@ tact_t bbTrackContainer::lengthOfBB( int _bb )
 
 
 
-int bbTrackContainer::numOfBBs() const
+int BBTrackContainer::numOfBBs() const
 {
 	return engine::getSong()->countTracks( Track::BBTrack );
 }
@@ -122,7 +122,7 @@ int bbTrackContainer::numOfBBs() const
 
 
 
-void bbTrackContainer::removeBB( int _bb )
+void BBTrackContainer::removeBB( int _bb )
 {
 	TrackList tl = tracks();
 	for( TrackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -139,7 +139,7 @@ void bbTrackContainer::removeBB( int _bb )
 
 
 
-void bbTrackContainer::swapBB( int _bb1, int _bb2 )
+void BBTrackContainer::swapBB( int _bb1, int _bb2 )
 {
 	TrackList tl = tracks();
 	for( TrackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -152,7 +152,7 @@ void bbTrackContainer::swapBB( int _bb1, int _bb2 )
 
 
 
-void bbTrackContainer::updateBBTrack( trackContentObject * _tco )
+void BBTrackContainer::updateBBTrack( trackContentObject * _tco )
 {
 	bbTrack * t = bbTrack::findBBTrack( _tco->startPosition() /
 							DefaultTicksPerTact );
@@ -165,7 +165,7 @@ void bbTrackContainer::updateBBTrack( trackContentObject * _tco )
 
 
 
-void bbTrackContainer::fixIncorrectPositions()
+void BBTrackContainer::fixIncorrectPositions()
 {
 	TrackList tl = tracks();
 	for( TrackList::iterator it = tl.begin(); it != tl.end(); ++it )
@@ -180,7 +180,7 @@ void bbTrackContainer::fixIncorrectPositions()
 
 
 
-void bbTrackContainer::play()
+void BBTrackContainer::play()
 {
 	if( engine::getSong()->playMode() != Song::Mode_PlayBB )
 	{
@@ -195,7 +195,7 @@ void bbTrackContainer::play()
 
 
 
-void bbTrackContainer::stop()
+void BBTrackContainer::stop()
 {
 	engine::getSong()->stop();
 }
@@ -203,7 +203,7 @@ void bbTrackContainer::stop()
 
 
 
-void bbTrackContainer::updateComboBox()
+void BBTrackContainer::updateComboBox()
 {
 	const int cur_bb = currentBB();
 
@@ -220,7 +220,7 @@ void bbTrackContainer::updateComboBox()
 
 
 
-void bbTrackContainer::currentBBChanged()
+void BBTrackContainer::currentBBChanged()
 {
 	// first make sure, all channels have a TCO at current BB
 	createTCOsForBB( currentBB() );
@@ -240,7 +240,7 @@ void bbTrackContainer::currentBBChanged()
 
 
 
-void bbTrackContainer::createTCOsForBB( int _bb )
+void BBTrackContainer::createTCOsForBB( int _bb )
 {
 	if( numOfBBs() == 0 || engine::getSong()->isLoadingProject() )
 	{
diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
index 4b6decb79..8c20fdefc 100644
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -31,7 +31,7 @@
 #include "Song.h"
 
 #include "InstrumentTrack.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "ValueBuffer.h"
 
 FxRoute::FxRoute( FxChannel * from, FxChannel * to, float amount ) :
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index 07d729dc1..6fae3eea3 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -35,7 +35,7 @@
 #include "AutomationEditor.h"
 #include "bb_editor.h"
 #include "bb_track.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "ControllerConnection.h"
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index fdb70f2ea..23a09f4e3 100644
--- a/src/core/Track.cpp
+++ b/src/core/Track.cpp
@@ -51,7 +51,7 @@
 #include "AutomationTrack.h"
 #include "bb_editor.h"
 #include "bb_track.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "ConfigManager.h"
 #include "Clipboard.h"
 #include "embed.h"
diff --git a/src/core/engine.cpp b/src/core/engine.cpp
index e281972ec..e42db7f4f 100644
--- a/src/core/engine.cpp
+++ b/src/core/engine.cpp
@@ -26,7 +26,7 @@
 #include "engine.h"
 #include "AutomationEditor.h"
 #include "bb_editor.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "FxMixer.h"
@@ -53,7 +53,7 @@ Mixer* engine::s_mixer = NULL;
 FxMixer * engine::s_fxMixer = NULL;
 FxMixerView * engine::s_fxMixerView = NULL;
 MainWindow * engine::s_mainWindow = NULL;
-bbTrackContainer * engine::s_bbTrackContainer = NULL;
+BBTrackContainer * engine::s_bbTrackContainer = NULL;
 Song * engine::s_song = NULL;
 SongEditor* engine::s_songEditor = NULL;
 AutomationEditor * engine::s_automationEditor = NULL;
@@ -82,7 +82,7 @@ void engine::init( const bool _has_gui )
 	s_mixer = new Mixer;
 	s_song = new Song;
 	s_fxMixer = new FxMixer;
-	s_bbTrackContainer = new bbTrackContainer;
+	s_bbTrackContainer = new BBTrackContainer;
 
 	s_ladspaManager = new ladspa2LMMS;
 
diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp
index da5ca6ce9..33b1c1921 100644
--- a/src/gui/AutomationEditor.cpp
+++ b/src/gui/AutomationEditor.cpp
@@ -59,7 +59,7 @@
 #include "tool_button.h"
 #include "text_float.h"
 #include "combobox.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "PianoRoll.h"
 #include "debug.h"
 #include "MeterModel.h"
diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index 6895233b1..14a862872 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -33,7 +33,7 @@
 #include <QMdiSubWindow>
 
 #include "FileBrowser.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "ConfigManager.h"
 #include "debug.h"
 #include "embed.h"
diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp
index 0e2463380..5a84e1e64 100644
--- a/src/gui/FxMixerView.cpp
+++ b/src/gui/FxMixerView.cpp
@@ -45,7 +45,7 @@
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
 #include "Song.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 
 FxMixerView::FxMixerView() :
 	QWidget(),
diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
index 543c4ed19..e981792dc 100644
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -47,7 +47,7 @@
 
 #include "ConfigManager.h"
 #include "PianoRoll.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "Clipboard.h"
 #include "combobox.h"
 #include "debug.h"
diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp
index de1c1b946..de32e07c2 100644
--- a/src/gui/bb_editor.cpp
+++ b/src/gui/bb_editor.cpp
@@ -29,7 +29,7 @@
 #include <QMdiArea>
 
 #include "bb_editor.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "embed.h"
 #include "MainWindow.h"
 #include "Song.h"
@@ -43,7 +43,7 @@
 
 
 
-bbEditor::bbEditor( bbTrackContainer* tc ) :
+bbEditor::bbEditor( BBTrackContainer* tc ) :
 	TrackContainerView( tc ),
 	m_bbtc( tc )
 {
diff --git a/src/gui/export_project_dialog.cpp b/src/gui/export_project_dialog.cpp
index 6965160d0..9ccd6e30f 100644
--- a/src/gui/export_project_dialog.cpp
+++ b/src/gui/export_project_dialog.cpp
@@ -30,7 +30,7 @@
 #include "Song.h"
 #include "engine.h"
 #include "MainWindow.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "bb_track.h"
 
 
diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp
index 95223d7c8..63768df91 100644
--- a/src/tracks/Pattern.cpp
+++ b/src/tracks/Pattern.cpp
@@ -46,7 +46,7 @@
 #include "AudioSampleRecorder.h"
 #include "Song.h"
 #include "tooltip.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "string_pair_drag.h"
 #include "MainWindow.h"
 
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index f04d2a3ff..a55672fc7 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -29,7 +29,7 @@
 
 #include "bb_editor.h"
 #include "bb_track.h"
-#include "bb_track_container.h"
+#include "BBTrackContainer.h"
 #include "embed.h"
 #include "engine.h"
 #include "gui_templates.h"