SVN: PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
shadzik
shadzik at pld-linux.org
Tue Dec 7 00:10:03 CET 2010
Author: shadzik
Date: Tue Dec 7 00:10:02 2010
New Revision: 11968
Modified:
PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
Log:
- fixed substr()
- hangs no more
Modified: PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
==============================================================================
--- PLDLiveInstaller/trunk/PLDLiveInstaller.cpp (original)
+++ PLDLiveInstaller/trunk/PLDLiveInstaller.cpp Tue Dec 7 00:10:02 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();
More information about the pld-cvs-commit
mailing list