Remove some old comments, and also remove the old savedScreens variable that I was using for Xinerama testing.

3 files changed, 8 insertions, 17 deletions

diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index 2880c9d8..69e75737 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -108,8 +108,8 @@ void LSession::setupSession(){
 
   //Initialize the internal variables
   DESKTOPS.clear();
-  savedScreens.clear();
-  for(int i=0; i<this->desktop()->screenCount(); i++){ savedScreens << this->desktop()->screenGeometry(i); }
+  //savedScreens.clear();
+  //for(int i=0; i<this->desktop()->screenCount(); i++){ savedScreens << this->desktop()->screenGeometry(i); }
       
   //Start the background system tray
     splash.showScreen("systray");
@@ -432,7 +432,6 @@ void LSession::checkUserFiles(){
     qDebug() << "Updating session file to current version";
   }
 
-
   //Save the current version of the session to the settings file (for next time)
   if(newversion || newrelease){
     sessionsettings->setValue("DesktopVersion", this->applicationVersion());
@@ -460,9 +459,9 @@ void LSession::updateDesktops(){
     }*/
     qDebug() << "  -- Desktop Flags:" << firstrun << numchange << DW->isVirtualDesktop();
     //Now go through and 
-    if(!firstrun){ savedScreens.clear(); }
+    //if(!firstrun){ savedScreens.clear(); }
     for(int i=0; i<DW->screenCount(); i++){
-      if(!firstrun){ savedScreens << DW->screenGeometry(i); }
+      //if(!firstrun){ savedScreens << DW->screenGeometry(i); }
       bool found = false;
       for(int j=0; j<DESKTOPS.length() && !found; j++){
 	//Match either the screen number or the screen location (preventing duplicates)
@@ -608,10 +607,10 @@ QRect LSession::screenGeom(int num){
   if(geom.isNull() ){
     if( !scrn->geometry().isNull() ){ geom = scrn->geometry(); }
     else if( !scrn->virtualGeometry().isNull() ){ geom = scrn->virtualGeometry(); }
-    else if(num < savedScreens.length() ){
+    //else if(num < savedScreens.length() ){
     //Qt is backfiring (Xinarama w/ Fluxbox?) - return the saved geometry
-    geom = savedScreens[num];	
-    }
+    //geom = savedScreens[num];	
+    //}
   }
   return geom;
 }
diff --git a/lumina-desktop/LSession.h b/lumina-desktop/LSession.h
index 9edaf195..94f9b04d 100644
--- a/lumina-desktop/LSession.h
+++ b/lumina-desktop/LSession.h
@@ -108,7 +108,7 @@ private:
 	QMediaPlayer *mediaObj;
 	QSettings *sessionsettings, *DPlugSettings;
 	bool cleansession;
-	QList<QRect> savedScreens;
+	//QList<QRect> savedScreens;
 
 	//System Tray Variables
 	WId SystemTrayID, VisualTrayID;
diff --git a/lumina-desktop/SystemWindow.h b/lumina-desktop/SystemWindow.h
index a5130405..98617f79 100644
--- a/lumina-desktop/SystemWindow.h
+++ b/lumina-desktop/SystemWindow.h
@@ -2,17 +2,9 @@
 #define _LUMINA_DESKTOP_SYSTEM_WINDOW_H
 
 #include <QDialog>
-//#include <QCoreApplication>
-
-//#include <QList>
-//#include <QProcess>
 
 #include "ui_SystemWindow.h"
-//#include "Globals.h"
 
-//#include <LuminaXDG.h>
-//#include <LuminaX11.h>
-//#include <LuminaOS.h>