1 files changed, 65 insertions, 67 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h
index b512f50..265ab31 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -24,8 +24,7 @@
  *  along with DrumGizmo; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef __DRUMGIZMO_MAINWINDOW_H__
-#define __DRUMGIZMO_MAINWINDOW_H__
+#pragma once
 
 #include <QMainWindow>
 #include <QScrollBar>
@@ -47,79 +46,78 @@
 #include "zoomslider.h"
 #include "canvaswidget.h"
 
-class Preset {
-public:  
-  QString prefix;
-  int attacklength;
-  int falloff;
-  int fadelength;
+class Preset
+{
+public:
+	QString prefix;
+	int attacklength;
+	int falloff;
+	int fadelength;
 };
 Q_DECLARE_METATYPE(Preset)
 
-class MainWindow : public QMainWindow {
-Q_OBJECT
+class MainWindow
+	: public QMainWindow
+{
+	Q_OBJECT
 public:
-  MainWindow();
-  ~MainWindow();
+	MainWindow();
+	~MainWindow();
 
 public slots:
-  /*
-  void setXScale(float);
-  void setYScale(float);
-  void setXOffset(int);
-  void setYOffset(int);
-  */
-  void doExport();
-  void loadFile(QString filename);
-  void playSamples();
-  void setPreset(int);
-  void browse();
-  void tabChanged(int tabid);
+	//void setXScale(float);
+	//void setYScale(float);
+	//void setXOffset(int);
+	//void setYOffset(int);
+	void doExport();
+	void loadFile(QString filename);
+	void playSamples();
+	void setPreset(int);
+	void browse();
+	void tabChanged(int tabid);
 
 protected:
-  void closeEvent(QCloseEvent*);
+	void closeEvent(QCloseEvent*);
 
 private:
-  void loadSettings();
-  void saveSettings();
-
-  QWidget *createFilesTab();
-  QWidget *createEditTab();
-  QWidget *createGenerateTab();
-  QWidget *createExportTab();
-
-  int generateTabId;
-
-  SampleSorter *sorter;
-  CanvasToolSelections *tool_selections;
-  CanvasToolThreshold *threshold;
-  CanvasToolListen *listen;
-  AudioExtractor *extractor;
-  FileList *filelist;
-
-  //Canvas *canvas;
-  //QScrollBar *yoffset;
-  //ZoomSlider *yscale;
-  //ZoomSlider *xscale;
-  //QScrollBar *xoffset;
-  CanvasWidget *canvaswidget;
-
-  QScrollBar *sb_playsamples;
-  QComboBox *presets;
-  QSlider *slider_attacklength;
-  QSlider *slider_spread;
-  QSlider *slider_hold;
-  QSlider *slider_falloff;
-  QSlider *slider_fadelength;
-  QLineEdit *prefix;
-  QLineEdit *lineed_exportp;
-
-  QTabWidget *tabs;
-
-  // Session state information:
-  Selections selections;
-  Selections selections_preview;
-  Player player;
+	void loadSettings();
+	void saveSettings();
+
+	QWidget* createFilesTab();
+	QWidget* createEditTab();
+	QWidget* createGenerateTab();
+	QWidget* createExportTab();
+
+	int generateTabId;
+
+	SampleSorter* sorter;
+	CanvasToolSelections* tool_selections;
+	CanvasToolThreshold* threshold;
+	CanvasToolListen* listen;
+	AudioExtractor* extractor;
+	FileList* filelist;
+
+	//Canvas* canvas;
+	//QScrollBar* yoffset;
+	//ZoomSlider* yscale;
+	//ZoomSlider* xscale;
+	//QScrollBar* xoffset;
+	CanvasWidget* canvaswidget;
+
+	QScrollBar* sb_playsamples;
+	QComboBox* presets;
+	QSlider* slider_attacklength;
+	QSlider* slider_spread;
+	QSlider* slider_hold;
+	QSlider* slider_falloff;
+	QSlider* slider_fadelength;
+	QLineEdit* prefix;
+	QLineEdit* lineed_exportp;
+
+	QTabWidget* tabs;
+
+	// Session state information:
+	Selections selections;
+	Selections selections_preview;
+	Player player;
 };
-
-#endif/*__DRUMGIZMO_MAINWINDOW_H__*/