[PC-BSD Commits] r2109 - pcbsd/trunk/PBIdelete

svn at pcbsd.org svn at pcbsd.org
Tue Jun 17 09:26:40 PDT 2008


Author: kris
Date: 2008-06-17 09:26:29 -0700 (Tue, 17 Jun 2008)
New Revision: 2109

Removed:
   pcbsd/trunk/PBIdelete/Makefile
   pcbsd/trunk/PBIdelete/PBIdelete.h
Modified:
   pcbsd/trunk/PBIdelete/PBIdelete.pro
   pcbsd/trunk/PBIdelete/PBIdelete.ui
   pcbsd/trunk/PBIdelete/main.cpp
Log:

Updated PBIdelete to QT4



Deleted: pcbsd/trunk/PBIdelete/Makefile

Deleted: pcbsd/trunk/PBIdelete/PBIdelete.h

Modified: pcbsd/trunk/PBIdelete/PBIdelete.pro
===================================================================
--- pcbsd/trunk/PBIdelete/PBIdelete.pro	2008-06-17 16:06:28 UTC (rev 2108)
+++ pcbsd/trunk/PBIdelete/PBIdelete.pro	2008-06-17 16:26:29 UTC (rev 2109)
@@ -5,16 +5,9 @@
 TARGET  = PBIdelete
 DESTDIR = /PCBSD/bin/
 
-HEADERS	+= PBIdelete.h
-
 SOURCES	+= main.cpp
 
 FORMS	= PBIdelete.ui
 
-unix {
-  UI_DIR = .ui
-  MOC_DIR = .moc
-  OBJECTS_DIR = .obj
-}
 
-
+QT +=qt3support

Modified: pcbsd/trunk/PBIdelete/PBIdelete.ui
===================================================================
--- pcbsd/trunk/PBIdelete/PBIdelete.ui	2008-06-17 16:06:28 UTC (rev 2108)
+++ pcbsd/trunk/PBIdelete/PBIdelete.ui	2008-06-17 16:26:29 UTC (rev 2109)
@@ -1,21 +1,21 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>PBIdelete</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>PBIDelete</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>PBIdelete</class>
+  <widget class="QDialog" name="PBIDelete" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>600</width>
+        <height>480</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>600</width>
-            <height>480</height>
-        </rect>
+    <property name="windowTitle" >
+      <string/>
     </property>
-    <property name="caption">
-        <string></string>
-    </property>
-</widget>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>

Modified: pcbsd/trunk/PBIdelete/main.cpp
===================================================================
--- pcbsd/trunk/PBIdelete/main.cpp	2008-06-17 16:06:28 UTC (rev 2108)
+++ pcbsd/trunk/PBIdelete/main.cpp	2008-06-17 16:26:29 UTC (rev 2109)
@@ -3,9 +3,9 @@
 #include <qapplication.h>
 #include <qstring.h>
 #include <qfile.h>
-#include <qprocess.h>
+#include <Q3Process>
 #include <qobject.h>
-#include "PBIdelete.h"
+#include <qtextstream.h>
 
 QString ProgName[5000];
 QString ProgVer[5000];
@@ -15,7 +15,7 @@
 QString ProgExe[5000][50];
 QString MimeFile[5000][50];
 QString RemovePBI;
-QProcess *RemoveFile;
+Q3Process *RemoveFile;
 int	RemNum;
 
 
@@ -106,10 +106,10 @@
 
         if ( RemovePBI == ProgDirName )
 	{
-	   cout << "Removing " << RemovePBI << "\n";
+	   cout << "Removing " << RemovePBI.toStdString() << "\n";
 	   RemNum = i;
 	   CheckScriptSlot();
-	   cout << RemovePBI << " was removed successfully!\n";
+	   cout << RemovePBI.toStdString() << " was removed successfully!\n";
 	   return;
 	}
 
@@ -117,7 +117,7 @@
         i++;
    }
 
-   cout << RemovePBI << " not found!";
+   cout << RemovePBI.toStdString() << " not found!";
    exit(1);
 
 }
@@ -272,7 +272,7 @@
     while ( ! MimeFile[RemNum][i].isEmpty() )
     {
 	// Remove the hidden file
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "rm" );
 	RemoveFile->addArgument( "/usr/local/share/applnk/.hidden/" + MimeFile[RemNum][i] + ".desktop" ); 
 	 
@@ -281,7 +281,7 @@
 	}
 	
 	// Remove the application file
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "rm" );
 	RemoveFile->addArgument( "/usr/local/share/mimelnk/application/" + MimeFile[RemNum][i] + ".desktop" ); 
 	 
@@ -312,7 +312,7 @@
 	}
 	
 	// Remove the script
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "rm" );
 	RemoveFile->addArgument( "/Programs/.sbin/" + Binary ); 
 		   
@@ -322,7 +322,7 @@
 	
 
 	// Remove the Desktop item
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "/Programs/.bin/RemoveDesktopLink.sh" );
 	RemoveFile->addArgument( Binary + ".desktop" ); 
 	RemoveFile->addArgument( ProgName[RemNum] ); 	   
@@ -339,7 +339,7 @@
     
     
     	// Remove the start menu item
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "rm" );
 	RemoveFile->addArgument( "-r" );
 	RemoveFile->addArgument( "/usr/local/share/applnk/My Programs/" + ProgName[RemNum] ); 
@@ -352,7 +352,7 @@
 	
 
     	// Remove the start menu item
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "rm" );
 	RemoveFile->addArgument( "-r" );
 	RemoveFile->addArgument( "/usr/local/share/applnk/" + ProgName[RemNum] ); 
@@ -365,7 +365,7 @@
 
 
 	// Remove the program folder
-	RemoveFile = new QProcess();
+	RemoveFile = new Q3Process();
 	RemoveFile->addArgument( "rm" );
 	RemoveFile->addArgument( "-r" );
 	RemoveFile->addArgument( "/Programs/" + ProgDirName ); 
@@ -410,7 +410,7 @@
    }
 
  ProgList.sort();
- cout << ProgList.join( "\n" ) << endl;
+ cout << ProgList.join( "\n" ).toStdString() << endl;
 
 
 }



More information about the Commits mailing list