Merge pull request #11 from slicer69/master

Enabling building on 32-bit Linux, fixed compiler warning.

7 files changed, 9 insertions, 62 deletions

diff --git a/debian/patches/02-fix-compilation-non-amd64.diff b/debian/patches/02-fix-compilation-non-amd64.diff
deleted file mode 100644
index 401ec1b7..00000000
--- a/debian/patches/02-fix-compilation-non-amd64.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Fix compilation on architectures other than amd64
- don't link against libQtSolutions_SingleApplication-head on amd64/i386 and others.
- .
- lumina-desktop (0.6.2.14-1nano) unstable; urgency=low
- .
-   * Initial release
-Author: Christopher Roy Bratusek <nano@jpberlin.de>
-
---- lumina-desktop-0.6.2.14.orig/lumina-config/lumina-config.pro
-+++ lumina-desktop-0.6.2.14/lumina-config/lumina-config.pro
-@@ -22,7 +22,7 @@ FORMS    += mainUI.ui \
- 
- INCLUDEPATH += ../libLumina /usr/include
- 
--linux-g++-64 {
-+linux-g++* {
-   LIBS     += -L../libLumina -lLuminaUtils 
- } else {
-   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
---- lumina-desktop-0.6.2.14.orig/lumina-desktop/lumina-desktop.pro
-+++ lumina-desktop-0.6.2.14/lumina-desktop/lumina-desktop.pro
-@@ -81,7 +81,7 @@ RESOURCES+= Lumina-DE.qrc
- INCLUDEPATH += ../libLumina /usr/include
- 
- desktop.files = Lumina-DE.desktop
--linux-g++-64 {
-+linux-g++* {
- desktop.path = /usr/share/xsessions
- } else {
- desktop.path = /usr/share/xsessions
---- lumina-desktop-0.6.2.14.orig/lumina-fm/lumina-fm.pro
-+++ lumina-desktop-0.6.2.14/lumina-fm/lumina-fm.pro
-@@ -24,7 +24,7 @@ FORMS    += MainUI.ui \
- 
- INCLUDEPATH += ../libLumina /usr/include
- 
--linux-g++-64 {
-+linux-g++* {
-   LIBS     += -L../libLumina -lLuminaUtils 
- } else {
-   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
---- lumina-desktop-0.6.2.14.orig/lumina-screenshot/lumina-screenshot.pro
-+++ lumina-desktop-0.6.2.14/lumina-screenshot/lumina-screenshot.pro
-@@ -15,7 +15,7 @@ FORMS    += MainUI.ui
- 
- INCLUDEPATH += ../libLumina /usr/include
- 
--linux-g++-64 {
-+linux-g++* {
-   LIBS     += -L../libLumina -lLuminaUtils 
- } else {
-   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
diff --git a/debian/patches/series b/debian/patches/series
index 1ba24f47..3e4f0969 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-change-prefix.diff
-02-fix-compilation-non-amd64.diff 
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro
index 92b38b0a..f79deeef 100644
--- a/lumina-config/lumina-config.pro
+++ b/lumina-config/lumina-config.pro
@@ -22,7 +22,7 @@ FORMS    += mainUI.ui \
 
 INCLUDEPATH += ../libLumina /usr/local/include
 
-linux-g++-64 {
+linux-* {
   LIBS     += -L../libLumina -lLuminaUtils 
 } else {
   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index c51f5de0..2b661110 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -303,12 +303,12 @@ void LDesktop::DesktopPluginRemoved(QString ID){
       //qDebug() << "- found ID";
       //Delete the plugin container first
       QList<QMdiSubWindow*> wins = bgDesktop->subWindowList();
-      for(int i=0; i<wins.length(); i++){
-	if(wins[i]->whatsThis()==ID || wins[i]->whatsThis().isEmpty()){
+      for(int j=0; j<wins.length(); j++){
+	if(wins[j]->whatsThis()==ID || wins[j]->whatsThis().isEmpty()){
           //wins[i]->setWhatsThis(""); //clear this so it knows it is being temporarily removed
-          bgDesktop->removeSubWindow(wins[i]->widget()); //unhook plugin from container
-          bgDesktop->removeSubWindow(wins[i]); //remove container from screen
-          delete wins[i]; //delete old container
+          bgDesktop->removeSubWindow(wins[j]->widget()); //unhook plugin from container
+          bgDesktop->removeSubWindow(wins[j]); //remove container from screen
+          delete wins[j]; //delete old container
 	}
       }
       //Now delete the plugin itself
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index edc63010..f2fa139d 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -86,7 +86,7 @@ RESOURCES+= Lumina-DE.qrc
 INCLUDEPATH += ../libLumina /usr/local/include
 
 desktop.files = Lumina-DE.desktop
-linux-g++-64 {
+linux-* {
 desktop.path = /usr/share/xsessions
 } else {
 desktop.path = /usr/local/share/xsessions
diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro
index 6b533029..e004de17 100644
--- a/lumina-fm/lumina-fm.pro
+++ b/lumina-fm/lumina-fm.pro
@@ -24,7 +24,7 @@ FORMS    += MainUI.ui \
 
 INCLUDEPATH += ../libLumina /usr/local/include
 
-linux-g++-64 {
+linux-* {
   LIBS     += -L../libLumina -lLuminaUtils 
 } else {
   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro
index 7f0911c3..df783ad0 100644
--- a/lumina-screenshot/lumina-screenshot.pro
+++ b/lumina-screenshot/lumina-screenshot.pro
@@ -15,7 +15,7 @@ FORMS    += MainUI.ui
 
 INCLUDEPATH += ../libLumina /usr/local/include
 
-linux-g++-64 {
+linux-* {
   LIBS     += -L../libLumina -lLuminaUtils 
 } else {
   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head