namechange

5 files changed, 11 insertions, 26 deletions

diff --git a/src/lead.cpp b/src/lead.cpp
index f6a4c60..fb6c3cb 100644
--- a/src/lead.cpp
+++ b/src/lead.cpp
@@ -30,12 +30,9 @@ SOFTWARE.
 #include <QFileSystemWatcher>
 
 
-namespace mlde {
-
-
 Lead::Lead(int &argc, char** argv) :
     QApplication(argc, argv),
-    settings("mlde", "lead"),
+    settings("lead", "lead"),
     watcher()
 {   
     loadScreens();
@@ -61,7 +58,7 @@ Lead::watchSettings()
 void
 Lead::fileChanged(QString fileName)
 {
-    qDebug() << "mlde::Lead::fileChanged() fileName: " << fileName;
+    qDebug() << "Lead::fileChanged() fileName: " << fileName;
 
     // this reloads the settings from the file
     settings.sync();
@@ -113,7 +110,7 @@ Lead::loadScreens()
 void
 Lead::loadScreen(QScreen* screen)
 {
-    qDebug() << "mlde::Lead::loadScreen() " << screen->name();
+    qDebug() << "Lead::loadScreen() " << screen->name();
 
     QRect rec = screen->geometry();
     
@@ -137,7 +134,7 @@ Lead::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h)
 
     if (!settings.contains(key) )
     {
-        qDebug() << "mlde::Lead::loadSensor() key " << name << " not found";
+        qDebug() << "Lead::loadSensor() key " << name << " not found";
         
         // restore missing key
         settings.setValue(key, QString());
@@ -146,7 +143,7 @@ Lead::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h)
 
     if (settings.value(key).toString().isEmpty())
     {
-        qDebug() << "mlde::Lead::loadSensor() key " << name << " is empty";
+        qDebug() << "Lead::loadSensor() key " << name << " is empty";
         return;
     }
     
@@ -154,7 +151,4 @@ Lead::loadSensor(QScreen* screen, QString name, int x, int y, int w, int h)
     // create sensor and save in list so we can delete all sensors on delete
 
     sensors.append( new lead::Sensor(x, y, w, h, settings.value(key).toString()) );
-}
-
-
-} // namespace
+}
\ No newline at end of file
diff --git a/src/lead.h b/src/lead.h
index e9b7f08..3e7c9bd 100644
--- a/src/lead.h
+++ b/src/lead.h
@@ -34,9 +34,6 @@ SOFTWARE.
 #include <QFileSystemWatcher>
 
 
-namespace mlde {
-
-
 class Lead : public QApplication
 {
     Q_OBJECT
@@ -62,6 +59,3 @@ public slots:
     void fileChanged(QString fileName);
 
 };
-
-
-} // namespace
diff --git a/src/main.cpp b/src/main.cpp
index bd627c6..96ee49e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,13 +24,12 @@ SOFTWARE.
 
 
 #include "lead.h"
-#include <QApplication>
 
 
 int
 main(int argc, char *argv[])
 {
-    mlde::Lead lead(argc, argv);
+    Lead lead(argc, argv);
 
     return lead.exec();
 }
diff --git a/src/sensor.cpp b/src/sensor.cpp
index 822dc98..841a4df 100644
--- a/src/sensor.cpp
+++ b/src/sensor.cpp
@@ -29,14 +29,13 @@ SOFTWARE.
 #include <QProcess>
 
 
-namespace mlde {
 namespace lead {
 
 
 Sensor::Sensor(int x, int y, int w, int h, QString action):
     QWidget()
 {
-    qDebug() << "mlde::lead::Sensor() " << x << "," << y << "," << w << "," << h << " : " << action;
+    qDebug() << "lead::Sensor() " << x << "," << y << "," << w << "," << h << " : " << action;
 
     this->action = action;    
 
@@ -56,10 +55,10 @@ Sensor::~Sensor()
 void
 Sensor::enterEvent(QEvent * event)
 {
-    qDebug() << "mlde::lead::Sensor::enterEvent() " << this->x() << ":" << this->y() << " action: " << this->action;
+    qDebug() << "lead::Sensor::enterEvent() " << this->x() << ":" << this->y() << " action: " << this->action;
 
     QProcess::startDetached(action);
 }
 
 
-}} // namespace
+} // namespace
diff --git a/src/sensor.h b/src/sensor.h
index bc448c6..8efb7a3 100644
--- a/src/sensor.h
+++ b/src/sensor.h
@@ -30,7 +30,6 @@ SOFTWARE.
 #include <QScreen>
 
 
-namespace mlde {
 namespace lead {
 
 
@@ -51,4 +50,4 @@ private:
 };
 
 
-}} // namespace
+} // namespace