[PC-BSD Commits] r2094 - pbibuild/pbi-source/PBItext

svn at pcbsd.org svn at pcbsd.org
Thu Jun 12 09:05:25 PDT 2008


Author: kris
Date: 2008-06-12 09:05:25 -0700 (Thu, 12 Jun 2008)
New Revision: 2094

Modified:
   pbibuild/pbi-source/PBItext/main.cpp
   pbibuild/pbi-source/PBItext/pbitext.ui
Log:

Updated the PBItext program to QT4 so it runs on PCBSD7



Modified: pbibuild/pbi-source/PBItext/main.cpp
===================================================================
--- pbibuild/pbi-source/PBItext/main.cpp	2008-06-12 15:23:03 UTC (rev 2093)
+++ pbibuild/pbi-source/PBItext/main.cpp	2008-06-12 16:05:25 UTC (rev 2094)
@@ -7,7 +7,8 @@
 #include <qfile.h>
 #include <qprocess.h>
 #include <qobject.h>
-#include "pbitext.h"
+#include <qtextstream.h>
+#include <qdir.h>
 using namespace std;
 
 void ProgramInit( QString ProgDir );
@@ -63,7 +64,7 @@
 
     QString command = "whoami";
     QString inputLine = getLineFromCommandOutput(command);
-    if ( inputLine.find("root") != 0 )
+    if ( inputLine.indexOf("root") != 0 )
     {
        cout << "Error: PBI text mode must be run as root!\n";
        return 1;
@@ -88,7 +89,7 @@
 
 QString getLineFromCommandOutput( QString command )
 {
-	FILE *file = popen(command,"r"); 
+	FILE *file = popen(command.toLatin1(),"r"); 
 	
 	char buffer[100];
 	
@@ -134,7 +135,7 @@
 
 	    // Write out the wrapper script
     	    QFile file( ".PBIwrapper.sh" );
-   	    if ( file.open( IO_WriteOnly ) ) {
+   	    if ( file.open(  QIODevice::WriteOnly ) ) {
         	 QTextStream stream( &file );
 			stream << "#!/bin/sh\n";
 			stream << "PROGDIR=\"" + ProgDirName + "\"; export PROGDIR\n";
@@ -154,18 +155,20 @@
 
 	if (NewDir.exists())
         {
-           cout << "Warning: Overwrote " + ProgDirName + "\n";
+           cout << "Warning: Overwrote ";
+           cout << ProgDirName.toStdString();
+           cout << "\n";
            OverWrote = 1;
         }
 
-        NewDir.mkdir("/Programs/" + ProgDirName, TRUE);
+        NewDir.mkpath("/Programs/" + ProgDirName);
 	
         // If we have update URL, create the file here
         if ( ! ProgUpdateURL.isEmpty() )
        {
 	           // Now save the new config file
             QFile file3( "/Programs/" + ProgDirName + "/PBI.UpdateURL.sh" );
-             if ( file3.open( IO_WriteOnly ) ) {
+             if ( file3.open(  QIODevice::WriteOnly ) ) {
                 QTextStream stream3( &file3 );
 		stream3 << "#!/bin/sh\n\nPBIUpdateURL=\"" << ProgUpdateURL << "\" ; export PBIUpdateURL";
                  file3.close();
@@ -175,7 +178,7 @@
   
           // Make the install script now
          QFile file4( "extract.sh" );
-         if ( file4.open( IO_WriteOnly ) ) {
+         if ( file4.open(  QIODevice::WriteOnly ) ) {
                QTextStream stream4( &file4 );
 	       stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma d -si -so | tar xpov -C \"${1}\" -f - >/dev/null 2>/dev/null";
                  file4.close();
@@ -196,7 +199,7 @@
 {
     // Loads the username
     QFile whoami( "whoami" );
-    if ( whoami.open( IO_ReadOnly ) ) {
+    if ( whoami.open(  QIODevice::ReadOnly ) ) {
         QTextStream stream3( &whoami );
         while ( !stream3.atEnd() ) {
             	      RealUserName = stream3.readLine();
@@ -209,7 +212,7 @@
     
     // Open our config file, and read in the data
     QFile file( "PkgConfig" );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open(  QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         int i = -1;
@@ -218,53 +221,53 @@
         while ( !stream.atEnd() ) {
             line = stream.readLine(); // line of text excluding '\n'
 	    
-	    if ( line.find("ProgName:" ) == 0)
+	    if ( line.indexOf("ProgName:" ) == 0)
 	    {
 		ProgramName = line.replace("ProgName: ", "");
 	    }
-	    if ( line.find("ProgVersion:") == 0)
+	    if ( line.indexOf("ProgVersion:") == 0)
 	    {
 		ProgramVer = line.replace("ProgVersion: ", "");
 	    }
-	    if ( line.find("ProgWeb:") == 0)
+	    if ( line.indexOf("ProgWeb:") == 0)
 	    {
 		ProgramWeb = line.replace("ProgWeb: ", "");
 	    }
-	    if ( line.find("ProgAuthor:") == 0)
+	    if ( line.indexOf("ProgAuthor:") == 0)
 	    {
 		ProgramAuthor = line.replace("ProgAuthor: ", "");
 	    } 
-	    if ( line.find("ProgUpdateURL:") == 0)
+	    if ( line.indexOf("ProgUpdateURL:") == 0)
 	    {
 		ProgUpdateURL = line.replace("ProgUpdateURL: ", "");
 	    }    
-            if (line.find("ProgSize:") == 0)
+            if (line.indexOf("ProgSize:") == 0)
             {
                 line = line.replace("ProgSize: ", "");
                 ProgSize = line.toInt();
             }
-	    if ( line.find("LibDir:") == 0)
+	    if ( line.indexOf("LibDir:") == 0)
 	    {
 		LibDir = line.replace("LibDir: ", "");
 	    } 
-	    if ( line.find("DefaultIcon:") == 0)
+	    if ( line.indexOf("DefaultIcon:") == 0)
 	    {
 		DefaultIcon = line.replace("DefaultIcon: ", "");
 	    } 
-	    if ( line.find("ExePath:") == 0)
+	    if ( line.indexOf("ExePath:") == 0)
 	    {
 		i++;
 		ExePath[i] = line.replace("ExePath: ", "");
 	    }
-	    if ( line.find("ExeIcon:") == 0)
+	    if ( line.indexOf("ExeIcon:") == 0)
 	    {
 		ExeIcon[i] = line.replace("ExeIcon: ", "");
 	    }
-	    if ( line.find("ExeDescr:") == 0)
+	    if ( line.indexOf("ExeDescr:") == 0)
 	    {
 		ExeDescr[i] = line.replace("ExeDescr: ", "");
 	    }
-	    if ( line.find("ExeNoMenu:") == 0)
+	    if ( line.indexOf("ExeNoMenu:") == 0)
 	    {
 		NoMenu[i] = line.replace("ExeNoMenu: ", "");
 		if (NoMenu[i] == "0")
@@ -272,31 +275,31 @@
 		    NoMenuCheck = 0;
 		}
 	    }
-	    if ( line.find("ExeNoDesktop:") == 0)
+	    if ( line.indexOf("ExeNoDesktop:") == 0)
 	    {
 		NoDesktop[i] = line.replace("ExeNoDesktop: ", "");
 	    }
-	    if ( line.find("ExeRunRoot:") == 0)
+	    if ( line.indexOf("ExeRunRoot:") == 0)
 	    {
 		RunRoot[i] = line.replace("ExeRunRoot: ", "");
 	    }
-	    if ( line.find("ExeRunShell:") == 0)
+	    if ( line.indexOf("ExeRunShell:") == 0)
 	    {
 		RunShell[i] = line.replace("ExeRunShell: ", "");
 	    }
-	    if ( line.find("ExeNotify:") == 0)
+	    if ( line.indexOf("ExeNotify:") == 0)
 	    {
 		Notify[i] = line.replace("ExeNotify: ", "");
 	    }
-	    if ( line.find("ExeLink:") == 0)
+	    if ( line.indexOf("ExeLink:") == 0)
 	    {
 		ExeLink[i] = line.replace("ExeLink: ", "");
 	    }
-	    if ( line.find("ExeWebLink:") == 0)
+	    if ( line.indexOf("ExeWebLink:") == 0)
 	    {
 		ExeWebLink[i] = line.replace("ExeWebLink: ", "");
 	    }
-	    if ( line.find("ExeTaskbar:") == 0)
+	    if ( line.indexOf("ExeTaskbar:") == 0)
 	    {
 		ExeTaskbar[i] = line.replace("ExeTaskbar: ", "");
 		
@@ -305,34 +308,34 @@
 		    NoTaskbarCheck = 0;
 		}
 	    }
-	    if ( line.find("ExeOwndir:") == 0)
+	    if ( line.indexOf("ExeOwndir:") == 0)
 	    {
 		ExeOwndir[i] = line.replace("ExeOwndir: ", "").toInt();
 	    }
-	    if ( line.find("ExeKdeCat:") == 0)
+	    if ( line.indexOf("ExeKdeCat:") == 0)
 	    {
 		ExeKdeCat[i] = line.replace("ExeKdeCat: ", "");
 	    }
 	    
 	    
 	    
-	    if ( line.find("MimeExt:") == 0)
+	    if ( line.indexOf("MimeExt:") == 0)
 	    {
 		j++;
 		MimeExt[j] = line.replace("MimeExt: ", "");
 	    }
-	    if ( line.find("MimeIcon:") == 0)
+	    if ( line.indexOf("MimeIcon:") == 0)
 	    {
 		MimeIcon[j] = line.replace("MimeIcon: ", "");
 	    }
-	    if ( line.find("MimeProg:") == 0)
+	    if ( line.indexOf("MimeProg:") == 0)
 	    {
 		tmp = line.replace("MimeProg: ", "");
 		MimeProg[j] = tmp.toInt();
 	    }	    
 	    
 	    
-	    if (line.find("TarLines:") == 0)
+	    if (line.indexOf("TarLines:") == 0)
 	    {
 		line = line.replace("TarLines: ", "");
 		TotalLinesTar = line.toInt();
@@ -354,7 +357,9 @@
 
 
         // Echo the program information
-        cout << "Installing " << ProgramName << "\n";
+        cout << "Installing ";
+	cout << ProgramName.toStdString();
+        cout << "\n";
 
 	
         tmp = ProgramName;
@@ -405,19 +410,19 @@
 	QString line2;
 	
 	   QFile file2( "/Programs/.config/ProgList" );
-    if ( file2.open( IO_ReadOnly ) ) {
+    if ( file2.open(  QIODevice::ReadOnly ) ) {
         QTextStream stream2( &file2 );
         while ( !stream2.atEnd() ) {
             line = stream2.readLine(); // line of text excluding '\n'
 	    // Look for the same entry if it exists in the package config file
-	    if ( line.find("ProgName: " + ProgramName) != -1)
+	    if ( line.indexOf("ProgName: " + ProgramName) != -1)
 	    {
 		// Check the version, make sure they are same
 		line2 = stream2.readLine();
 		// If the same version, then gobble up extra lines
-		if ( line2.find("ProgVer: " + ProgramVer) != -1)
+		if ( line2.indexOf("ProgVer: " + ProgramVer) != -1)
 		{
-		    while ( line2.find("ProgName: ") == -1 && ! stream2.atEnd() )
+		    while ( line2.indexOf("ProgName: ") == -1 && ! stream2.atEnd() )
 		    {
 			line2 = stream2.readLine();
 		    }
@@ -441,7 +446,7 @@
       }
        // Now save the new config file
 	     QFile file3( "/Programs/.config/ProgList" );
-    if ( file3.open( IO_WriteOnly ) ) {
+    if ( file3.open(  QIODevice::WriteOnly ) ) {
         QTextStream stream3( &file3 );
              stream3 << SavedFile;
              file3.close();
@@ -457,7 +462,7 @@
 
    // Adds the program to the Program Manager list
     QFile file( "/Programs/.config/ProgList" );
-    if ( file.open( IO_WriteOnly | IO_Append ) ) {
+    if ( file.open(  QIODevice::WriteOnly |  QIODevice::Append ) ) {
         QTextStream stream( &file );
              stream << "\n[ Program Entry ]\n";
 	     stream << "ProgName: " << ProgramName << "\n";
@@ -484,12 +489,12 @@
     
     // First create the special ".sbin" directory for each script executable
     QDir sbindir;
-    sbindir.mkdir ( "/Programs/" + ProgDirName + "/.sbin", TRUE );
+    sbindir.mkpath ( "/Programs/" + ProgDirName + "/.sbin" );
 
     // Now save the new config file
     QString sizestring;
     QFile sizefile( "/Programs/" + ProgDirName + "/.progsize" );
-    if ( sizefile.open( IO_WriteOnly ) ) {
+    if ( sizefile.open(  QIODevice::WriteOnly ) ) {
         QTextStream sizestream( &sizefile );
              sizestream << "PROGSIZE: ";
              sizestream << sizestring.setNum(ProgSize);
@@ -505,16 +510,16 @@
         if ( ExeLink[i] != "1" && ExeWebLink[i] != "1" )
         {
 	
-        if ( ExePath[i].findRev("/" ) != -1 )
+        if ( ExePath[i].lastIndexOf("/" ) != -1 )
         {
 	    Binary = ExePath[i];
-	    Binary = Binary.remove(0, Binary.findRev("/") );
+	    Binary = Binary.remove(0, Binary.lastIndexOf("/") );
         } else {
 	   Binary = ExePath[i];  
         }
 	
         QFile file2( "/Programs/" + ProgDirName + "/.sbin/" + Binary );
-        if ( file2.open( IO_WriteOnly ) ) {
+        if ( file2.open(  QIODevice::WriteOnly ) ) {
           QTextStream stream2( &file2 );
              stream2 << "#!/bin/sh\n";
              stream2 << "# Auto-Generated by PC-BSD\n";
@@ -603,9 +608,9 @@
 	
     } else {
     
-        if ( ExeTemp.findRev("/" ) != -1 )
+        if ( ExeTemp.lastIndexOf("/" ) != -1 )
         {
-	    Binary = ExeTemp.remove(0, ExeTemp.findRev("/") );
+	    Binary = ExeTemp.remove(0, ExeTemp.lastIndexOf("/") );
         } else {
 	   Binary = ExeTemp;  
         }
@@ -638,7 +643,7 @@
 	{
 	    SubDir = "";  
 	} else if (ExeOwndir[exenum] == 1) {
-            if ( ExeKdeCat[exenum].find("Edutainment") != -1 ) {
+            if ( ExeKdeCat[exenum].indexOf("Edutainment") != -1 ) {
               SubDir = "/Edutainment/";
             } else {
               SubDir =  "/"  + ExeKdeCat[exenum] + "/";
@@ -648,10 +653,10 @@
 	}
 	
 	QDir LaunchDir;
-	LaunchDir.mkdir("/usr/local/share/applnk/" +SubDir + ProgramName);
+	LaunchDir.mkpath("/usr/local/share/applnk/" +SubDir + ProgramName);
 	
 	QFile diricon("/usr/local/share/applnk/" + SubDir + ProgramName + "/.directory");
-               if ( diricon.open( IO_WriteOnly) ) {
+               if ( diricon.open(  QIODevice::WriteOnly) ) {
                 QTextStream dirstream( &diricon );
 	     dirstream << "[Desktop Entry]\n";
 	     dirstream << "Icon=" << MainIcon;
@@ -664,11 +669,11 @@
 	if ( ExeLink[exenum] == "0" && ExeWebLink[exenum] == "0" && ExeLink[exenum] == "0" ) {
 	
              QDir bindir;
-             bindir.mkdir ( "/Programs/bin", TRUE );
+             bindir.mkpath( "/Programs/bin");
              runCommand("ln -fs /Programs/" + ProgDirName + "/.sbin/" + Binary + " /Programs/bin/" + Binary+ " >/dev/null 2>/dev/null");
 
 
-               if ( file.open( IO_WriteOnly) ) {
+               if ( file.open(  QIODevice::WriteOnly) ) {
                 QTextStream stream( &file );
 	     stream << "[Desktop Entry]\n";
 	     stream << "Name=" + ExeDescr[exenum] + "\n";
@@ -791,7 +796,7 @@
 		   link = "/Programs/" + ProgDirName + "/" +ExePath[exenum];
 	       }
 	       
-	     if ( file.open( IO_WriteOnly) ) {
+	     if ( file.open(  QIODevice::WriteOnly) ) {
                     QTextStream stream( &file );
 	     stream << "[Desktop Entry]\n";
 	     stream << "Exec=kfmclient exec '" << link << "'\n";
@@ -907,10 +912,10 @@
 
 	// Create desktop link
              QDir bindir;
-             bindir.mkdir ( "/Programs/bin", TRUE );
+             bindir.mkpath( "/Programs/bin");
              runCommand("ln -fs /Programs/" + ProgDirName + "/.sbin/" + Binary + " /Programs/bin/" + Binary+ " >/dev/null 2>/dev/null");
 
-               if ( file2.open( IO_WriteOnly) ) {
+               if ( file2.open(  QIODevice::WriteOnly) ) {
                 QTextStream stream2( &file2 );
 	     stream2 << "[Desktop Entry]\n";
 	     stream2 << "Name=" + ExeDescr[exenum] + "\n";
@@ -948,7 +953,7 @@
 	       }
 		    
 		    
-	     if ( file2.open( IO_WriteOnly) ) {
+	     if ( file2.open(  QIODevice::WriteOnly) ) {
                     QTextStream stream2( &file2 );
 	     stream2 << "[Desktop Entry]\n";
 	     stream2 << "Exec=kfmclient exec '" << link << "'\n";
@@ -987,7 +992,7 @@
 	 
 	 
 	QFile file3( "dcop.sh");
-	 if ( file3.open( IO_WriteOnly) ) {
+	 if ( file3.open(  QIODevice::WriteOnly) ) {
                 QTextStream stream3( &file3 );
 		stream3 << "#!/bin/sh\n";
 		stream3 << "dcop --user " + RealUserName + " kicker Panel addNonKDEAppButton \"" + ExeDescr[exenum] + "\" \"" + ExeDescr[exenum] + "\" \"/Programs/" + ProgDirName + "/.sbin/" + Binary + "\" \"" + Icon + "\" \"\" "  + ShellOption + "\n";
@@ -1021,7 +1026,7 @@
 	// Run the programs SetupScript
         // Write out the wrapper script
     	QFile file( ".PBIwrapper.sh" );
-   	 if ( file.open( IO_WriteOnly ) ) {
+   	 if ( file.open(  QIODevice::WriteOnly ) ) {
         	QTextStream stream( &file );
 			stream << "#!/bin/sh\n";
 			stream << "PROGDIR=\"" + ProgDirName + "\"; export PROGDIR\n";
@@ -1046,9 +1051,9 @@
     
     // Get the binary name
     QString Binary;
-    if ( ExePath[MimeProg[MimeNum]].findRev("/" ) != -1 )
+    if ( ExePath[MimeProg[MimeNum]].lastIndexOf("/" ) != -1 )
     {
-         Binary = ExePath[MimeProg[MimeNum]].remove(0, ExePath[MimeProg[MimeNum]].findRev("/") );
+         Binary = ExePath[MimeProg[MimeNum]].remove(0, ExePath[MimeProg[MimeNum]].lastIndexOf("/") );
      } else {
 	   Binary = ExePath[MimeProg[MimeNum]];  
      }
@@ -1070,7 +1075,7 @@
     }
      
      	QFile file( "/usr/local/share/mimelnk/application/" + ProgramName + MimeNumString + ".desktop");
-               if ( file.open( IO_WriteOnly) ) {
+               if ( file.open(  QIODevice::WriteOnly) ) {
                 QTextStream stream( &file );
 	     stream << "[Desktop Entry]\n";
 	     stream << "Comment=" + ProgramName + " File\n";
@@ -1084,7 +1089,7 @@
                  }
      
       	QFile file2( "/usr/local/share/applnk/.hidden/" + ProgramName +  MimeNumString + ".desktop");
-               if ( file2.open( IO_WriteOnly) ) {
+               if ( file2.open(  QIODevice::WriteOnly) ) {
                 QTextStream stream2( &file2 );
 	     stream2 << "[Desktop Entry]\n";
 	     stream2 << "Exec=/Programs/" + ProgDirName + "/.sbin/" +Binary + "\n";
@@ -1115,7 +1120,7 @@
 
 void runCommand( QString Command )
 {
-      FILE *file = popen(Command,"r"); 
+      FILE *file = popen(Command.toLatin1(),"r"); 
       fclose(file);
 }
 
@@ -1123,13 +1128,14 @@
 {
 
     QFile file( "LICENSE" );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open(  QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         int i = 1;
         while ( !stream.atEnd() ) {
             line = stream.readLine(); // line of text excluding '\n'
-            cout << line.latin1() << "\n";
+            cout << line.toStdString();
+            cout << "\n";
 
             i++;
             
@@ -1148,9 +1154,10 @@
    cout << "\nDo you agree to these license terms? (Type yes/no):";
    string input;
    getline(cin, input);
-   QString answer(input);
+   QString answer;
+   answer.fromStdString(input);
 
-   if (answer.upper() == "YES")
+   if (answer.toUpper() == "YES")
    {
 	cout << "\nContinuing with Install...\n";
    } else {
@@ -1170,7 +1177,7 @@
 	
     // Create the pangorc file
     QFile GTKCheck("/Programs/" + ProgDirName + "/autolibs/pangorc");
-    if ( GTKCheck.open( IO_WriteOnly) ) {
+    if ( GTKCheck.open(  QIODevice::WriteOnly) ) {
                 QTextStream stream( &GTKCheck );
 	     stream << "[Pango]\n";
 	     stream << "ModuleFiles=/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules\n";
@@ -1181,21 +1188,21 @@
     
     // Edit the GTK etc files
     QFile file( "/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders" );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open(  QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
 
         while ( !stream.atEnd() ) {
             line = stream.readLine(); // line of text excluding '\n'
-	    if ( line.find("\"/usr/X11R6/lib/gtk" ) == 0)
+	    if ( line.indexOf("\"/usr/X11R6/lib/gtk" ) == 0)
 	    {
 		tmp = line.replace("\"/usr/X11R6/lib/", "");
-		//tmp.remove(0, tmp.find("/") + 1 );
+		//tmp.remove(0, tmp.indexOf("/") + 1 );
 		tmp = "\"/Programs/" + ProgDirName + "/autolibs/" + tmp;
 		EditFile = EditFile + tmp + "\n";
-            } else if ( line.find("\"/usr/local/lib/gtk" ) == 0)
+            } else if ( line.indexOf("\"/usr/local/lib/gtk" ) == 0)
             {
                 tmp = line.replace("\"/usr/local/lib/", "");
-                //tmp.remove(0, tmp.find("/") + 1 );
+                //tmp.remove(0, tmp.indexOf("/") + 1 );
                 tmp = "\"/Programs/" + ProgDirName + "/autolibs/" + tmp;
                 EditFile = EditFile + tmp + "\n";
 	    } else {
@@ -1208,7 +1215,7 @@
     file.close();
     
    QFile GTKWrite("/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders");
-    if ( GTKWrite.open( IO_WriteOnly) ) {
+    if ( GTKWrite.open(  QIODevice::WriteOnly) ) {
                 QTextStream streamGTK( &GTKWrite );
 	     streamGTK << EditFile;
     }
@@ -1217,21 +1224,21 @@
     
         // Edit the GTK etc files
     QFile Pangofile( "/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules" );
-    if ( Pangofile.open( IO_ReadOnly ) ) {
+    if ( Pangofile.open(  QIODevice::ReadOnly ) ) {
         QTextStream stream2( &Pangofile );
 
         while ( !stream2.atEnd() ) {
             line = stream2.readLine(); // line of text excluding '\n'
-	    if ( line.find("/usr/X11R6/lib/pango" ) == 0)
+	    if ( line.indexOf("/usr/X11R6/lib/pango" ) == 0)
 	    {
 		tmp = line.replace("/usr/X11R6/lib/", "");
-		//tmp.remove(0, tmp.find("/") + 1 );
+		//tmp.remove(0, tmp.indexOf("/") + 1 );
 		tmp = "/Programs/" + ProgDirName + "/autolibs/" + tmp;
 		EditFile = EditFile + tmp + "\n";
-            } else if ( line.find("/usr/local/lib/pango" ) == 0)
+            } else if ( line.indexOf("/usr/local/lib/pango" ) == 0)
             {
                 tmp = line.replace("/usr/local/lib/", "");
-                //tmp.remove(0, tmp.find("/") + 1 );
+                //tmp.remove(0, tmp.indexOf("/") + 1 );
                 tmp = "/Programs/" + ProgDirName + "/autolibs/" + tmp;
                 EditFile = EditFile + tmp + "\n";
 	    } else {
@@ -1244,7 +1251,7 @@
     Pangofile.close();
     
    QFile PangoWrite("/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules");
-    if ( PangoWrite.open( IO_WriteOnly) ) {
+    if ( PangoWrite.open(  QIODevice::WriteOnly) ) {
                 QTextStream streamPango( &PangoWrite );
 	     streamPango << EditFile;
     }

Modified: pbibuild/pbi-source/PBItext/pbitext.ui
===================================================================
--- pbibuild/pbi-source/PBItext/pbitext.ui	2008-06-12 15:23:03 UTC (rev 2093)
+++ pbibuild/pbi-source/PBItext/pbitext.ui	2008-06-12 16:05:25 UTC (rev 2094)
@@ -1,21 +1,21 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>PBItext</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>PBItext</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>PBItext</class>
+  <widget class="QDialog" name="PBItext" >
+    <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>Form1</string>
     </property>
-    <property name="caption">
-        <string>Form1</string>
-    </property>
-</widget>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>



More information about the Commits mailing list