Naming conventions

6 files changed, 12 insertions, 12 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index aac76041..d2774431 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1534,7 +1534,7 @@ void MainWindow::initTrayIcon()
     }
     if(QSystemTrayIcon::isSystemTrayAvailable() == true) {
         // Setup tray icon
-        this->tray = new trayIcon(this);
+        this->tray = new TrayIcon(this);
         if(tray == NULL){
             qDebug() << "Allocating tray icon failed.";
         }
diff --git a/mainwindow.h b/mainwindow.h
index 587d2a74..91cca8cc 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -127,7 +127,7 @@ private:
     QHash<QString, QString> profiles;
     QString profile;
     bool startupPhase;
-    trayIcon *tray;
+    TrayIcon *tray;
     bool useTrayIcon;
     bool hideOnClose;
     bool startMinimized;
diff --git a/Info.plist b/qtpass.plist
index d0db84d8..d0db84d8 100644
--- a/Info.plist
+++ b/qtpass.plist
diff --git a/qtpass.pro b/qtpass.pro
index 53d9efc0..fbf2c547 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -113,7 +113,7 @@ win32 {
     LIBS    += -lmpr
 } else:macx {
     ICON = artwork/icon.icns
-    QMAKE_INFO_PLIST = Info.plist
+    QMAKE_INFO_PLIST = qtpass.plist
 } else:bsd {
     LIBS += -L/usr/local/lib
 }
diff --git a/trayicon.cpp b/trayicon.cpp
index 8dace210..feaa1e9f 100644
--- a/trayicon.cpp
+++ b/trayicon.cpp
@@ -1,6 +1,6 @@
 #include "trayicon.h"
 
-trayIcon::trayIcon(QMainWindow *parent)
+TrayIcon::TrayIcon(QMainWindow *parent)
 {
   parentwin = parent;
 
@@ -16,7 +16,7 @@ trayIcon::trayIcon(QMainWindow *parent)
 
 }
 
-void trayIcon::setVisible(bool visible)
+void TrayIcon::setVisible(bool visible)
 {
   if(visible == true) {
     parentwin->show();
@@ -25,7 +25,7 @@ void trayIcon::setVisible(bool visible)
   }
 }
 
-void trayIcon::createActions()
+void TrayIcon::createActions()
 {
 //  minimizeAction = new QAction(tr("Mi&nimize"), this);
 //  connect(minimizeAction, SIGNAL(triggered()), this, SLOT(hide()));
@@ -41,7 +41,7 @@ void trayIcon::createActions()
 }
 
 
-void trayIcon::createTrayIcon()
+void TrayIcon::createTrayIcon()
 {
   trayIconMenu = new QMenu(this);
 //  trayIconMenu->addAction(minimizeAction);
@@ -54,7 +54,7 @@ void trayIcon::createTrayIcon()
   sysTrayIcon->setContextMenu(trayIconMenu);
 }
 
-void trayIcon::showHideParent()
+void TrayIcon::showHideParent()
 {
   if(parentwin->isVisible() == true) {
     parentwin->hide();
@@ -63,7 +63,7 @@ void trayIcon::showHideParent()
   }
 }
 
-void trayIcon::iconActivated(QSystemTrayIcon::ActivationReason reason)
+void TrayIcon::iconActivated(QSystemTrayIcon::ActivationReason reason)
 {
     switch (reason) {
     case QSystemTrayIcon::Trigger:
@@ -78,7 +78,7 @@ void trayIcon::iconActivated(QSystemTrayIcon::ActivationReason reason)
     }
 }
 
-void trayIcon::showMessage(QString title, QString msg, int time)
+void TrayIcon::showMessage(QString title, QString msg, int time)
 {
     sysTrayIcon->showMessage(title, msg, QSystemTrayIcon::Information, time);
 }
diff --git a/trayicon.h b/trayicon.h
index b8ea411d..b05cf768 100644
--- a/trayicon.h
+++ b/trayicon.h
@@ -8,11 +8,11 @@
 #include <QSystemTrayIcon>
 #include <QWidget>
 
-class trayIcon : public QWidget
+class TrayIcon : public QWidget
 {
     Q_OBJECT
 public:
-    explicit trayIcon(QMainWindow *parent);
+    explicit TrayIcon(QMainWindow *parent);
     void showMessage(QString title, QString msg, int time);
     void setVisible(bool visible);