I've made the suggested changes.
a) do not use STL classes (and also no use of std-namespace) but Qt
container classes -> QVector
DONE
b) use camel-case coding style: m_to_render_vec -> m_tracksToRender,
DONE
c) please use typedefs for containers, i.e.
DONE
This patch will need to be applied on top of my previous patch.
I'm still thinking about making changes to the way the BB tracks are
exported. Should I just continue to post patches here to be applied? Or
would you prefer an aggregate patch after all changes are made?
Devin
diff --git a/include/export_project_dialog.h
b/include/export_project_dialog.h
index 944e5fe..f44aa07 100644
--- a/include/export_project_dialog.h
+++ b/include/export_project_dialog.h
@@ -59,11 +59,14 @@ private slots:
private:
QString m_fileName;
QString m_dirName;
- std::vector<ProjectRenderer*> m_renderers;
- bool m_multi_export;
- std::vector<track*> m_unmuted;
+ typedef QVector<ProjectRenderer*> RenderVector;
+ RenderVector m_renderers;
+ bool m_multiExport;
+
+ typedef QVector<track*> TrackVector;
+ TrackVector m_unmuted;
ProjectRenderer::ExportFileFormats m_ft;
- std::vector<track*> m_to_render_vec;
+ TrackVector m_tracksToRender;
} ;
#endif
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 75f4f2e..d76f038 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -60,8 +60,6 @@
#include "templates.h"
#include "text_float.h"
#include "timeline.h"
-#include <vector>
-using namespace std;
tick_t midiTime::s_ticksPerTact = DefaultTicksPerTact;
diff --git a/src/gui/export_project_dialog.cpp
b/src/gui/export_project_dialog.cpp
index a0bb876..f7e7ae8 100644
--- a/src/gui/export_project_dialog.cpp
+++ b/src/gui/export_project_dialog.cpp
@@ -37,7 +37,7 @@ exportProjectDialog::exportProjectDialog( const QString &
_file_name,
QDialog( _parent ),
Ui::ExportProjectDialog(),
m_fileName( _file_name ),
- m_multi_export(multi_export)
+ m_multiExport(multi_export)
{
setupUi( this );
setWindowTitle( tr( "Export project to %1" ).arg(
@@ -85,7 +85,7 @@ exportProjectDialog::exportProjectDialog( const QString &
_file_name,
exportProjectDialog::~exportProjectDialog()
{
- for( std::vector<ProjectRenderer*>::const_iterator it =
m_renderers.begin();
+ for( RenderVector::const_iterator it = m_renderers.begin();
it != m_renderers.end(); ++it )
{
delete (*it);
@@ -97,7 +97,7 @@ exportProjectDialog::~exportProjectDialog()
void exportProjectDialog::reject()
{
- for( std::vector<ProjectRenderer*>::const_iterator it =
m_renderers.begin();
+ for( RenderVector::const_iterator it = m_renderers.begin();
it != m_renderers.end(); ++it )
{
(*it)->abortProcessing();
@@ -130,7 +130,7 @@ void exportProjectDialog::accept()
void exportProjectDialog::closeEvent( QCloseEvent * _ce )
{
- for( std::vector<ProjectRenderer*>::const_iterator it =
m_renderers.begin();
+ for( RenderVector::const_iterator it = m_renderers.begin();
it != m_renderers.end(); ++it )
{
if( (*it)->isRunning() )
@@ -143,10 +143,10 @@ void exportProjectDialog::closeEvent( QCloseEvent *
_ce )
void exportProjectDialog::pop_render() {
- track* render_track = m_to_render_vec.back();
- m_to_render_vec.pop_back();
+ track* render_track = m_tracksToRender.back();
+ m_tracksToRender.pop_back();
- for (std::vector<track*>::const_iterator it = m_unmuted.begin();
+ for (TrackVector::const_iterator it = m_unmuted.begin();
it != m_unmuted.end(); ++it) {
if ((*it) == render_track) {
(*it)->setMuted(false);
@@ -165,7 +165,6 @@ void exportProjectDialog::multi_render()
{
m_dirName = m_fileName;
QString path = QDir(m_fileName).filePath("text.txt");
- std::string strTest = path.toStdString();
const trackContainer::trackList & tl = engine::getSong()->tracks();
@@ -182,12 +181,11 @@ void exportProjectDialog::multi_render()
nextName = nextName.remove(QRegExp("[^a-zA-Z]"));
QString name = QString("%1_%2.wav").arg(x++).arg(nextName);
m_fileName = QDir(m_dirName).filePath(name);
- std::string strTest = m_fileName.toStdString();
prep_render();
}
}
- m_to_render_vec = m_unmuted;
+ m_tracksToRender = m_unmuted;
pop_render( );
}
@@ -257,7 +255,7 @@ void exportProjectDialog::startBtnClicked()
updateTitleBar( 0 );
- if (m_multi_export==true)
+ if (m_multiExport==true)
{
multi_render();
}
On Mon, Oct 29, 2012 at 3:19 AM, Tobias Doerffel
<[email protected]>wrote:
> Hi,
>
> Thanks for your efforts!
>
> 2012/10/29 Devin Venable <[email protected]>:
> > ...
> > + std::vector<track*> m_to_render_vec;
> > } ;
>
> Just 3 notes here.
>
> a) do not use STL classes (and also no use of std-namespace) but Qt
> container classes -> QVector
> b) use camel-case coding style: m_to_render_vec -> m_tracksToRender,
> m_multi_export -> m_multiExport
> c) please use typedefs for containers, i.e.
>
> typedef QVector<track *> TrackVector
>
> TrackVector m_tracksToRender
>
>
> Best regards
>
> Toby
>
------------------------------------------------------------------------------
The Windows 8 Center - In partnership with Sourceforge
Your idea - your app - 30 days.
Get started!
http://windows8center.sourceforge.net/
what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/
_______________________________________________
LMMS-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/lmms-devel
