Fixed mHasTaskbarButton not being initialized. Removed addToRecentDoc…

…s (XP compat).
ckaiser · Feb 21, 2016 · 43c652b · 43c652b
1 parent 4d7e070
commit 43c652b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/lightscreenwindow.cpp b/lightscreenwindow.cpp
@@ -63,7 +63,8 @@ LightscreenWindow::LightscreenWindow(QWidget *parent) :
   mWasVisible(true),
   mLastMessage(0),
   mLastMode(-1),
-  mLastScreenshot()
+  mLastScreenshot(),
+  mHasTaskbarButton(false)
 {
   ui.setupUi(this);
 

diff --git a/tools/os.cpp b/tools/os.cpp
@@ -54,24 +54,6 @@
 
 #include "os.h"
 
-void os::addToRecentDocuments(QString fileName)
-{
-#ifdef Q_OS_WIN
-  LPCWSTR szFileName = QDir::toNativeSeparators(fileName).toStdWString().c_str();
-  SHARDAPPIDINFO info;
-  IShellItem* item;
-
-  if (SUCCEEDED(SHCreateItemFromParsingName(szFileName, NULL, IID_PPV_ARGS(&item)))) {
-    info.psi = item;
-    info.pszAppID = L"K.Lightscreen";  // our AppID - see above
-
-    SHAddToRecentDocs (SHARD_APPIDINFO, &info);
-  }
-#else
-  Q_UNUSED(fileName)
-#endif
-}
-
 QPixmap os::cursor()
 {
 #ifdef Q_OS_WIN

diff --git a/tools/os.h b/tools/os.h
@@ -35,9 +35,6 @@ class QIcon;
 
 namespace os
 {
-  // Adds the filename to the Windows recent document list (useful for Windows 7 jump lists)
-  void addToRecentDocuments(QString fileName);
-
   // Returns the cursor pixmap in Windows
   QPixmap cursor();
 

diff --git a/tools/screenshot.cpp b/tools/screenshot.cpp
@@ -271,8 +271,6 @@ void Screenshot::save()
     else {
       result = Screenshot::Fail;
     }
-
-    os::addToRecentDocuments(fileName);
   }
 
   mOptions.fileName = fileName;
-Original file line number
+Diff line change
@@ Expand Up / @@ -271,8 +271,6 @@ void Screenshot::save() @@
         else {
           result = Screenshot::Fail;
         }
-        os::addToRecentDocuments(fileName);
       }
       mOptions.fileName = fileName;
@@ Expand Down @@