Merge with branch1.1

1 files changed, 32 insertions, 30 deletions

diff --git a/src/moapplication.h b/src/moapplication.h
index 3d74031d..645b9144 100644
--- a/src/moapplication.h
+++ b/src/moapplication.h
@@ -17,33 +17,35 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MOAPPLICATION_H

-#define MOAPPLICATION_H

-

-#include <QApplication>

-#include <QFileSystemWatcher>

-

-

-class MOApplication : public QApplication {

-Q_OBJECT

-public:

-

-  MOApplication(int argc, char **argv);

-

-  virtual bool notify (QObject *receiver, QEvent *event);

-

-public slots:

-

-  void setStyleFile(const QString &style);

-

-private slots:

-

-  void updateStyle(const QString &fileName);

-

-private:

-

-  QFileSystemWatcher m_StyleWatcher;

-};

-

-

-#endif // MOAPPLICATION_H

+#ifndef MOAPPLICATION_H
+#define MOAPPLICATION_H
+
+#include <QApplication>
+#include <QFileSystemWatcher>
+
+
+class MOApplication : public QApplication {
+Q_OBJECT
+public:
+
+  MOApplication(int argc, char **argv);
+
+  virtual bool notify (QObject *receiver, QEvent *event);
+
+public slots:
+
+  bool setStyleFile(const QString &style);
+
+private slots:
+
+  void updateStyle(const QString &fileName);
+
+private:
+
+  QFileSystemWatcher m_StyleWatcher;
+  QString m_DefaultStyle;
+
+};
+
+
+#endif // MOAPPLICATION_H