SVN: PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp

[shadzik]

Author: shadzik
Date: Tue Dec  7 00:10:53 2010
New Revision: 11969

Modified:
   PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp
Log:
- merged with trunk
- fixed substr()


Modified: PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp
==============================================================================
--- PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp	(original)
+++ PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp	Tue Dec  7 00:10:53 2010
@@ -908,11 +908,12 @@
   QTextStream in(&readFile);
   while(!in.atEnd())
   {
-    line += in.readLine();
-    if(line.contains(QRegExp(".*" + string1 + ".*")))
+    line += in.readLine() + "\n";
+    if(line.contains(string1))
       line.replace(string1, string2);
   }
   readFile.close();
+  //qDebug() << line;
   
   if(!writeFile.open(QIODevice::WriteOnly | QIODevice::Text))
     return;
@@ -1625,16 +1626,18 @@
       KAssistantDialog::next();
       KAssistantDialog::showButtonSeparator(false);
     }
- 
+
     if(cont)
     {
+      qDebug() << "renameConfigFiles...";
       QStringList files;
       files << DESTINATION"etc/pld-release.dest" << DESTINATION"etc/fstab.dest" 
 	<< DESTINATION"etc/sysconfig/network.dest" << DESTINATION"etc/issue.dest"
 	<< DESTINATION"etc/rc.d/rc.local.dest" << DESTINATION"etc/sudoers.dest";
+      qDebug() << "QRadioButton" << "noAutoLogin" << noAutoLogin->isChecked() << "autoLogin" << autoLogin->isChecked();
       if(noAutoLogin->isChecked())
 	files.append(DESTINATION"etc/X11/kdm/kdmrc.dest");
-      else if(autoLogin->isChecked())
+      if(autoLogin->isChecked())
 	substr(DESTINATION"etc/X11/kdm/kdmrc", LIVEUSER, selUser);
       renameConfigFiles(files);
       files.clear();