File qt4-fsarchiver_obs-gag.patch of Package fsarchiver-qt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt4-fsarchiver_obs-gag.patch of Package fsarchiver-qt4 (Revision 133f7a4e28bbd3fa32af703f5ba6bde6)

Currently displaying revision 133f7a4e28bbd3fa32af703f5ba6bde6 , Show latest

diff -Naur qt4-fsarchiver_old/src/clone.cpp qt4-fsarchiver/src/clone.cpp
--- qt4-fsarchiver_old/src/clone.cpp	2015-01-26 19:14:33.000000000 +0500
+++ qt4-fsarchiver/src/clone.cpp	2015-02-17 21:58:56.768440611 +0500
@@ -334,7 +334,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }
 
diff -Naur qt4-fsarchiver_old/src/clone_net.cpp qt4-fsarchiver/src/clone_net.cpp
--- qt4-fsarchiver_old/src/clone_net.cpp	2015-01-26 19:14:33.000000000 +0500
+++ qt4-fsarchiver/src/clone_net.cpp	2015-02-17 21:59:11.625927172 +0500
@@ -344,7 +344,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }
 
diff -Naur qt4-fsarchiver_old/src/dir.cpp qt4-fsarchiver/src/dir.cpp
--- qt4-fsarchiver_old/src/dir.cpp	2015-01-26 19:14:33.000000000 +0500
+++ qt4-fsarchiver/src/dir.cpp	2015-02-17 21:59:53.035496197 +0500
@@ -676,7 +676,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }
 
diff -Naur qt4-fsarchiver_old/src/mainWindow.cpp qt4-fsarchiver/src/mainWindow.cpp
--- qt4-fsarchiver_old/src/mainWindow.cpp	2015-01-27 02:41:58.000000000 +0500
+++ qt4-fsarchiver/src/mainWindow.cpp	2015-02-17 22:08:05.758473553 +0500
@@ -1188,7 +1188,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }
 
@@ -1644,8 +1644,8 @@
             if (found > 0)
              	zahl_.replace(found, 1, ","); 
             return zahl_  + tr(" MB");
-	 } 
-        if (zahl >= 1000000){
+	    } 
+        else if (zahl >= 1000000){
             zahl = zahl / 1000000/1.024/1.024/1.024; 
             zahl = (int) (zahl * 100);
             zahl = zahl/100;
@@ -1655,8 +1655,8 @@
             if (found > 0)
              	zahl_.replace(found, 1, ","); 
             return zahl_  + tr(" TB");
-	 }    
-	if (zahl >= 1000){
+	    }    
+	else if (zahl >= 1000){
             zahl = zahl / 1000/1.024/1.024;
             zahl = (int) (zahl * 100);
             zahl = zahl/100;
@@ -1666,7 +1666,15 @@
             if (found > 0)
              	zahl_.replace(found, 1, ","); 
             return zahl_  + tr(" GB");
-	 }   
+	    }   
+	else {
+            // Punkt in Komma wandeln
+            zahl_ = QString::number(zahl);
+            found=zahl_.indexOf(".");
+            if (found > 0)
+             	zahl_.replace(found, 1, ","); 
+            return zahl_;
+	}
 }
 
 QString MWindow::linux_version()  {
diff -Naur qt4-fsarchiver_old/src/mbr.cpp qt4-fsarchiver/src/mbr.cpp
--- qt4-fsarchiver_old/src/mbr.cpp	2015-01-26 19:14:33.000000000 +0500
+++ qt4-fsarchiver/src/mbr.cpp	2015-02-17 22:00:34.042079203 +0500
@@ -434,7 +434,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }
 
diff -Naur qt4-fsarchiver_old/src/net.cpp qt4-fsarchiver/src/net.cpp
--- qt4-fsarchiver_old/src/net.cpp	2015-01-26 19:14:33.000000000 +0500
+++ qt4-fsarchiver/src/net.cpp	2015-02-17 22:00:49.783535268 +0500
@@ -1525,7 +1525,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }
 
diff -Naur qt4-fsarchiver_old/src/net_ein.cpp qt4-fsarchiver/src/net_ein.cpp
--- qt4-fsarchiver_old/src/net_ein.cpp	2015-01-26 19:14:33.000000000 +0500
+++ qt4-fsarchiver/src/net_ein.cpp	2015-02-17 22:01:59.466127529 +0500
@@ -432,6 +432,7 @@
 int NetEin:: end()
 { 
    close();
+   return 0;
 }
 
 int NetEin:: go()
@@ -673,7 +674,7 @@
 	msg.exec();
 	if (msg.clickedButton() == yesButton)
     		return 1;
-	else if (msg.clickedButton() == noButton)
+	else
     		return 2;
 }

Places

File qt4-fsarchiver_obs-gag.patch of Package fsarchiver-qt4 (Revision 133f7a4e28bbd3fa32af703f5ba6bde6)

Places