[X2Go-Commits] [x2goclient] 01/02: find -type f -exec sed -i 's/QString::SkipEmptyParts/Qt::SkipEmptyParts/g' '{}' \\;
git-admin at x2go.org
git-admin at x2go.org
Sun Jun 30 10:00:12 CEST 2024
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit b8b6048c577c60372502aec920ab90ef56ed78d3
Author: Juri Grabowski <debian at jugra.de>
Date: Sat Jun 29 23:06:55 2024 +0200
find -type f -exec sed -i 's/QString::SkipEmptyParts/Qt::SkipEmptyParts/g' '{}' \\;
---
src/exportdialog.cpp | 6 +++---
src/folderbutton.cpp | 2 +-
src/folderexplorer.cpp | 6 +++---
src/httpbrokerclient.cpp | 6 +++---
src/onmainwindow.cpp | 46 ++++++++++++++++++++++-----------------------
src/sessionbutton.cpp | 2 +-
src/sessionexplorer.cpp | 28 +++++++++++++--------------
src/sessionmanagedialog.cpp | 6 +++---
src/sessionwidget.cpp | 4 ++--
src/sharewidget.cpp | 6 +++---
src/sshmasterconnection.cpp | 6 +++---
11 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp
index ccabd684..48ad1a96 100644
--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@@ -110,13 +110,13 @@ void ExportDialog::loadSessions()
QString exports=st.setting()->value ( sessionId+"/export",
( QVariant ) QString::null ).toString();
- QStringList lst=exports.split ( ";",QString::SkipEmptyParts );
+ QStringList lst=exports.split ( ";",Qt::SkipEmptyParts );
for ( int i=0; i<lst.size(); ++i )
{
#ifndef Q_OS_WIN
- QStringList tails=lst[i].split ( ":",QString::SkipEmptyParts );
+ QStringList tails=lst[i].split ( ":",Qt::SkipEmptyParts );
#else
- QStringList tails=lst[i].split ( "#",QString::SkipEmptyParts );
+ QStringList tails=lst[i].split ( "#",Qt::SkipEmptyParts );
#endif
dirs<<tails[0];
}
diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp
index 01a14727..e761c353 100644
--- a/src/folderbutton.cpp
+++ b/src/folderbutton.cpp
@@ -104,7 +104,7 @@ void FolderButton::loadIcon()
QPixmap* pix=new QPixmap();
- QString normPath=(path+"/"+name).split("/",QString::SkipEmptyParts).join("::");
+ QString normPath=(path+"/"+name).split("/",Qt::SkipEmptyParts).join("::");
QString picURL=st->setting()->value ( "icon_"+normPath, ( QVariant )QString()).toString();
if(picURL.indexOf("file://")!=-1)
{
diff --git a/src/folderexplorer.cpp b/src/folderexplorer.cpp
index 41d68d78..b3338a18 100644
--- a/src/folderexplorer.cpp
+++ b/src/folderexplorer.cpp
@@ -51,7 +51,7 @@ void FolderExplorer::initFolders(QTreeWidgetItem* parent, QString path)
QTreeWidgetItem* it=new QTreeWidgetItem(parent);
it->setText(0,b->getName());
it->setIcon(0, QIcon(*(b->folderIcon())));
- QString normPath=(b->getPath()+"/"+b->getName()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(b->getPath()+"/"+b->getName()).split("/",Qt::SkipEmptyParts).join("/");
it->setData(0,Qt::UserRole, normPath+"/");
if(normPath+"/"==currentPath)
{
@@ -110,7 +110,7 @@ void FolderExplorer::slotChangeName()
{
bool ok;
QString oldPath=menuItem->data(0,Qt::UserRole).toString();
- QStringList parts=oldPath.split("/",QString::SkipEmptyParts);
+ QStringList parts=oldPath.split("/",Qt::SkipEmptyParts);
QString text = QInputDialog::getText(this, tr("X2Go Client"),
tr("Folder Name:"), QLineEdit::Normal,
parts.last(), &ok);
@@ -147,7 +147,7 @@ void FolderExplorer::slotNewFolder()
QString name=tr("New Folder");
it->setText(0,name);
it->setIcon(0, QIcon(mw->iconsPath("/128x128/folder.png")));
- QString normPath=(menuItem->data(0,Qt::UserRole).toString()+"/"+name).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(menuItem->data(0,Qt::UserRole).toString()+"/"+name).split("/",Qt::SkipEmptyParts).join("/");
it->setData(0,Qt::UserRole, normPath+"/");
treeWidget->clearSelection();
it->setSelected(true);
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 889f9827..9041a6ae 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -816,7 +816,7 @@ void HttpBrokerClient::parseSession(QString sinfo)
config->sessiondata="";
suspendedSession.clear();
x2goDebug<<"Starting parser.";
- QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts);
+ QStringList lst=sinfo.split("SERVER:",Qt::SkipEmptyParts);
int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----");
if(keyStartPos==-1)
keyStartPos=sinfo.indexOf("-----BEGIN RSA PRIVATE KEY-----");
@@ -872,10 +872,10 @@ void HttpBrokerClient::parseSession(QString sinfo)
x2goDebug<<"Server port: "<<config->sshport;
if (sinfo.indexOf("SESSION_INFO")!=-1)
{
- QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts);
+ QStringList lst=sinfo.split("SESSION_INFO:",Qt::SkipEmptyParts);
//config->sessiondata=lst[1];
x2goDebug<<"Session data: "<<lst[1]<<"\n";
- suspendedSession=lst[1].trimmed().split ( '\n', QString::SkipEmptyParts );
+ suspendedSession=lst[1].trimmed().split ( '\n', Qt::SkipEmptyParts );
mainWindow->selectSession(suspendedSession);
}
else
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 5362cc3a..c6c34bf0 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -258,7 +258,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
X2goSettings st ( "settings" );
QString cmdLine=st.setting()->value ( "commandline", "" ).toString();
// x2goErrorf(100)<<"cmd line:"<<cmdLine;
- args=cmdLine.split(";",QString::SkipEmptyParts);
+ args=cmdLine.split(";",Qt::SkipEmptyParts);
args.push_front(QCoreApplication::arguments()[0]);
}
@@ -2454,11 +2454,11 @@ void ONMainWindow::slotReadSessions()
}
else if(defaultSessionName.length() > 0)
{
- QString normalDefaultSName=defaultSessionName.split("/",QString::SkipEmptyParts).join("/");
+ QString normalDefaultSName=defaultSessionName.split("/",Qt::SkipEmptyParts).join("/");
for ( int i=0; i<sessionExplorer->getSessionsList()->size(); ++i )
{
QString normalName=(sessionExplorer->getSessionsList()->at(i)->getPath()+"/"+sessionExplorer->getSessionsList()->at(i)->name());
- normalName=normalName.split("/",QString::SkipEmptyParts).join("/");
+ normalName=normalName.split("/",Qt::SkipEmptyParts).join("/");
if ( normalName == normalDefaultSName )
{
sessionExplorer->setCurrrentPath(sessionExplorer->getSessionsList()->at(i)->getPath());
@@ -4137,12 +4137,12 @@ void ONMainWindow::slotListSessions ( bool result,QString output,
if(!brokerMode || shadowSession)
{
sessions=output.trimmed().split ( '\n',
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
}
else
{
sessions=config.sessiondata.trimmed().split ( '\n',
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
}
if ( shadowSession )
{
@@ -5910,7 +5910,7 @@ void ONMainWindow::slotRetResumeSess ( bool result,
qDebug()<<"resuming normal session";
}
host=resumingSession.server;
- QStringList outputLines=output.split("\n",QString::SkipEmptyParts);
+ QStringList outputLines=output.split("\n",Qt::SkipEmptyParts);
foreach(QString line,outputLines)
{
if (line.indexOf("gr_port=")!=-1)
@@ -6610,9 +6610,9 @@ void ONMainWindow::slotSetModMap()
kbMap += "clear shift\nclear lock\nclear control\nclear mod1\nclear mod2\nclear mod3\nclear mod4\nclear mod5\n";
/* And set them back again. */
- QStringList lines = modifiers.split ("\n", QString::SkipEmptyParts);
+ QStringList lines = modifiers.split ("\n", Qt::SkipEmptyParts);
for (int i = 0; i < lines.count (); ++i) {
- QStringList parts = lines[i].split (" ", QString::SkipEmptyParts);
+ QStringList parts = lines[i].split (" ", Qt::SkipEmptyParts);
if (parts.count () < 2) {
continue;
}
@@ -7726,13 +7726,13 @@ void ONMainWindow::slotReadApplications(bool result, QString output,
QString localshort=QLocale::system().name().split("_")[0];
QStringList startAppsFound;
- foreach(QString appstr, output.split("</desktop>",QString::SkipEmptyParts))
+ foreach(QString appstr, output.split("</desktop>",Qt::SkipEmptyParts))
{
bool localcomment=false;
bool localname=false;
Application app;
app.category=Application::OTHER;
- QStringList lines=appstr.split("\n", QString::SkipEmptyParts);
+ QStringList lines=appstr.split("\n", Qt::SkipEmptyParts);
for (int i=0; i<lines.count(); ++i)
{
QString line=lines[i];
@@ -8134,7 +8134,7 @@ bool ONMainWindow::parseParameter ( QString param )
}
if ( setting=="--kbd-layout" )
{
- defaultLayout=value.split(",",QString::SkipEmptyParts);
+ defaultLayout=value.split(",",Qt::SkipEmptyParts);
if (defaultLayout.size()==0)
defaultLayout<<tr("us");
return true;
@@ -8521,7 +8521,7 @@ bool ONMainWindow::ldapParameter ( QString val )
QString ldapstring=val;
useLdap=true;
ldapstring.replace ( "\"","" );
- QStringList lst=ldapstring.split ( ':',QString::SkipEmptyParts );
+ QStringList lst=ldapstring.split ( ':',Qt::SkipEmptyParts );
if ( lst.size() !=3 )
{
printError( tr (
@@ -8542,7 +8542,7 @@ bool ONMainWindow::ldap1Parameter ( QString val )
{
QString ldapstring=val;
ldapstring.replace ( "\"","" );
- QStringList lst=ldapstring.split ( ':',QString::SkipEmptyParts );
+ QStringList lst=ldapstring.split ( ':',Qt::SkipEmptyParts );
if ( lst.size() !=2 )
{
printError( tr (
@@ -8560,7 +8560,7 @@ bool ONMainWindow::ldap2Parameter ( QString val )
{
QString ldapstring=val;
ldapstring.replace ( "\"","" );
- QStringList lst=ldapstring.split ( ':',QString::SkipEmptyParts );
+ QStringList lst=ldapstring.split ( ':',Qt::SkipEmptyParts );
if ( lst.size() !=2 )
{
printError(
@@ -8844,7 +8844,7 @@ void ONMainWindow::slotListAllSessions ( bool result,QString output,
else
{
listedSessions+=output.trimmed().split ( '\n',
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
}
if ( last )
{
@@ -9042,7 +9042,7 @@ void ONMainWindow::exportDefaultDirs()
sessionExplorer->getLastSession()->id() +"/export",
( QVariant ) QString::null ).toString();
QStringList lst=exd.split ( ";",
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
for ( int i=0; i<lst.size(); ++i )
{
//check if directory is in Windows client format
@@ -9054,7 +9054,7 @@ void ONMainWindow::exportDefaultDirs()
}
QStringList tails=lst[i].split (
splitChar,
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
if(tails.length()!=2)
{
//wrong format
@@ -9326,7 +9326,7 @@ void ONMainWindow::slotExtTimer()
QByteArray line = file.readLine();
QString ln ( line );
QStringList args=ln.split ( "=",
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
if ( args.size() >1 )
{
if ( args[0]=="login" )
@@ -9405,7 +9405,7 @@ void ONMainWindow::slotExportTimer()
QByteArray line = file.readLine();
QString ln ( line );
QStringList args=ln.split ( "=",
- QString::SkipEmptyParts );
+ Qt::SkipEmptyParts );
if ( args.size() >1 )
{
if ( args[0]=="export" )
@@ -9425,14 +9425,14 @@ void ONMainWindow::slotExportTimer()
file.close();
file.remove();
}
- QStringList args=expList.split ( ":",QString::SkipEmptyParts );
+ QStringList args=expList.split ( ":",Qt::SkipEmptyParts );
expList=args.join ( ":" );
if ( expList.size() >0 )
{
exportDirs ( expList,true );
}
args.clear();
- args=unexpList.split ( ":",QString::SkipEmptyParts );
+ args=unexpList.split ( ":",Qt::SkipEmptyParts );
QString passwd=getCurrentPass();
QString user=getCurrentUname();
@@ -10740,7 +10740,7 @@ void ONMainWindow::startXOrg (std::size_t start_offset)
break;
}
}
- QStringList options=cmdLine.split(" ",QString::SkipEmptyParts);
+ QStringList options=cmdLine.split(" ",Qt::SkipEmptyParts);
QString option;
foreach(option,options)
{
@@ -13724,7 +13724,7 @@ void ONMainWindow::slotResLoadRequestFinished(QNetworkReply* reply)
else
{
QString fpath=resourceDir+reply->url().toString().replace(resourceURL,"");
- QStringList parts=fpath.split("/",QString::SkipEmptyParts);
+ QStringList parts=fpath.split("/",Qt::SkipEmptyParts);
QString fname=parts.takeLast();
QString path="/"+parts.join("/");
resourceTmpDir->mkpath(path);
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index 1d1f8c92..7eae5dc5 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -382,7 +382,7 @@ void SessionButton::redraw()
( QVariant ) tr ( "New Session" ) ).toString();
- QStringList tails=name.split("/",QString::SkipEmptyParts);
+ QStringList tails=name.split("/",Qt::SkipEmptyParts);
if(tails.count()>0)
{
name=tails.last();
diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp
index 9d828a02..1bbd795f 100644
--- a/src/sessionexplorer.cpp
+++ b/src/sessionexplorer.cpp
@@ -498,7 +498,7 @@ void SessionExplorer::placeButtons()
//Folder is not empty if it has sessions or not empty subfdolders
bool SessionExplorer::isFolderEmpty(FolderButton* folder)
{
- QString normPath=(folder->getPath()+"/"+folder->getName()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(folder->getPath()+"/"+folder->getName()).split("/",Qt::SkipEmptyParts).join("/");
for(int i=0; i<folders.count(); ++i)
{
if(folders[i]->getPath()==normPath)
@@ -518,7 +518,7 @@ bool SessionExplorer::isFolderEmpty(FolderButton* folder)
QStringList SessionExplorer::getFolderChildren(FolderButton* folder)
{
QStringList children;
- QString normPath=(folder->getPath()+"/"+folder->getName()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(folder->getPath()+"/"+folder->getName()).split("/",Qt::SkipEmptyParts).join("/");
for(int i=0; i<folders.count(); ++i)
{
@@ -581,7 +581,7 @@ int SessionExplorer::findFolder(QString path)
{
for(int i=0; i<folders.count(); ++i)
{
- QString normPath=(folders[i]->getPath()+"/"+folders[i]->getName()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(folders[i]->getPath()+"/"+folders[i]->getName()).split("/",Qt::SkipEmptyParts).join("/");
if(normPath==path)
return i;
}
@@ -590,13 +590,13 @@ int SessionExplorer::findFolder(QString path)
void SessionExplorer::slotFolderSelected(FolderButton* bt)
{
- currentPath=(bt->getPath()+"/"+bt->getName()).split("/",QString::SkipEmptyParts).join("/");
+ currentPath=(bt->getPath()+"/"+bt->getName()).split("/",Qt::SkipEmptyParts).join("/");
placeButtons();
}
void SessionExplorer::slotLevelUp()
{
- QStringList levels=currentPath.split("/",QString::SkipEmptyParts);
+ QStringList levels=currentPath.split("/",Qt::SkipEmptyParts);
if(levels.count())
{
levels.pop_back();
@@ -611,7 +611,7 @@ void SessionExplorer::setFolderIcon(QString path, QString icon)
if(!pix.isNull())
{
pix=pix.scaled(64,64,Qt::KeepAspectRatio, Qt::SmoothTransformation);
- path=path.split("/",QString::SkipEmptyParts).join("::");
+ path=path.split("/",Qt::SkipEmptyParts).join("::");
X2goSettings *st;
if (parent->getBrokerMode())
@@ -628,7 +628,7 @@ void SessionExplorer::setFolderIcon(QString path, QString icon)
FolderButton* b;
foreach(b, folders)
{
- if((b->getPath()+"/"+b->getName()).split("/",QString::SkipEmptyParts).join("::")==path)
+ if((b->getPath()+"/"+b->getName()).split("/",Qt::SkipEmptyParts).join("::")==path)
{
b->loadIcon();
break;
@@ -660,10 +660,10 @@ void SessionExplorer::createNewFolder(QString path)
void SessionExplorer::renameFolder(QString oldPath, QString currentPath)
{
FolderButton* b;
- oldPath=oldPath.split("/",QString::SkipEmptyParts).join("/");
- currentPath=currentPath.split("/",QString::SkipEmptyParts).join("/");
+ oldPath=oldPath.split("/",Qt::SkipEmptyParts).join("/");
+ currentPath=currentPath.split("/",Qt::SkipEmptyParts).join("/");
- QStringList parts=oldPath.split("/",QString::SkipEmptyParts);
+ QStringList parts=oldPath.split("/",Qt::SkipEmptyParts);
QString oldName=parts.last();
parts.pop_back();
QString pathOfFolder=parts.join("/");
@@ -673,7 +673,7 @@ void SessionExplorer::renameFolder(QString oldPath, QString currentPath)
{
if(b->getPath()==pathOfFolder && b->getName()==oldName)
{
- b->setName(currentPath.split("/",QString::SkipEmptyParts).last());
+ b->setName(currentPath.split("/",Qt::SkipEmptyParts).last());
}
if((b->getPath()+"/").indexOf(oldPath+"/")==0)
{
@@ -736,7 +736,7 @@ void SessionExplorer::renameFolder(QString oldPath, QString currentPath)
bool SessionExplorer::isFolderEmpty(QString path)
{
FolderButton* b;
- path=path.split("/",QString::SkipEmptyParts).join("/");
+ path=path.split("/",Qt::SkipEmptyParts).join("/");
foreach(b, folders)
{
@@ -759,7 +759,7 @@ bool SessionExplorer::isFolderEmpty(QString path)
void SessionExplorer::deleteFolder(QString path)
{
- path=path.split("/",QString::SkipEmptyParts).join("::");
+ path=path.split("/",Qt::SkipEmptyParts).join("::");
X2goSettings *st;
if (parent->getBrokerMode())
st=new X2goSettings(parent->getConfig()->iniFile,QSettings::IniFormat);
@@ -774,7 +774,7 @@ void SessionExplorer::deleteFolder(QString path)
for(int i=0; i< folders.count(); ++i)
{
FolderButton* b=folders[i];
- if((b->getPath()+"/"+b->getName()).split("/",QString::SkipEmptyParts).join("/")==path)
+ if((b->getPath()+"/"+b->getName()).split("/",Qt::SkipEmptyParts).join("/")==path)
{
b->close();
folders.removeAt(i);
diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp
index 6e547804..dd93eaef 100644
--- a/src/sessionmanagedialog.cpp
+++ b/src/sessionmanagedialog.cpp
@@ -174,7 +174,7 @@ void SessionManageDialog::initFolders(QTreeWidgetItem* parent, QString path)
QTreeWidgetItem* it=new QTreeWidgetItem(parent);
it->setText(0,b->getName());
it->setIcon(0, QIcon(*(b->folderIcon())));
- QString normPath=(b->getPath()+"/"+b->getName()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(b->getPath()+"/"+b->getName()).split("/",Qt::SkipEmptyParts).join("/");
it->setData(0,Qt::UserRole, normPath+"/");
it->setData(0, SESSIONROLE , false);
initFolders(it, normPath);
@@ -188,7 +188,7 @@ void SessionManageDialog::initFolders(QTreeWidgetItem* parent, QString path)
QTreeWidgetItem* it=new QTreeWidgetItem(parent);
it->setText(0,s->name());
it->setIcon(0, QIcon(*(s->sessIcon())));
- QString normPath=(s->getPath()+"/"+s->name()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(s->getPath()+"/"+s->name()).split("/",Qt::SkipEmptyParts).join("/");
it->setData(0,Qt::UserRole, normPath+"/");
it->setData(0, SESSIONROLE, true);
it->setData(0, SESSIONIDROLE, i);
@@ -208,7 +208,7 @@ void SessionManageDialog::slot_endisable ( QTreeWidgetItem* item, int col)
if(!isSess)
{
if(item)
- currentPath=item->data(0,Qt::UserRole).toString().split("/",QString::SkipEmptyParts).join("/");
+ currentPath=item->data(0,Qt::UserRole).toString().split("/",Qt::SkipEmptyParts).join("/");
else
currentPath="/";
x2goDebug << "slot_endisable: no session, currentPath(?): " << currentPath;
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index e599174e..72eaf823 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -519,7 +519,7 @@ void SessionWidget::readConfig()
sessionId+"/name",
( QVariant ) tr ( "New session" ) ).toString().trimmed();
- QStringList tails=name.split("/",QString::SkipEmptyParts);
+ QStringList tails=name.split("/",Qt::SkipEmptyParts);
QString path;
if(tails.count()>0)
{
@@ -821,7 +821,7 @@ void SessionWidget::saveSettings()
X2goSettings st ( "sessions" );
- QString normPath=(lPath->text()+"/"+sessName->text()).split("/",QString::SkipEmptyParts).join("/");
+ QString normPath=(lPath->text()+"/"+sessName->text()).split("/",Qt::SkipEmptyParts).join("/");
st.setting()->setValue ( sessionId+"/name",
( QVariant ) normPath.trimmed() );
diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp
index 342aea1a..cf1c15ff 100644
--- a/src/sharewidget.cpp
+++ b/src/sharewidget.cpp
@@ -217,7 +217,7 @@ void ShareWidget::readConfig()
cbFsSshTun->setChecked ( st.setting()->value ( sessionId+"/fstunnel",
true ).toBool() );
- QStringList lst=exportDir.split ( ";",QString::SkipEmptyParts );
+ QStringList lst=exportDir.split ( ";",Qt::SkipEmptyParts );
QString toCode=st.setting()->value ( sessionId+"/iconvto",
( QVariant ) "UTF-8" ).toString();
@@ -253,9 +253,9 @@ void ShareWidget::readConfig()
for ( int i=0; i<lst.size(); ++i )
{
#ifndef Q_OS_WIN
- QStringList tails=lst[i].split ( ":",QString::SkipEmptyParts );
+ QStringList tails=lst[i].split ( ":",Qt::SkipEmptyParts );
#else
- QStringList tails=lst[i].split ( "#",QString::SkipEmptyParts );
+ QStringList tails=lst[i].split ( "#",Qt::SkipEmptyParts );
#endif
QStandardItem *item;
item= new QStandardItem ( tails[0] );
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 41ded56d..0f1f6e76 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -71,7 +71,7 @@ void SshMasterConnection::parseKnownHosts()
while (!fl.atEnd())
{
QString line=fl.readLine();
- QStringList parts=line.split(' ',QString::SkipEmptyParts);
+ QStringList parts=line.split(' ',Qt::SkipEmptyParts);
if (parts.count()!=3)
continue;
@@ -88,7 +88,7 @@ void SshMasterConnection::parseKnownHosts()
type="rsa2";
- QStringList hostParts=parts[0].split(":",QString::SkipEmptyParts);
+ QStringList hostParts=parts[0].split(":",Qt::SkipEmptyParts);
if (hostParts.count()>1)
port=hostParts[1];
hostParts[0].replace("[","");
@@ -1108,7 +1108,7 @@ bool SshMasterConnection::userChallengeAuth()
x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl;
/* Ignore "garbage" at the start of the string, but require at least one line to start with a known prompt. */
- QStringList tmp_str_list = pr.split ("\n", QString::SkipEmptyParts);
+ QStringList tmp_str_list = pr.split ("\n", Qt::SkipEmptyParts);
for (QStringList::const_iterator cit = tmp_str_list.constBegin (); cit != tmp_str_list.constEnd (); ++cit) {
if ((*cit).startsWith (challenge_auth_code_prompts_[i])) {
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list