clean up code

Author: stevschmid

src/Autostart.cpp

@@ -38,7 +38,7 @@ LSSharedFileListItemRef FindLoginItemForCurrentBundle(CFArrayRef currentLoginIte
 
 #endif // Q_OS_MAC
 
-bool Autostart::IsActive()
+bool Autostart::Active()
 {
 #ifdef Q_WS_WIN
   const QString& applicationName = qApp->applicationName();

src/Autostart.h

@@ -3,6 +3,6 @@
 class Autostart
 {
 public:
-  bool IsActive();
+  bool Active();
   void SetActive( bool active );
 };

src/CocoaInitializer.h

@@ -2,12 +2,12 @@
 
 class CocoaInitializer
 {
-public:
-  CocoaInitializer();
-  ~CocoaInitializer();
-
 private:
   class Private;
   Private* d;
+
+public:
+  CocoaInitializer();
+  ~CocoaInitializer();
 };
 

src/CocoaInitializer.mm

@@ -5,8 +5,8 @@
 
 class CocoaInitializer::Private 
 {
-  public:
-    NSAutoreleasePool* autoReleasePool_;
+public:
+  NSAutoreleasePool* autoReleasePool_;
 };
 
 CocoaInitializer::CocoaInitializer()

src/Core.cpp

@@ -2,60 +2,60 @@
 #include "Tracker.h"
 
 Core::Core()
-  : currentGameMode( MODE_UNKNOWN ), gameRunning( false )
+  : mCurrentGameMode( MODE_UNKNOWN ), mGameRunning( false )
 {
-  sceneManager.RegisterObserver( this );
+  mSceneManager.RegisterObserver( this );
 
-  timer = new QTimer( this );
-  connect( timer, SIGNAL( timeout() ), this, SLOT( Tick() ) );
-  timer->start( 100 );
+  mTimer = new QTimer( this );
+  connect( mTimer, SIGNAL( timeout() ), this, SLOT( Tick() ) );
+  mTimer->start( 100 );
 }
 
 Core::~Core() {
-  delete timer;
+  delete mTimer;
 }
 
 void Core::Tick() {
-  bool wasGameRunning = gameRunning;
-  gameRunning = Hearthstone::Instance()->IsRunning();
+  bool wasGameRunning = mGameRunning;
+  mGameRunning = Hearthstone::Instance()->Running();
 
-  if( wasGameRunning != gameRunning ) {
-    if( gameRunning ) {
+  if( wasGameRunning != mGameRunning ) {
+    if( mGameRunning ) {
       LOG("Hearthstone found");
     } else {
       LOG("Hearthstone was closed");
     }
   }
 
-  if( gameRunning ) {
-    sceneManager.Update();
+  if( mGameRunning ) {
+    mSceneManager.Update();
   }
 }
 
 void Core::SceneChanged( Scene *oldScene, Scene *newScene ) {
-  LOG( "Scene %s", newScene->GetName().c_str() );
+  LOG( "Scene %s", newScene->Name().c_str() );
 
-  if( newScene->GetName() ==  "Ingame" ) {
+  if( newScene->Name() ==  "Ingame" ) {
     if( oldScene ) {
-      if( oldScene->GetName() == "Constructed" ) {
+      if( oldScene->Name() == "Constructed" ) {
         ConstructedScene *constructed = ( ConstructedScene* )oldScene;
-        currentGameMode = constructed->GetGameMode();
+        mCurrentGameMode = constructed->GameMode();
       }
-      if( oldScene->GetName() == "Arena" ) {
-        currentGameMode = MODE_ARENA;
+      if( oldScene->Name() == "Arena" ) {
+        mCurrentGameMode = MODE_ARENA;
       }
     }
   }
 
-  if( oldScene && oldScene->GetName() == "Ingame" ) {
+  if( oldScene && oldScene->Name() == "Ingame" ) {
     IngameScene *ingame = ( IngameScene* )oldScene;
 
     Tracker::Instance()->AddResult(
-        currentGameMode,
-        ingame->GetOutcome(),
-        ingame->GetGoingOrder(),
-        ingame->GetOwnClass(),
-        ingame->GetOpponentClass(),
-        ingame->GetCardHistoryList() );
+        mCurrentGameMode,
+        ingame->Outcome(),
+        ingame->GoingOrder(),
+        ingame->OwnClass(),
+        ingame->OpponentClass(),
+        ingame->CardHistoryList() );
   }
 }

src/Core.h

@@ -10,12 +10,10 @@ class Core : public QObject, public SceneManagerObserver
   Q_OBJECT
 
 private:
-  QTimer *timer;
-
-  SceneManager sceneManager;
-  GameMode currentGameMode;
-
-  bool gameRunning;
+  QTimer*       mTimer;
+  SceneManager  mSceneManager;
+  GameMode      mCurrentGameMode;
+  bool          mGameRunning;
 
 private slots:
   void Tick();

src/Hearthstone.cpp

@@ -15,19 +15,19 @@ DEFINE_SINGLETON_SCOPE( Hearthstone )
 
 Hearthstone::Hearthstone() {
 #ifdef Q_WS_MAC
-  capture = new OSXWindowCapture( "Hearthstone" );
+  mCapture = new OSXWindowCapture( "Hearthstone" );
 #elif defined Q_WS_WIN
-  capture = new WinWindowCapture( "Hearthstone" );
+  mCapture = new WinWindowCapture( "Hearthstone" );
 #endif
 }
 
 Hearthstone::~Hearthstone() {
-  if( capture != NULL )
-    delete capture;
+  if( mCapture != NULL )
+    delete mCapture;
 }
 
-bool Hearthstone::IsRunning() {
-  return capture->WindowFound();
+bool Hearthstone::Running() {
+  return mCapture->WindowFound();
 }
 
 #ifdef Q_WS_WIN
@@ -36,11 +36,11 @@ inline float roundf( float x ) {
 }
 #endif
 
-QPixmap Hearthstone::Capture(int vx, int vy, int vw, int vh) {
+QPixmap Hearthstone::Capture( int vx, int vy, int vw, int vh ) {
   int x, y, w, h;
 
-  int realCanvasWidth = capture->GetWidth();
-  int realCanvasHeight = capture->GetHeight();
+  int realCanvasWidth = mCapture->Width();
+  int realCanvasHeight = mCapture->Height();
 
   int virtualCanvasWidth = VIRTUAL_CANVAS_WIDTH;
   int virtualCanvasHeight = VIRTUAL_CANVAS_HEIGHT;
@@ -55,14 +55,14 @@ QPixmap Hearthstone::Capture(int vx, int vy, int vw, int vh) {
   w = roundf( vw * scale );
   h = roundf( vh * scale );
 
-  return capture->Capture( x, y, w, h );
+  return mCapture->Capture( x, y, w, h );
 }
 
-void Hearthstone::SetWindowCapture( WindowCapture *wc ) {
-  if( capture != NULL )
-    delete capture;
+void Hearthstone::SetWindowCapture( WindowCapture *windowCapture ) {
+  if( mCapture != NULL )
+    delete mCapture;
 
-  capture = wc;
+  mCapture = windowCapture;
 }
 
 void Hearthstone::EnableLogging() {
@@ -81,7 +81,7 @@ void Hearthstone::EnableLogging() {
       file.close();
 
       LOG( "Ingame Log activated." );
-      if( IsRunning() ) {
+      if( Running() ) {
         LOG("Please restart Hearthstone for logging to take effect.");
       }
     }
@@ -101,7 +101,7 @@ string Hearthstone::LogConfigPath() {
   QString homeLocation = QDesktopServices::storageLocation( QDesktopServices::HomeLocation );
   QString configPath = homeLocation + "/Library/Preferences/Blizzard/Hearthstone/log.config";
 #elif defined Q_WS_WIN
-  char buffer[MAX_PATH];
+  char buffer[ MAX_PATH ];
   SHGetSpecialFolderPathA( NULL, buffer, CSIDL_LOCAL_APPDATA, FALSE );
   QString localAppData( buffer );
   QString configPath = localAppData + "\\Blizzard\\Hearthstone\\log.config";
@@ -129,10 +129,10 @@ string Hearthstone::LogPath() {
   return logPath.toStdString();
 }
 
-int Hearthstone::GetWidth() {
-  return capture->GetWidth();
+int Hearthstone::Width() {
+  return mCapture->Width();
 }
 
-int Hearthstone::GetHeight() {
-  return capture->GetHeight();
+int Hearthstone::Height() {
+  return mCapture->Height();
 }

src/Hearthstone.h

@@ -15,13 +15,13 @@ class Hearthstone
   DEFINE_SINGLETON( Hearthstone )
 
 private:
-  WindowCapture *capture;
+  WindowCapture *mCapture;
 
 public:
   // Allow to override window capture for test environment
-  void SetWindowCapture( WindowCapture *wc );
+  void SetWindowCapture( WindowCapture *windowCapture );
 
-  bool IsRunning();
+  bool Running();
   QPixmap Capture( int vx, int vy, int vw, int vh );
 
   void EnableLogging();
@@ -30,7 +30,7 @@ class Hearthstone
   string LogConfigPath();
   string LogPath();
 
-  int GetWidth();
-  int GetHeight();
+  int Width();
+  int Height();
 
 };

src/HearthstoneLogAnalyzer.cpp

@@ -4,7 +4,7 @@
 #include <QStringList>
 
 HearthstoneLogAnalyzer::HearthstoneLogAnalyzer() {
-  connect( &logWatcher, SIGNAL( LineAdded(QString) ), this, SLOT( HandleLogLine(QString) ) );
+  connect( &mLogWatcher, SIGNAL( LineAdded(QString) ), this, SLOT( HandleLogLine(QString) ) );
 }
 
 void HearthstoneLogAnalyzer::HandleLogLine( const QString& line ) {

src/HearthstoneLogAnalyzer.h

@@ -6,6 +6,12 @@ class HearthstoneLogAnalyzer : public QObject
 {
   Q_OBJECT
 
+private:
+  HearthstoneLogWatcher mLogWatcher;
+
+private slots:
+  void HandleLogLine( const QString& line );
+
 public:
   HearthstoneLogAnalyzer();
 
@@ -14,10 +20,4 @@ class HearthstoneLogAnalyzer : public QObject
   void CardPlayed( Player player, const string& cardId );
   void CardReturned( Player player, const string& cardId );
   void CoinReceived( Player player );
-
-private slots:
-  void HandleLogLine( const QString& line );
-
-private:
-  HearthstoneLogWatcher logWatcher;
 };

src/HearthstoneLogWatcher.cpp

@@ -5,48 +5,48 @@
 #include <QTimer>
 
 HearthstoneLogWatcher::HearthstoneLogWatcher()
-  :path(Hearthstone::Instance()->LogPath().c_str()), lastSeekPos(0)
+  : mPath( Hearthstone::Instance()->LogPath().c_str() ), mLastSeekPos( 0 )
 {
   // We used QFileSystemWatcher before but it fails on windows
   // Windows File Notification seems to be very tricky with files
   // which are not explicitly flushed (which is the case for the Hearthstone Log)
   // QFileSystemWatcher fails, manual implemention with FindFirstChangeNotification
   // fails. So instead of putting too much work into a file-system depending solution
   // just use a low-overhead polling strategy
-  QTimer *timer = new QTimer(this);
-  connect(timer, SIGNAL(timeout()), this, SLOT(CheckForLogChanges()));
-  timer->start(CHECK_FOR_LOG_CHANGES_INTERVAL_MS);
+  QTimer *timer = new QTimer( this );
+  connect( timer, SIGNAL( timeout() ), this, SLOT( CheckForLogChanges() ) );
+  timer->start( CHECK_FOR_LOG_CHANGES_INTERVAL_MS );
 
-  QFile file(path);
-  if(file.exists()) {
-    lastSeekPos = file.size();
+  QFile file( mPath );
+  if( file.exists() ) {
+    mLastSeekPos = file.size();
   }
 }
 
 void HearthstoneLogWatcher::CheckForLogChanges() {
   // Only access disk when HS is running
-  if(!Hearthstone::Instance()->IsRunning()) {
+  if( !Hearthstone::Instance()->Running() ) {
     return;
   }
 
-  QFile file(path);
-  if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+  QFile file( mPath );
+  if( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
     return;
   }
 
   qint64 size = file.size();
-  if(size < lastSeekPos) {
-    lastSeekPos = size;
+  if( size < mLastSeekPos ) {
+    mLastSeekPos = size;
   } else {
-    QTextStream stream(&file);
-    stream.seek(lastSeekPos);
+    QTextStream stream( &file );
+    stream.seek( mLastSeekPos );
 
-    while(!stream.atEnd()) {
+    while( !stream.atEnd() ) {
       QString line = stream.readLine();
       emit LineAdded(line);
     }
 
-    lastSeekPos = stream.pos();
+    mLastSeekPos = stream.pos();
   }
 }
 

src/HearthstoneLogWatcher.h

@@ -7,8 +7,8 @@ class HearthstoneLogWatcher : public QObject
   Q_OBJECT
 
 private:
-  QString path;
-  qint64 lastSeekPos;
+  QString mPath;
+  qint64 mLastSeekPos;
 
 public:
   HearthstoneLogWatcher();