This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 5c084d0b Merge branch 'personal/Ionic/SkipEmptyParts-fixup' into 'master' new 69710151 remove QString::null deprecation warnings new f307f618 remove endl deprecation warnings new 834afac7 Merge branch 'remove-more-deprecation-warnings' into 'master' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: src/SVGFrame.cpp | 6 +- src/brokerpassdlg.cpp | 4 +- src/configdialog.cpp | 16 ++-- src/contest.cpp | 2 +- src/cupsprint.cpp | 4 +- src/exportdialog.cpp | 6 +- src/folderexplorer.cpp | 2 +- src/help.cpp | 12 +-- src/httpbrokerclient.cpp | 30 ++++---- src/onmainwindow.cpp | 178 ++++++++++++++++++++++---------------------- src/onmainwindow.h | 6 +- src/printdialog.cpp | 4 +- src/printprocess.cpp | 2 +- src/printwidget.cpp | 2 +- src/pulsemanager.cpp | 18 ++--- src/sessionbutton.cpp | 10 +-- src/sessionwidget.cpp | 20 ++--- src/sharewidget.cpp | 8 +- src/sshmasterconnection.cpp | 176 +++++++++++++++++++++---------------------- src/sshmasterconnection.h | 4 +- src/sshprocess.cpp | 14 ++-- src/wapi.cpp | 22 +++--- 22 files changed, 273 insertions(+), 273 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 69710151b895f1ea2dffbd5b9fd91260a8527a99 Author: Juri Grabowski <x2go@jugra.de> Date: Sun Jun 30 13:26:23 2024 +0200 remove QString::null deprecation warnings find -type f -exec sed -i 's/QString::null/QString()/g' '{}' \; --- src/SVGFrame.cpp | 2 +- src/brokerpassdlg.cpp | 4 +- src/configdialog.cpp | 16 +++--- src/exportdialog.cpp | 6 +-- src/folderexplorer.cpp | 2 +- src/httpbrokerclient.cpp | 4 +- src/onmainwindow.cpp | 128 ++++++++++++++++++++++---------------------- src/onmainwindow.h | 6 +-- src/printprocess.cpp | 2 +- src/sessionbutton.cpp | 10 ++-- src/sessionwidget.cpp | 20 +++---- src/sharewidget.cpp | 8 +-- src/sshmasterconnection.cpp | 20 +++---- src/sshmasterconnection.h | 4 +- src/sshprocess.cpp | 2 +- src/wapi.cpp | 18 +++---- 16 files changed, 126 insertions(+), 126 deletions(-) diff --git a/src/SVGFrame.cpp b/src/SVGFrame.cpp index 4181e3b9..3b9ca605 100644 --- a/src/SVGFrame.cpp +++ b/src/SVGFrame.cpp @@ -33,7 +33,7 @@ SVGFrame::SVGFrame ( QString fname,bool st,QWidget* parent, #ifdef Q_OS_WIN parentWidget=0; #endif - if ( fname==QString::null ) + if ( fname==QString() ) empty=true; if ( !empty ) { diff --git a/src/brokerpassdlg.cpp b/src/brokerpassdlg.cpp index a92f8034..1a1bd310 100644 --- a/src/brokerpassdlg.cpp +++ b/src/brokerpassdlg.cpp @@ -21,7 +21,7 @@ BrokerPassDlg::BrokerPassDlg(QWidget* parent, Qt::WindowFlags f): QDialog(parent, f) { setupUi(this); - statusLabel->setText(QString::null); + statusLabel->setText(QString()); buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); } @@ -41,7 +41,7 @@ void BrokerPassDlg::slotPassChanged() else { passEq=true; - statusLabel->setText(QString::null); + statusLabel->setText(QString()); } buttonBox->button(QDialogButtonBox::Ok)->setEnabled(passEq && lePass1->text().size()>0 && diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 6260cbf3..9477d20d 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -208,7 +208,7 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f ) pbOpenExec=new QPushButton ( QIcon ( ( ( ONMainWindow* ) parent )->iconsPath ( "/32x32/file-open.png" ) ), - QString::null,xgb ); + QString(),xgb ); xLay->addWidget ( new QLabel ( tr ( "X11 application:" ) ),0,0 ); leCmdOpt=new QLineEdit ( xgb ); @@ -259,11 +259,11 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f ) ( ONMainWindow* ) parent )-> getShowAdvOption() ); advOptionsShown=false; - conWidg=new ConnectionWidget ( QString::null, + conWidg=new ConnectionWidget ( QString(), ( ONMainWindow* ) parent,this ); - setWidg=new SettingsWidget ( QString::null, + setWidg=new SettingsWidget ( QString(), ( ONMainWindow* ) parent,this ); - mediaWidget=new MediaWidget ( QString::null, + mediaWidget=new MediaWidget ( QString(), ( ONMainWindow* ) parent,this ); conWidg->hide(); setWidg->hide(); @@ -421,17 +421,17 @@ void ConfigDialog::slot_checkOkStat() #ifdef Q_OS_WIN QString ConfigDialog::getCygwinDir ( const QString& dir ) { - QString cygdir=QString::null; + QString cygdir=QString(); QSettings lu_st ( "HKEY_CURRENT_USER\\Software" "\\Cygnus Solutions\\Cygwin\\mounts v2\\"+ dir,QSettings::NativeFormat ); - cygdir=lu_st.value ( "native", ( QVariant ) QString::null ).toString(); - if ( cygdir!= QString::null ) + cygdir=lu_st.value ( "native", ( QVariant ) QString() ).toString(); + if ( cygdir!= QString() ) return cygdir; QSettings lm_st ( "HKEY_LOCAL_MACHINE\\SOFTWARE" "\\Cygnus Solutions\\Cygwin\\mounts v2\\"+ dir,QSettings::NativeFormat ); - return lm_st.value ( "native", ( QVariant ) QString::null ).toString(); + return lm_st.value ( "native", ( QVariant ) QString() ).toString(); } #endif diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index 807f206f..ed7a1562 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -109,7 +109,7 @@ void ExportDialog::loadSessions() QString exports=st.setting()->value ( sessionId+"/export", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); QStringList lst=exports.split ( ";",Qt::SkipEmptyParts ); for ( int i=0; i<lst.size(); ++i ) @@ -146,13 +146,13 @@ void ExportDialog::slot_dclicked ( const QModelIndex& ) void ExportDialog::slotNew() { - directory=QString::null; + directory=QString(); directory= QFileDialog::getExistingDirectory ( this, tr ( "Select folder" ), QDir::homePath() ); - if ( directory!=QString::null ) + if ( directory!=QString() ) accept(); } diff --git a/src/folderexplorer.cpp b/src/folderexplorer.cpp index 445e6b50..5ff3a2ea 100644 --- a/src/folderexplorer.cpp +++ b/src/folderexplorer.cpp @@ -100,7 +100,7 @@ void FolderExplorer::slotChangeIcon() tr ( "Open picture" ), QDir::homePath(), tr ( "Pictures" ) +" (*.png *.xpm *.jpg)" ); - if ( path!=QString::null ) + if ( path!=QString() ) { explorer->setFolderIcon(menuItem->data(0, Qt::UserRole).toString(), path); menuItem->setIcon(0, QIcon(path)); diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index 299c2dc6..5c1e7a46 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -295,7 +295,7 @@ void HttpBrokerClient::getUserSessions() x2goDebug<<"Called getUserSessions: brokeruser: "<<brokerUser<<" authid: "<<nextAuthId; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); - config->sessiondata=QString::null; + config->sessiondata=QString(); if(!sshBroker) { QString req; @@ -945,7 +945,7 @@ void HttpBrokerClient::slotSslErrors ( QNetworkReply* netReply, const QList<QSsl "not used to seeing a warning for this server.</p>" ); QMessageBox mb ( QMessageBox::Warning,tr ( "Secure connection failed." ), text ); - text=QString::null; + text=QString(); QTextStream ( &text ) <<err.join ( "\n" ) <<"\n"<< "------------\n"<< tr ( "Issued to:\n" ) << diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index c26a3c1a..b7c82742 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -213,7 +213,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) bBrokerLogout = NULL; restartResume=false; isPassShown=true; - readExportsFrom=QString::null; + readExportsFrom=QString(); spoolTimer=0l; brokerAliveTimer=0l; brokerSyncTimer=0l; @@ -362,7 +362,7 @@ void ONMainWindow::initUI() useLdap=false; } - if ( readExportsFrom!=QString::null ) + if ( readExportsFrom!=QString() ) { exportTimer=new QTimer ( this ); connect ( exportTimer,SIGNAL ( timeout() ),this, @@ -398,7 +398,7 @@ void ONMainWindow::initUI() } - //fr=new SVGFrame(QString::null,true,this); + //fr=new SVGFrame(QString(),true,this); fr=new IMGFrame ( ( QImage* ) 0l,this ); setCentralWidget ( fr ); @@ -506,7 +506,7 @@ void ONMainWindow::initUI() QIcon ( iconsPath ( "/32x32/edit_settings.png" ) ), tr ( "&Settings ..." ),this ); - if (supportMenuFile!=QString::null) + if (supportMenuFile!=QString()) { act_support=new QAction ( tr ( "Support ..." ),this ); connect ( act_support,SIGNAL ( triggered ( bool ) ),this, @@ -992,7 +992,7 @@ void ONMainWindow::initWidgetsNormal() } QMenu* menu_help=menuBar()->addMenu ( tr ( "&Help" ) ); - if (supportMenuFile!=QString::null) + if (supportMenuFile!=QString()) menu_help->addAction ( act_support ); menu_help->addAction ( act_abclient ); menu_help->addAction ( act_abqt ); @@ -1050,7 +1050,7 @@ void ONMainWindow::initWidgetsNormal() void ONMainWindow::slotPassChanged(const QString& result) { - if (result==QString::null) + if (result==QString()) { QMessageBox::critical(this, tr("Error"),tr("Operation failed")); } @@ -1108,7 +1108,7 @@ void ONMainWindow::slotGetBrokerAuth() pass->clear(); login->clear(); QString pixFile=iconsPath("/128x128/x2gosession.png"); - if (SPixFile!=QString::null) + if (SPixFile!=QString()) pixFile=SPixFile; QPixmap pix(pixFile); if ( !miniMode ) @@ -1354,7 +1354,7 @@ void ONMainWindow::removeAppsFromTray() QString ONMainWindow::findTheme ( QString /*theme*/ ) { - return QString::null; + return QString(); } QString ONMainWindow::getKdeIconsPath() @@ -1728,13 +1728,13 @@ void ONMainWindow::loadSettings() ldapPort=st1.setting()->value ( "LDAP/port", ( QVariant ) 389 ).toInt(); ldapDn=st1.setting()->value ( "LDAP/basedn", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); ldapServer1=st1.setting()->value ( "LDAP/server1", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); ldapPort1=st1.setting()->value ( "LDAP/port1", ( QVariant ) 0 ).toInt(); ldapServer2=st1.setting()->value ( "LDAP/server2", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); ldapPort2=st1.setting()->value ( "LDAP/port2", ( QVariant ) 0 ).toInt(); } @@ -1953,7 +1953,7 @@ void ONMainWindow::slotPassEnter() shadowSession=false; #if defined ( Q_OS_WIN ) || defined (Q_OS_DARWIN ) QString disp=getXDisplay(); - if ( disp==QString::null ) + if ( disp==QString() ) return; #endif #ifdef USELDAP @@ -2057,7 +2057,7 @@ void ONMainWindow::slotPassEnter() QString passwd; if ( !extLogin ) - currentKey=QString::null; + currentKey=QString(); QString user=getCurrentUname(); // get x2gogetservers not from ldap server, but from first x2goserver // QString host=ldapServer; @@ -2371,9 +2371,9 @@ void ONMainWindow::slotReadSessions() { if (changeBrokerPass) act_changeBrokerPass->setEnabled(true); - config.key=QString::null; - config.user=QString::null; - config.sessiondata=QString::null; + config.key=QString(); + config.user=QString(); + config.sessiondata=QString(); st=new X2goSettings(config.iniFile,QSettings::IniFormat); sessionStatusDlg->hide(); @@ -2835,11 +2835,11 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) ( QVariant ) tr ( "KDE" ) ).toString(); server=st->setting()->value ( sid+"/host", - ( QVariant ) QString::null + ( QVariant ) QString() ).toString(); userName=st->setting()->value ( sid+"/user", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); if (defaultUser && userName.length()<1) userName=defaultUserName; @@ -2854,7 +2854,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) ( QVariant ) defaultSshPort ).toString(); currentKey=st->setting()->value ( sid+"/key", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); currentKey=expandHome(currentKey); autologin=st->setting()->value ( @@ -2973,7 +2973,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) pass->setText(config.brokerPass); slotSessEnter(); } - else if ( currentKey != QString::null && currentKey != "" && nopass ) + else if ( currentKey != QString() && currentKey != "" && nopass ) { x2goDebug<<"Starting session with key."; slotSessEnter(); @@ -3289,12 +3289,12 @@ void ONMainWindow::slotSshServerAuthChallengeResponse(SshMasterConnection* conne message = challenge; QString phrase = QInputDialog::getText (0, connection->getUser () + "@" + connection->getHost () + ":" + QString::number (connection->getPort ()), - message, QLineEdit::Password, QString::null, &ok); + message, QLineEdit::Password, QString(), &ok); if (!ok) { - phrase = QString::null; + phrase = QString(); } else { - if (phrase == QString::null) { + if (phrase == QString()) { phrase = ""; } } @@ -3498,9 +3498,9 @@ void ONMainWindow::slotSessEnter() return; } - resumingSession.sessionId=QString::null; - resumingSession.server=QString::null; - resumingSession.display=QString::null; + resumingSession.sessionId=QString(); + resumingSession.server=QString(); + resumingSession.display=QString(); setStatStatus ( tr ( "connecting" ) ); if(brokerMode) @@ -3512,7 +3512,7 @@ void ONMainWindow::slotSessEnter() X2goSettings* st=new X2goSettings(config.iniFile, QSettings::IniFormat); QString sid=sessionExplorer->getLastSession()->id(); QString cmd=st->setting()->value ( sid+"/command", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); directRDP=(st->setting()->value ( sid+"/directrdp", ( QVariant ) false ).toBool() && cmd == "RDP"); @@ -3555,7 +3555,7 @@ void ONMainWindow::continueNormalSession() if (brokerMode && !shadowSession) { - slotListSessions(true,QString::null,0); + slotListSessions(true,QString(),0); return; } if ( !shadowSession ) @@ -3825,7 +3825,7 @@ QString ONMainWindow::findSshKeyForServer(QString user, QString server, QString if(key.server.length()<=0 && key.user.length()<=0 && key.port.length()<=0) return key.key; } - return QString::null; + return QString(); } @@ -3868,7 +3868,7 @@ bool ONMainWindow::startSession ( const QString& sid, CONTYPE conType ) if ( managedMode ) { - slotListSessions ( true, QString::null,0 ); + slotListSessions ( true, QString(),0 ); return true; } @@ -3907,11 +3907,11 @@ bool ONMainWindow::startSession ( const QString& sid, CONTYPE conType ) else { host=st->setting()->value ( sid+"/host", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); } QString cmd=st->setting()->value ( sid+"/command", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); autologin=st->setting()->value ( sid+"/autologin", ( QVariant ) false ).toBool(); krblogin=st->setting()->value ( sid+"/krblogin", @@ -4047,7 +4047,7 @@ bool ONMainWindow::startSession ( const QString& sid, CONTYPE conType ) proxypassword=config.brokerPass; else proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport), - tr("Enter password for SSH proxy"),QLineEdit::Password,QString::null, &ok); + tr("Enter password for SSH proxy"),QLineEdit::Password,QString(), &ok); } } @@ -4094,7 +4094,7 @@ void ONMainWindow::slotListSessions ( bool result,QString output, } -// currentKey=QString::null; +// currentKey=QString(); setEnabled ( true ); passForm->setEnabled ( true ); slotShowPassForm(); @@ -4359,7 +4359,7 @@ void ONMainWindow::startNewSession() QString clipMode=defaultClipboardMode; QString xdmcpServer; runRemoteCommand=true; - QString host=QString::null; + QString host=QString(); runStartApp=true; removeAppsFromTray(); if ( useLdap ) @@ -4384,7 +4384,7 @@ void ONMainWindow::startNewSession() break; } } - if ( host==QString::null ) + if ( host==QString() ) { QMessageBox::critical ( 0l,tr ( "Error" ), tr ( "No server available." ), @@ -5253,13 +5253,13 @@ void ONMainWindow::selectSession ( QStringList& sessions ) st=new X2goSettings( "sessions" ); QString sid=sessionExplorer->getLastSession()->id(); - QString suser = st->setting()->value(sid + "/shadowuser", (QVariant) QString::null).toString(); - QString sdisplay = st->setting()->value(sid + "/shadowdisplay", (QVariant) QString::null).toString(); + QString suser = st->setting()->value(sid + "/shadowuser", (QVariant) QString()).toString(); + QString sdisplay = st->setting()->value(sid + "/shadowdisplay", (QVariant) QString()).toString(); bool fullAccess= st->setting()->value(sid + "/shadowfullaccess", (QVariant) false).toBool(); delete (st); - if(suser != QString::null && sdisplay != QString::null) + if(suser != QString() && sdisplay != QString()) { shadowUser=suser; shadowDisplay=sdisplay; @@ -5316,7 +5316,7 @@ void ONMainWindow::slotActivated ( const QModelIndex& index ) running_label->hide (); } bTerm->setEnabled ( true ); - if ( status==QString::null ) + if ( status==QString() ) { sOk->setEnabled ( false ); bTerm->setEnabled ( false ); @@ -6273,7 +6273,7 @@ void ONMainWindow::slotTunnelOk(int) if(resumingSession.sessionType!= x2goSession::KDRIVE && resumingSession.sessionType!= x2goSession::ROOTLESSKDRIVE) { disp=getXDisplay(); - if ( disp==QString::null ) + if ( disp==QString() ) { //slotProxyerror ( QProcess::FailedToStart ); return; @@ -6867,12 +6867,12 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) } } - if ( readExportsFrom!=QString::null ) + if ( readExportsFrom!=QString() ) { exportTimer->stop(); if ( extLogin ) { - currentKey=QString::null; + currentKey=QString(); } } if ( printSupport ) @@ -6991,7 +6991,7 @@ void ONMainWindow::slotProxyStderr() SLOT ( slot_exportDirectory() ) );*/ sbExp->setEnabled ( true ); exportDefaultDirs(); - if ( readExportsFrom!=QString::null ) + if ( readExportsFrom!=QString() ) { exportTimer->start ( 2000 ); } @@ -7259,14 +7259,14 @@ void ONMainWindow::setStatStatus ( QString status ) setEnabled ( true ); passForm->hide(); selectSessionDlg->hide(); - if ( status == QString::null ) + if ( status == QString() ) status=statusString; else statusString=status; QString tstr; if ( statusLabel ) - statusLabel->setText ( QString::null ); - if ( resumingSession.sessionId!=QString::null ) + statusLabel->setText ( QString() ); + if ( resumingSession.sessionId!=QString() ) { QDateTime dt=QDateTime::fromString ( resumingSession.crTime, Qt::ISODate ); tstr=dt.toString(); @@ -8924,7 +8924,7 @@ void ONMainWindow::slotExportDirectory() else path= QFileDialog::getExistingDirectory ( - this,QString::null, + this,QString(), homeDir ); if (hide_after) hide(); @@ -8937,7 +8937,7 @@ void ONMainWindow::slotExportDirectory() path=cygwinPath ( wapiShortFileName ( path ) ); #endif - if ( path!=QString::null ) + if ( path!=QString() ) exportDirs ( path ); } @@ -9041,7 +9041,7 @@ void ONMainWindow::exportDefaultDirs() QString exd=st->setting()->value ( sessionExplorer->getLastSession()->id() +"/export", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); QStringList lst=exd.split ( ";", Qt::SkipEmptyParts ); for ( int i=0; i<lst.size(); ++i ) @@ -9352,7 +9352,7 @@ void ONMainWindow::slotExtTimer() } if ( exportTimer->isActive() ) //running session { - if ( logoutDir != QString::null ) + if ( logoutDir != QString() ) { x2goDebug<<"External logout received"; externalLogout ( logoutDir ); @@ -9360,7 +9360,7 @@ void ONMainWindow::slotExtTimer() } else { - if ( loginDir != QString::null ) + if ( loginDir != QString() ) { x2goDebug<<"External login."; externalLogin ( loginDir ); @@ -9697,7 +9697,7 @@ void ONMainWindow::externalLogout ( const QString& ) if ( extStarted ) { extStarted=false; - currentKey=QString::null; + currentKey=QString(); if ( nxproxy ) if ( nxproxy->state() ==QProcess::Running ) nxproxy->terminate(); @@ -10102,7 +10102,7 @@ QString ONMainWindow::getXDisplay() // And if not, error out. show_XQuartz_start_error (); slotConfig(); - return QString::null; + return QString(); } #endif @@ -10112,7 +10112,7 @@ QString ONMainWindow::getXDisplay() if ( !isServerRunning ( 6000+xDisplay ) ) { QMessageBox::critical ( - this,QString::null, + this,QString(), tr ( "Can't start X.Org Server.\nPlease check your installation." ) ); @@ -10821,7 +10821,7 @@ void ONMainWindow::startXOrg (std::size_t start_offset) if ( !xorg->waitForStarted ( 3000 ) ) { QMessageBox::critical ( - 0,QString::null, + 0,QString(), tr ( "Can't start X.Org Server." ) + "\n" + tr ( "Please check your installation." ) ); @@ -10852,7 +10852,7 @@ void ONMainWindow::slotCheckXOrgConnection() if ((x_start_limit_) && (x_start_limit_ < x_start_tries_)) { x2goDebug << "Unable to start X.Org Server for " << x_start_limit_ << " times, terminating."; - QMessageBox::critical (NULL, QString::null, + QMessageBox::critical (NULL, QString(), tr ("X.Org Server did not launch correctly after %n tries.", "%n will be substituted with the current number of tries", x_start_tries_) + "\n" + tr ("Please check your installation.")); @@ -10904,7 +10904,7 @@ void ONMainWindow::slotCheckXOrgConnection() return; } else { - QMessageBox::critical (NULL, QString::null, + QMessageBox::critical (NULL, QString(), tr ("Can't start X.Org Server.") + "\n" + tr ("Please check your installation.")); @@ -11503,17 +11503,17 @@ QString ONMainWindow::createKeyBundle (key_types key_type) { rsa.setFileName (tmp_file_name + ".pub"); if (!(rsa.open (QIODevice::ReadOnly | QIODevice::Text))) { x2goErrorf (9) << tr ("Unable to open newly generated %1 public host key file.").arg (stringified_key_type.toUpper ()); - return (QString::null); + return (QString()); } #else printSshDError_noHostPubKey (); - return (QString::null); + return (QString()); #endif } if (!(startSshd (key_type))) { x2goDebug << "Failed to start OpenSSH Server pro-actively."; - return (QString::null); + return (QString()); } QByteArray rsa_pub; @@ -11523,7 +11523,7 @@ QString ONMainWindow::createKeyBundle (key_types key_type) { } else { x2goErrorf (9) << tr ("%1 public host key file empty.").arg (stringified_key_type.toUpper ()); - return (QString::null); + return (QString()); } QFile file (user_key); @@ -13582,7 +13582,7 @@ QString ONMainWindow::u3DataPath() portableDataPath=dpath; return dpath; } - return QString::null; + return QString(); } #endif @@ -13773,7 +13773,7 @@ bool ONMainWindow::parseResourceUrl(const QString& url) QDir d(resourceDir); if(!d.exists()) { - resourceDir=QString::null; + resourceDir=QString(); printError(tr("Directory not exists:")+" "+url+". "+tr("Using built in resources")); } else diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 2a69494c..67aa4e25 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -336,7 +336,7 @@ public: { return interDlg; } - void setStatStatus ( QString status=QString::null ); + void setStatStatus ( QString status=QString() ); x2goSession getNewSessionFromString ( const QString& string ); void runCommand(); long findWindow ( QString text ); @@ -996,8 +996,8 @@ private: bool acceptUnknownHosts, QString login, QString password, bool autologin, bool krbLogin, bool getSrv=false, bool useproxy=false, SshMasterConnection::ProxyType type=SshMasterConnection::PROXYSSH, - QString proxyserver=QString::null, quint16 proxyport=0, - QString proxylogin=QString::null, QString proxypassword=QString::null, QString proxyKey=QString::null, + QString proxyserver=QString(), quint16 proxyport=0, + QString proxylogin=QString(), QString proxypassword=QString(), QString proxyKey=QString(), bool proxyAutologin=false, bool proxyKrbLogin=false ); void setProxyWinTitle(); QRect proxyWinGeometry(); diff --git a/src/printprocess.cpp b/src/printprocess.cpp index 8d9ba7b2..c9b38cd2 100644 --- a/src/printprocess.cpp +++ b/src/printprocess.cpp @@ -143,7 +143,7 @@ void PrintProcess::openPdf() #else wapiShellExecute ( "open", wapiShortFileName ( pdfFile ), - QString::null, + QString(), wapiShortFileName ( QDir::homePath() ) ); #endif } diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index 229e3eda..8ab432d5 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -404,7 +404,7 @@ void SessionButton::redraw() sessStatus->setText(""); QString status=st->setting()->value ( sid+"/status", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); if (status == "R") { sessStatus->setText("("+tr("running")+")"); @@ -415,10 +415,10 @@ void SessionButton::redraw() } suspended=st->setting()->value ( sid+"/suspended", - ( QVariant ) QString::null ).toUInt(); + ( QVariant ) QString() ).toUInt(); running=st->setting()->value ( sid+"/running", - ( QVariant ) QString::null ).toUInt(); + ( QVariant ) QString() ).toUInt(); if(suspended || running) { QStringList parts; @@ -471,9 +471,9 @@ void SessionButton::redraw() delete pix; QString sv=st->setting()->value ( sid+"/host", ( QVariant ) - QString::null ).toString(); + QString() ).toString(); QString uname=st->setting()->value ( sid+"/user", ( QVariant ) - QString::null ).toString(); + QString() ).toString(); server->setText ( uname+"@"+sv ); QString command=st->setting()->value ( sid+"/command", diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index b0951f28..d40e5250 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -48,7 +48,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, this->newSession=newSession; sessName=new QLineEdit ( this ); - icon=new QPushButton ( QString::null,this ); + icon=new QPushButton ( QString(),this ); if ( !miniMode ) { icon->setIconSize ( QSize ( 100,100 ) ); @@ -101,7 +101,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, openKey=new QPushButton ( QIcon ( mainWindow->iconsPath ( "/32x32/file-open.png" ) ), - QString::null,sgb ); + QString(),sgb ); QVBoxLayout *sgbLay = new QVBoxLayout ( sgb ); QHBoxLayout *suLay =new QHBoxLayout(); QVBoxLayout *slLay =new QVBoxLayout(); @@ -159,7 +159,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, proxyKey=new QLineEdit(proxyBox); pbOpenProxyKey=new QPushButton ( QIcon ( mainWindow->iconsPath ( "/16x16/file-open.png" ) ), - QString::null,proxyBox ); + QString(),proxyBox ); cbProxyAutologin=new QCheckBox(tr("SSH Agent or default SSH key"),proxyBox); cbProxyKrbLogin=new QCheckBox(tr("Kerberos 5 (GSSAPI) authentication"),proxyBox); @@ -285,7 +285,7 @@ void SessionWidget::slot_proxyGetKey() tr ( "Open key file" ), startDir, tr ( "All files" ) +" (*)" ); - if ( path!=QString::null ) + if ( path!=QString() ) { #ifdef Q_OS_WIN if ( ONMainWindow::getPortable() && @@ -392,7 +392,7 @@ void SessionWidget::slot_getIcon() tr ( "Open picture" ), QDir::homePath(), tr ( "Pictures" ) +" (*.png *.xpm *.jpg)" ); - if ( path!=QString::null ) + if ( path!=QString() ) { sessIcon = wrap_legacy_resource_URIs (path); icon->setIcon ( QIcon ( sessIcon ) ); @@ -415,7 +415,7 @@ void SessionWidget::slot_getKey() tr ( "Open key file" ), startDir, tr ( "All files" ) +" (*)" ); - if ( path!=QString::null ) + if ( path!=QString() ) { #ifdef Q_OS_WIN if ( ONMainWindow::getPortable() && @@ -549,13 +549,13 @@ void SessionWidget::readConfig() server->setText ( st.setting()->value ( sessionId+"/host", - ( QVariant ) QString::null ).toString().trimmed() ); + ( QVariant ) QString() ).toString().trimmed() ); uname->setText ( st.setting()->value ( sessionId+"/user", - ( QVariant ) QString::null ).toString().trimmed() ); + ( QVariant ) QString() ).toString().trimmed() ); key->setText ( st.setting()->value ( sessionId+"/key", - ( QVariant ) QString::null ).toString().trimmed() ); + ( QVariant ) QString() ).toString().trimmed() ); cbAutoLogin->setChecked(st.setting()->value ( sessionId+"/autologin", ( QVariant ) false ).toBool()); @@ -800,7 +800,7 @@ void SessionWidget::setDefaults() rbSshProxy->setChecked(true); - proxyKey->setText(QString::null); + proxyKey->setText(QString()); proxyPort->setValue(22); diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp index ba858f79..51609b14 100644 --- a/src/sharewidget.cpp +++ b/src/sharewidget.cpp @@ -60,7 +60,7 @@ ShareWidget::ShareWidget ( QString id, ONMainWindow * mw, QPushButton* openDir=new QPushButton ( QIcon ( mainWindow->iconsPath ( "/16x16/file-open.png" ) ), - QString::null,egb ); + QString(),egb ); QPushButton* addDir=new QPushButton ( tr ( "Add" ),egb ); QPushButton* delDir=new QPushButton ( tr ( "Delete" ),egb ); @@ -156,7 +156,7 @@ void ShareWidget::slot_openDir() this, tr ( "Select folder" ), startDir ); - if ( path!=QString::null ) + if ( path!=QString() ) { #ifdef Q_OS_WIN if ( ONMainWindow::getPortable() && @@ -198,7 +198,7 @@ void ShareWidget::slot_addDir() item= new QStandardItem(); item->setCheckable ( true ); model->setItem ( model->rowCount()-1,1,item ); - ldir->setText ( QString::null ); + ldir->setText ( QString() ); } @@ -214,7 +214,7 @@ void ShareWidget::readConfig() X2goSettings st ( "sessions" ); QString exportDir=st.setting()->value ( sessionId+"/export", - ( QVariant ) QString::null ).toString(); + ( QVariant ) QString() ).toString(); cbFsSshTun->setChecked ( st.setting()->value ( sessionId+"/fstunnel", true ).toBool() ); diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 1ebcae9f..ed18ee76 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -197,7 +197,7 @@ SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int por this->proxyKrbLogin=proxyKrbLogin; mainWnd=(ONMainWindow*) parent; kerberos=krblogin; - challengeAuthVerificationCode=QString::null; + challengeAuthVerificationCode=QString(); #if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0) if (this->user.isEmpty ()) { @@ -987,7 +987,7 @@ bool SshMasterConnection::userAuthKeyboardInteractive(QString prompt) x2goDebug<<"Open Interaction dialog to complete authentication"; emit startInteraction(this, prompt); interactionInterrupt=false; - interactionInputText=QString::null; + interactionInputText=QString(); int rez=SSH_AUTH_INFO; bool firstLoop=true; int prompts=1; @@ -1019,7 +1019,7 @@ bool SshMasterConnection::userAuthKeyboardInteractive(QString prompt) interactionInputMutex.lock(); interrupt=interactionInterrupt; QString textToSend=interactionInputText; - interactionInputText=QString::null; + interactionInputText=QString(); interactionInputMutex.unlock(); if(textToSend.length()>0) { @@ -1129,7 +1129,7 @@ bool SshMasterConnection::userChallengeAuth() x2goDebug<<"Verification code request"<<endl; challengeAuthPasswordAccepted=true; - if(challengeAuthVerificationCode == QString::null) + if(challengeAuthVerificationCode == QString()) { keyPhraseReady=false; if (need_to_display_auth_code_prompt) { @@ -1149,7 +1149,7 @@ bool SshMasterConnection::userChallengeAuth() break; } challengeAuthVerificationCode=keyPhrase; - if(challengeAuthVerificationCode==QString::null) + if(challengeAuthVerificationCode==QString()) { authErrors<<tr("Authentication failed."); return false; @@ -1179,7 +1179,7 @@ bool SshMasterConnection::userChallengeAuth() } else { - challengeAuthVerificationCode=QString::null; + challengeAuthVerificationCode=QString(); //try with another verification code return userChallengeAuth(); } @@ -1291,7 +1291,7 @@ bool SshMasterConnection::userAuthAuto() if(ready) break; } - if(keyPhrase==QString::null) + if(keyPhrase==QString()) break; rc = ssh_userauth_autopubkey ( my_ssh_session, keyPhrase.toLatin1() ); if(i++==2) @@ -1406,7 +1406,7 @@ bool SshMasterConnection::userAuthWithKey() if(ready) break; } - if(keyPhrase==QString::null) + if(keyPhrase==QString()) break; QByteArray tmp_ba_passphrase = keyPhrase.toLocal8Bit (); @@ -1644,7 +1644,7 @@ void SshMasterConnection::interactionInterruptSlot() bool SshMasterConnection::checkLogin() { interactionInterrupt=false; - interactionInputText=QString::null; + interactionInputText=QString(); ssh_channel channel = ssh_channel_new ( my_ssh_session ); @@ -1728,7 +1728,7 @@ bool SshMasterConnection::checkLogin() interactionInputMutex.lock(); interrupt=interactionInterrupt; QString textToSend=interactionInputText; - interactionInputText=QString::null; + interactionInputText=QString(); interactionInputMutex.unlock(); if(textToSend.length()>0) { diff --git a/src/sshmasterconnection.h b/src/sshmasterconnection.h index 92e7a0cf..56c8a082 100644 --- a/src/sshmasterconnection.h +++ b/src/sshmasterconnection.h @@ -85,8 +85,8 @@ public: void run(); SshMasterConnection(QObject* parent, QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key, bool autologin, bool krblogin=false, - bool useproxy=false, ProxyType type=PROXYSSH, QString proxyserver=QString::null, quint16 proxyport=0, - QString proxylogin=QString::null, QString proxypassword=QString::null, QString proxyKey=QString::null, + bool useproxy=false, ProxyType type=PROXYSSH, QString proxyserver=QString(), quint16 proxyport=0, + QString proxylogin=QString(), QString proxypassword=QString(), QString proxyKey=QString(), bool proxyAutologin=false, bool proxyKrbLogin=false); ~SshMasterConnection(); void addChannelConnection(SshProcess* creator, int sock, QString forwardHost, diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp index 97d862e9..8ec6d3bc 100644 --- a/src/sshprocess.cpp +++ b/src/sshprocess.cpp @@ -403,7 +403,7 @@ void SshProcess::startTunnel(const QString& forwardHost, uint forwardPort, const #ifdef Q_OS_WIN QString sshString="plink -batch -P "+ #else - QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +"-o GSSApiAuthentication=yes -o PasswordAuthentication=no -o PubkeyAuthentication=no -p "+ + QString sshString=QString()+"ssh"+ KEEPALIVE_OPTION +"-o GSSApiAuthentication=yes -o PasswordAuthentication=no -o PubkeyAuthentication=no -p "+ #endif QString::number(masterCon->getPort())+" "+ masterCon->getUser()+"@"+ diff --git a/src/wapi.cpp b/src/wapi.cpp index 9c3db323..d32b2bf7 100644 --- a/src/wapi.cpp +++ b/src/wapi.cpp @@ -263,7 +263,7 @@ QString wapiShortFileName ( const QString& longName ) length = GetShortPathName ( ( LPCTSTR ) longName.utf16(), NULL, 0 ); if ( !length ) { - return QString::null; + return QString(); } buffer = new TCHAR[length]; @@ -272,7 +272,7 @@ QString wapiShortFileName ( const QString& longName ) if ( !length ) { delete []buffer; - return QString::null; + return QString(); } QString spath=QString::fromUtf16 ( ( const ushort* ) buffer ); delete []buffer; @@ -324,7 +324,7 @@ QString getNameFromSid ( PSID psid, QString* systemName ) name,&length,sysName,&dlength,&eUse ); if ( !length ) { - return QString::null; + return QString(); } name=new TCHAR[length]; @@ -336,7 +336,7 @@ QString getNameFromSid ( PSID psid, QString* systemName ) { delete []name; delete []sysName; - return QString::null; + return QString(); } QString strName=QString::fromUtf16 ( @@ -464,7 +464,7 @@ void wapiShellExecute ( const QString& operation, const QString& file, const QString& parameters, const QString& dir, HWND win ) { - if ( parameters==QString::null ) + if ( parameters==QString() ) ShellExecute ( win, ( LPCTSTR ) ( operation.utf16() ), ( LPCTSTR ) ( file.utf16() ),0, ( LPCTSTR ) ( dir.utf16() ),SW_SHOWNORMAL ); @@ -481,13 +481,13 @@ QString wapiGetDefaultPrinter() DWORD length; GetDefaultPrinter ( 0,&length ); if ( !length ) - return QString::null; + return QString(); prName=new TCHAR[length]; GetDefaultPrinter ( prName,&length ); if ( !length ) { delete []prName; - return QString::null; + return QString(); } QString printer=QString::fromUtf16 ( ( const ushort* ) prName ); delete []prName; @@ -534,7 +534,7 @@ QString wapiGetUserName() TCHAR infoBuf[INFO_BUFFER_SIZE]; DWORD bufCharCount=INFO_BUFFER_SIZE; if( !GetUserName( infoBuf, &bufCharCount ) ) - return QString::null; + return QString(); return QString::fromUtf16 ( ( const ushort* ) infoBuf); } @@ -612,7 +612,7 @@ QString wapiGetKeyboardLayout() QStringList l=QString::fromUtf16((char16_t*)nm).split("-"); if(l.count()==2) return l[1].toLower(); - return QString::null; + return QString(); } void wapiSetWinNotResizable(HWND wnd) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit f307f618d4ce343d7c51c2c881deb6c9bb527172 Author: Juri Grabowski <x2go@jugra.de> Date: Sun Jun 30 14:03:23 2024 +0200 remove endl deprecation warnings find src/ -type f -exec sed -i 's/endl/Qt::endl/g' '{}' \; git restore src/unixhelper.cpp --- src/SVGFrame.cpp | 4 +- src/contest.cpp | 2 +- src/cupsprint.cpp | 4 +- src/help.cpp | 12 ++-- src/httpbrokerclient.cpp | 26 ++++---- src/onmainwindow.cpp | 50 +++++++------- src/printdialog.cpp | 4 +- src/printwidget.cpp | 2 +- src/pulsemanager.cpp | 18 ++--- src/sshmasterconnection.cpp | 156 ++++++++++++++++++++++---------------------- src/sshprocess.cpp | 12 ++-- src/wapi.cpp | 4 +- 12 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/SVGFrame.cpp b/src/SVGFrame.cpp index 3b9ca605..3ca6d4c5 100644 --- a/src/SVGFrame.cpp +++ b/src/SVGFrame.cpp @@ -60,7 +60,7 @@ SVGFrame::SVGFrame ( QString fname,bool st,QWidget* parent, if ( renderer->animated() ) { timer->start ( 1000/renderer->framesPerSecond() ); - x2goDebug<<"Animated, fps:"<<renderer->framesPerSecond() <<endl; + x2goDebug<<"Animated, fps:"<<renderer->framesPerSecond() <<Qt::endl; } } } @@ -125,7 +125,7 @@ void SVGFrame::mousePressEvent ( QMouseEvent * event ) wapiGetBorders ( parentWidget->winId(), vBorder, hBorder, barHeight ); x2goDebug<<"svg frame: "<<event->pos() << ":"<<mapFromGlobal ( event->pos() ) <<":"<<barHeight<<":"<<vBorder<<":" - <<hBorder<<":"<<pos() <<endl; + <<hBorder<<":"<<pos() <<Qt::endl; QMouseEvent * nevent=new QMouseEvent(event->type(), QPoint(0,0), event->button(), event-> buttons(), event->modifiers()); QFrame::mousePressEvent ( nevent ); diff --git a/src/contest.cpp b/src/contest.cpp index acde823b..1d91cbe6 100644 --- a/src/contest.cpp +++ b/src/contest.cpp @@ -149,7 +149,7 @@ void ConTest::slotError(QAbstractSocket::SocketError socketError) else error=socket->errorString(); - x2goDebug<<"Error: "<<error<<endl; + x2goDebug<<"Error: "<<error<<Qt::endl; timer->stop(); QPalette pal=lhttps->palette(); pal.setColor(QPalette::WindowText, Qt::red); diff --git a/src/cupsprint.cpp b/src/cupsprint.cpp index 0733b5b9..c9a86ee4 100644 --- a/src/cupsprint.cpp +++ b/src/cupsprint.cpp @@ -130,7 +130,7 @@ bool CUPSPrint::setCurrentPrinter ( QString prn ) if ( ppdConflicts ( ppd ) !=0 ) { x2goDebug<<"There are conflicting options in user settings,\n" - "loading defaults"<<endl; + "loading defaults"<<Qt::endl; setDefaults(); } return true; @@ -153,7 +153,7 @@ bool CUPSPrint::getOptionValue ( const QString& option, } value=QString::fromLocal8Bit ( choice->choice ); valueText=QString::fromLocal8Bit ( choice->text ); -// x2goDebug<<"getValue:"<<value<<endl; +// x2goDebug<<"getValue:"<<value<<Qt::endl; return true; } diff --git a/src/help.cpp b/src/help.cpp index 2c5a33ec..8264048a 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -242,11 +242,11 @@ QString help::pretty_print (help::data_t data, bool terminal_output) { #endif } - x2goDebug << "Terminal cols: " << terminal_cols << endl; + x2goDebug << "Terminal cols: " << terminal_cols << Qt::endl; for (help::params_t::const_iterator it = data.second.constBegin (); it != data.second.constEnd (); ++it) { std::size_t indent = (max_len - (*it).first.size ()) + 4; - x2goDebug << "Indent: " << indent << "; max_len: " << max_len << "; param size: " << (*it).first.size () << endl; + x2goDebug << "Indent: " << indent << "; max_len: " << max_len << "; param size: " << (*it).first.size () << Qt::endl; out << " "; out << (*it).first; out << QString (" ").repeated (indent); @@ -260,7 +260,7 @@ QString help::pretty_print (help::data_t data, bool terminal_output) { for (QStringList::const_iterator desc_split_it = desc_split.constBegin (); desc_split_it != desc_split.constEnd (); ++desc_split_it) { std::size_t cur_len = (*desc_split_it).size (); - x2goDebug << "Going to output a description " << (*desc_split_it).size () << " chars wide." << endl; + x2goDebug << "Going to output a description " << (*desc_split_it).size () << " chars wide." << Qt::endl; if (0 != terminal_cols) { /* * Only set this the first time right after having written the parameter and indent spaces. @@ -269,11 +269,11 @@ QString help::pretty_print (help::data_t data, bool terminal_output) { if (desc_split_it == desc_split.constBegin ()) { remaining = terminal_cols - (indent + (*it).first.size ()); } - x2goDebug << "Still have " << remaining << " characters left on this line." << endl; + x2goDebug << "Still have " << remaining << " characters left on this line." << Qt::endl; /* Ran out of space? That's bad... print a newline and don't use any indentation level. */ if (0 > remaining) { - x2goDebug << "Ran out of space! Will break line and start the description on a new one." << endl; + x2goDebug << "Ran out of space! Will break line and start the description on a new one." << Qt::endl; out << "\n"; remaining = terminal_cols; indent = 0; @@ -284,7 +284,7 @@ QString help::pretty_print (help::data_t data, bool terminal_output) { while (!working_copy.isEmpty ()) { cur_len = working_copy.size (); - x2goDebug << "Trying to fit a (remaining) description " << cur_len << " characters wide." << endl; + x2goDebug << "Trying to fit a (remaining) description " << cur_len << " characters wide." << Qt::endl; string_split_t string_split; diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index 5c1e7a46..fe7773c5 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -244,7 +244,7 @@ void HttpBrokerClient::slotSshServerAuthPassphrase(SshMasterConnection* connecti ok = true; break; default: - x2goDebug << "Unknown passphrase type requested! Was: " << passphrase_type << endl; + x2goDebug << "Unknown passphrase type requested! Was: " << passphrase_type << Qt::endl; ok = false; break; } @@ -540,7 +540,7 @@ void HttpBrokerClient::createIniFile(const QString& raw_content) QString content; content = raw_content; content.replace("<br>","\n"); -// x2goDebug<<"Inifile content: "<<content<<endl; +// x2goDebug<<"Inifile content: "<<content<<Qt::endl; QString cont; QStringList lines=content.split("START_USER_SESSIONS\n"); if (lines.count()>1) @@ -678,7 +678,7 @@ void HttpBrokerClient::slotConnectionTest(bool success, QString answer, int) return; if(!sshBroker) { - x2goDebug<<"Elapsed: "<<requestTime.elapsed()<<"; received:"<<answer.size()<<endl; + x2goDebug<<"Elapsed: "<<requestTime.elapsed()<<"; received:"<<answer.size()<<Qt::endl; emit connectionTime(requestTime.elapsed(),answer.size()); } return; @@ -955,23 +955,23 @@ void HttpBrokerClient::slotSslErrors ( QNetworkReply* netReply, const QList<QSsl #else cert.issuerInfo ( QSslCertificate::CommonName ) #endif - <<endl<< + <<Qt::endl<< tr ( "Organization(O)\t" ) << #if QT_VERSION >= 0x050000 cert.issuerInfo ( QSslCertificate::Organization ).join("; ") #else cert.issuerInfo ( QSslCertificate::Organization ) #endif - <<endl<< + <<Qt::endl<< tr ( "Organizational Unit(OU)\t" ) << #if QT_VERSION >= 0x050000 cert.issuerInfo ( QSslCertificate::OrganizationalUnitName ).join("; ") #else cert.issuerInfo ( QSslCertificate::OrganizationalUnitName ) #endif - <<endl<< + <<Qt::endl<< tr ( "Serial Number\t" ) <<getHexVal ( cert.serialNumber() ) - <<endl<<endl<< + <<Qt::endl<<Qt::endl<< tr ( "Issued by:\n" ) << tr ( "Common Name(CN)\t" ) << #if QT_VERSION >= 0x050000 @@ -979,28 +979,28 @@ void HttpBrokerClient::slotSslErrors ( QNetworkReply* netReply, const QList<QSsl #else cert.subjectInfo ( QSslCertificate::CommonName ) #endif - <<endl<< + <<Qt::endl<< tr ( "Organization(O)\t" ) << #if QT_VERSION >= 0x050000 cert.subjectInfo ( QSslCertificate::Organization ).join("; ") #else cert.subjectInfo ( QSslCertificate::Organization ) #endif - <<endl<< + <<Qt::endl<< tr ( "Organizational Unit(OU)\t" ) << #if QT_VERSION >= 0x050000 cert.subjectInfo ( QSslCertificate::OrganizationalUnitName ).join("; ") #else cert.subjectInfo ( QSslCertificate::OrganizationalUnitName ) #endif - <<endl<<endl<< + <<Qt::endl<<Qt::endl<< tr ( "Validity:\n" ) << - tr ( "Issued on\t" ) <<cert.effectiveDate().toString() <<endl<< - tr ( "expires on\t" ) <<cert.expiryDate().toString() <<endl<<endl<< + tr ( "Issued on\t" ) <<cert.effectiveDate().toString() <<Qt::endl<< + tr ( "expires on\t" ) <<cert.expiryDate().toString() <<Qt::endl<<Qt::endl<< tr ( "Fingerprints:\n" ) << tr ( "SHA1\t" ) << - getHexVal ( cert.digest ( QCryptographicHash::Sha1 ) ) <<endl<< + getHexVal ( cert.digest ( QCryptographicHash::Sha1 ) ) <<Qt::endl<< tr ( "MD5\t" ) <<md5; diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index b7c82742..25095083 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -1624,7 +1624,7 @@ void ONMainWindow::closeClient() void ONMainWindow::closeEvent ( QCloseEvent* event ) { - x2goDebug<<"Close event received."<<endl; + x2goDebug<<"Close event received."<<Qt::endl; if (trayNoclose && !brokerMode) { @@ -1648,7 +1648,7 @@ void ONMainWindow::hideEvent(QHideEvent* event) void ONMainWindow::trayQuit() { - x2goDebug<<"Quitting from tray icon and closing application."<<endl; + x2goDebug<<"Quitting from tray icon and closing application."<<Qt::endl; closeClient(); qApp->quit(); @@ -2291,7 +2291,7 @@ void ONMainWindow::slotConfig() bool ret = pulseManager->set_record (!newDisableInput); if (!ret) { - x2goDebug << "Failed to change recording status of PulseManager. PulseAudio not started?" << endl; + x2goDebug << "Failed to change recording status of PulseManager. PulseAudio not started?" << Qt::endl; } pulseManager->restart (); } @@ -3261,7 +3261,7 @@ void ONMainWindow::slotSshServerAuthPassphrase(SshMasterConnection* connection, ok = true; break; default: - x2goDebug << "Unknown passphrase type requested! Was: " << passphrase_type << endl; + x2goDebug << "Unknown passphrase type requested! Was: " << passphrase_type << Qt::endl; ok = false; break; } @@ -6253,7 +6253,7 @@ void ONMainWindow::slotTunnelOk(int) #endif for ( int l=0; l<env.size(); ++l ) { -// x2goDebug<<env[l]<<endl; +// x2goDebug<<env[l]<<Qt::endl; #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN ) if ( env[l].indexOf ( "DISPLAY" ) ==0 ) @@ -6285,7 +6285,7 @@ void ONMainWindow::slotTunnelOk(int) { env <<"DISPLAY=localhost:"+disp; - /* x2goDebug<<"new env DISPLAY"<<"DISPLAY=localhost:"+disp<<endl;*/ + /* x2goDebug<<"new env DISPLAY"<<"DISPLAY=localhost:"+disp<<Qt::endl;*/ } else @@ -6293,7 +6293,7 @@ void ONMainWindow::slotTunnelOk(int) env[dispInd]="DISPLAY=localhost:"+disp; /* x2goDebug<<"existing env DISPLAY("<<dispInd<< - ") DISPLAY=localhost:"+disp<<endl;*/ + ") DISPLAY=localhost:"+disp<<Qt::endl;*/ } #endif // Q_OS_WIN @@ -7062,7 +7062,7 @@ void ONMainWindow::slotShowPassForm() { #ifdef Q_OS_DARWIN //fixes bug, when mainwindow inputs not accepting focus under mac - x2goDebug<<"Setting focus."<<endl; + x2goDebug<<"Setting focus."<<Qt::endl; QTimer::singleShot(500, this, SLOT(setFocus())); setFocus(); #endif @@ -7741,14 +7741,14 @@ void ONMainWindow::slotReadApplications(bool result, QString output, { app.name=QString::fromUtf8(line.split("=")[1].toLatin1()); - // x2goDebug<<"local name: "<<app.name<<endl; + // x2goDebug<<"local name: "<<app.name<<Qt::endl; localname=true; } if (line.indexOf("Comment["+localshort+"]=")!=-1 || line.indexOf("Comment["+locallong+"]=")!=-1) { app.comment=QString::fromUtf8(line.split("=")[1].toLatin1()); - // x2goDebug<<"local comment: "<<app.comment<<endl; + // x2goDebug<<"local comment: "<<app.comment<<Qt::endl; localcomment=true; } if (line.indexOf("Name=")!=-1 && !localname) @@ -7758,13 +7758,13 @@ void ONMainWindow::slotReadApplications(bool result, QString output, { if (app.name==autostartApps[i]) startAppsFound.append(app.name); - // x2goDebug<<"name: "<<app.name<<endl; + // x2goDebug<<"name: "<<app.name<<Qt::endl; } } if (line.indexOf("Comment=")!=-1 && !localcomment) { app.comment=line.split("=")[1]; - // x2goDebug<<"comment: "<<app.comment<<endl; + // x2goDebug<<"comment: "<<app.comment<<Qt::endl; } if (line.indexOf("Exec=")!=-1) { @@ -7779,7 +7779,7 @@ void ONMainWindow::slotReadApplications(bool result, QString output, { if (app.exec==autostartApps[i]) startAppsFound.append(app.exec); - // x2goDebug<<"exec: "<<app.exec<<endl; + // x2goDebug<<"exec: "<<app.exec<<Qt::endl; } } if (line.indexOf("Categories=")!=-1) @@ -9214,7 +9214,7 @@ directory* ONMainWindow::getExpDir ( QString key ) void ONMainWindow::slotRetExportDir ( bool result,QString output, int pid) { - x2goDebug<<"Post-cleanup for startX2goMount triggered."<<endl; + x2goDebug<<"Post-cleanup for startX2goMount triggered."<<Qt::endl; QString key; for ( int i=0; i<exportDir.size(); ++i ) if ( exportDir[i].pid==pid ) @@ -9227,7 +9227,7 @@ void ONMainWindow::slotRetExportDir ( bool result,QString output, if ( result==false ) { QString message=tr ( "<b>Connection failed.</b>\n" ) +output; - x2goDebug<<"startX2goMount failed to mount client-side folder, reason: "<<message<<endl; + x2goDebug<<"startX2goMount failed to mount client-side folder, reason: "<<message<<Qt::endl; if ( message.indexOf ( "publickey,password" ) !=-1 ) { message=tr ( "<b>Wrong password!</b><br><br>" ) + @@ -9307,7 +9307,7 @@ void ONMainWindow::slotExtTimer() <<"must be"<< ( int ) ( QFile::ReadUser|QFile::WriteUser |QFile::ExeUser|QFile::ReadOwner| QFile::WriteOwner| - QFile::ExeOwner ) <<endl; + QFile::ExeOwner ) <<Qt::endl; if ( extLogin ) extTimer->stop(); @@ -9379,13 +9379,13 @@ void ONMainWindow::slotExportTimer() { x2goDebug<<"Wrong permissions on "<< - readExportsFrom <<":"<<endl; + readExportsFrom <<":"<<Qt::endl; x2goDebug<< ( int ) ( QFile::permissions ( readExportsFrom+"/." ) ) <<"must be"<< ( int ) ( QFile::ReadUser|QFile::WriteUser |QFile::ExeUser|QFile::ReadOwner| QFile::WriteOwner| - QFile::ExeOwner ) <<endl; + QFile::ExeOwner ) <<Qt::endl; exportTimer->stop(); return; } @@ -9764,7 +9764,7 @@ void ONMainWindow::slotScDaemonFinished ( int , QProcess::ExitStatus ) { //this should not happen, restart... scDaemon=0l; - x2goDebug<<"SCDAEMON finished."<<endl; + x2goDebug<<"SCDAEMON finished."<<Qt::endl; slotStartPGPAuth(); } @@ -10309,7 +10309,7 @@ void ONMainWindow::slotFsTunnelFailed ( bool result, QString output, void ONMainWindow::slotFsTunnelOk(int) { - x2goDebug<<"FS tunnel through SSH seems to be up and running ..."<<endl; + x2goDebug<<"FS tunnel through SSH seems to be up and running ..."<<Qt::endl; fsTunReady=true; //start reverse mounting if RSA Key and FS tunnel are ready @@ -10504,7 +10504,7 @@ void ONMainWindow::startX2goMount() } } - x2goDebug<<"Calling startX2goMount command."<<endl; + x2goDebug<<"Calling startX2goMount command."<<Qt::endl; dir->pid=sshConnection->executeCommand(cmd,this,SLOT ( slotRetExportDir ( bool, QString,int) )); } @@ -10892,7 +10892,7 @@ void ONMainWindow::slotCheckXOrgConnection() * Server might still be running here, but deleting the QProcess object * should kill it. */ - x2goDebug << "Timeout reached waiting for the X.Org Server to open a listening TCP socket." << endl + x2goDebug << "Timeout reached waiting for the X.Org Server to open a listening TCP socket." << Qt::endl << "Restarting on higher DISPLAY port. Try count: " << x_start_tries_; xorg->terminate (); @@ -11929,18 +11929,18 @@ void ONMainWindow::slotConfigXinerama() intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); if (!intersection.isNull()) { - // x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; + // x2goDebug<<"intersected with "<<i<<": "<<intersection<<Qt::endl; intersection.moveLeft(intersection.x()-lastDisplayGeometry.x()); intersection.moveTop(intersection.y()-lastDisplayGeometry.y()); - // x2goDebug<<"xinerama screen: "<<intersection<<endl; + // x2goDebug<<"xinerama screen: "<<intersection<<Qt::endl; newXineramaScreens<<intersection; } } if (xineramaScreens != newXineramaScreens) { xineramaScreens=newXineramaScreens; - // x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<endl; + // x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<Qt::endl; xineramaTimer->stop(); QStringList screens; diff --git a/src/printdialog.cpp b/src/printdialog.cpp index fbe7fee0..35dfda22 100644 --- a/src/printdialog.cpp +++ b/src/printdialog.cpp @@ -25,7 +25,7 @@ PrintDialog::PrintDialog ( QWidget* parent, Qt::WindowFlags f ) : QDialog ( parent,f ) { - x2goDebug<<"Starting print dialog."<<endl; + x2goDebug<<"Starting print dialog."<<Qt::endl; ui.setupUi ( this ); ui.buttonBox->button ( QDialogButtonBox::Ok )->setText ( tr ( "Print" ) ); @@ -44,7 +44,7 @@ PrintDialog::PrintDialog ( QWidget* parent, Qt::WindowFlags f ) PrintDialog::~PrintDialog() { - x2goDebug<<"Closing print dialog."<<endl; + x2goDebug<<"Closing print dialog."<<Qt::endl; } diff --git a/src/printwidget.cpp b/src/printwidget.cpp index fd68fe50..4c5801a6 100644 --- a/src/printwidget.cpp +++ b/src/printwidget.cpp @@ -118,7 +118,7 @@ void PrintWidget::loadSettings() bool isGsViewInstalled=gsViewInfo ( ver,gsvpath ); if ( prcmd=="" && ! ( isGsInstalled && isGsViewInstalled ) ) { -// x2goDebug<<"fallback to view"<<endl; +// x2goDebug<<"fallback to view"<<Qt::endl; // pdfView=true; } else if ( prcmd=="" ) diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp index c960f169..6493e7d1 100644 --- a/src/pulsemanager.cpp +++ b/src/pulsemanager.cpp @@ -366,7 +366,7 @@ void PulseManager::fetch_pulseaudio_version () { QString stdout_data (ba.constData ()); QStringList stdout_list (stdout_data.split ("\n")); - x2goDebug << "pulseaudio --version returned:" << stdout_data << endl; + x2goDebug << "pulseaudio --version returned:" << stdout_data << Qt::endl; bool found = false; for (QStringList::const_iterator cit = stdout_list.begin (); (cit != stdout_list.end ()) && (!stop_processing); ++cit) { @@ -632,16 +632,16 @@ bool PulseManager::generate_server_config () { config_tmp_file_stream << " auth-cookie=" + tmp_auth_cookie; } - config_tmp_file_stream << endl; + config_tmp_file_stream << Qt::endl; #ifdef Q_OS_UNIX - config_tmp_file_stream << "load-module module-native-protocol-unix" << endl; - config_tmp_file_stream << "load-module module-esound-protocol-unix" << endl; + config_tmp_file_stream << "load-module module-native-protocol-unix" << Qt::endl; + config_tmp_file_stream << "load-module module-esound-protocol-unix" << Qt::endl; #endif // defined(Q_OS_UNIX) config_tmp_file_stream << "load-module module-esound-protocol-tcp port=" << QString::number (esd_port_) - << endl; + << Qt::endl; #ifdef Q_OS_DARWIN config_tmp_file_stream << "load-module module-coreaudio-detect"; @@ -665,7 +665,7 @@ bool PulseManager::generate_server_config () { else { config_tmp_file_stream << "1"; } - config_tmp_file_stream << endl; + config_tmp_file_stream << Qt::endl; QFile config_file (config_file_name); if (QFile::exists (config_file_name)) @@ -690,13 +690,13 @@ bool PulseManager::generate_client_config () { if (client_config_tmp_file.open ()) { QTextStream config_tmp_file_stream (&client_config_tmp_file); - config_tmp_file_stream << "autospawn=no" << endl; + config_tmp_file_stream << "autospawn=no" << Qt::endl; #ifdef Q_OS_WIN - config_tmp_file_stream << "default-server=localhost:" << pulse_port_ << endl; + config_tmp_file_stream << "default-server=localhost:" << pulse_port_ << Qt::endl; #endif // defined (Q_OS_WIN) config_tmp_file_stream << "daemon-binary=" << QDir::toNativeSeparators (QDir (server_binary_).absolutePath ()) - << endl; + << Qt::endl; if (QFile::exists (client_config_file_name)) QFile::remove (client_config_file_name); diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index ed18ee76..58367cf2 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -139,8 +139,8 @@ void SshMasterConnection::parseKnownHosts() //first element is a type of key, we don't need it fields.removeFirst(); settings.setValue(keyName,fields.join(",")); - x2goDebug<<"Writing key to registry: HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\SshHostKeys"<<endl; - x2goDebug<<keyName<<"="<<fields.join(",")<<endl; + x2goDebug<<"Writing key to registry: HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\SshHostKeys"<<Qt::endl; + x2goDebug<<keyName<<"="<<fields.join(",")<<Qt::endl; } settings.sync(); } @@ -366,7 +366,7 @@ void SshMasterConnection::checkReverseTunnelConnections() struct sockaddr_in address; address.sin_family=AF_INET; address.sin_port=htons ( req.localPort ); - x2goDebug<<"Connecting to "<<req.localHost<<":"<<req.localPort<<endl; + x2goDebug<<"Connecting to "<<req.localHost<<":"<<req.localPort<<Qt::endl; #ifndef Q_OS_WIN inet_aton ( req.localHost.toLatin1(), &address.sin_addr ); #else @@ -378,7 +378,7 @@ void SshMasterConnection::checkReverseTunnelConnections() { QString errMsg=tr ( "Cannot connect to " ) + req.localHost+":"+QString::number ( req.localPort ); - x2goDebug<<errMsg<<endl; + x2goDebug<<errMsg<<Qt::endl; emit ioErr ( req.creator, errMsg, "" ); break; } @@ -560,7 +560,7 @@ void SshMasterConnection::run() if ( my_ssh_session == NULL ) { QString err=tr ( "Cannot create SSH session." ); - x2goDebug<<err<<endl; + x2goDebug<<err<<Qt::endl; emit connectionError ( err,"" ); quit(); return; @@ -595,25 +595,25 @@ void SshMasterConnection::run() if (!tcpProxySocket->waitForConnected(30000)) { QString message=tr ( "Cannot connect to proxy server." ); - x2goDebug<<message<<endl; + x2goDebug<<message<<Qt::endl; emit connectionError ( "Proxy", message ); ssh_free ( my_ssh_session ); quit(); return; } proxysocket = tcpProxySocket->socketDescriptor(); - x2goDebug << "Created HTTP proxy socket: " << proxysocket << endl; + x2goDebug << "Created HTTP proxy socket: " << proxysocket << Qt::endl; ssh_options_set( my_ssh_session, SSH_OPTIONS_FD, &proxysocket); ssh_set_fd_toread( my_ssh_session); x2goDebug<<"Connected to HTTP proxy server: " << proxyserver << ":" - << proxyport <<endl; + << proxyport <<Qt::endl; } if ( !sshConnect() ) { if(disconnectSessionFlag) { - x2goDebug<<"Session is already disconnected, exiting."<<endl; + x2goDebug<<"Session is already disconnected, exiting."<<Qt::endl; return; } QString err=ssh_get_error ( my_ssh_session ); @@ -626,7 +626,7 @@ void SshMasterConnection::run() } if(disconnectSessionFlag) { - x2goDebug<<"Session is already disconnected, exiting."<<endl; + x2goDebug<<"Session is already disconnected, exiting."<<Qt::endl; return; } QString errMsg; @@ -635,7 +635,7 @@ void SshMasterConnection::run() { if(disconnectSessionFlag) { - x2goDebug<<"Session is already disconnected, exiting."<<endl; + x2goDebug<<"Session is already disconnected, exiting."<<Qt::endl; return; } writeHostKey=writeHostKeyReady=false; @@ -660,7 +660,7 @@ void SshMasterConnection::run() if(disconnectSessionFlag) { - x2goDebug<<"Session is already disconnected, exiting."<<endl; + x2goDebug<<"Session is already disconnected, exiting."<<Qt::endl; return; } @@ -680,7 +680,7 @@ void SshMasterConnection::run() { if(disconnectSessionFlag) { - x2goDebug<<"Session is already disconnected, exiting."<<endl; + x2goDebug<<"Session is already disconnected, exiting."<<Qt::endl; return; } x2goDebug<<"User authentication OK."; @@ -719,7 +719,7 @@ void SshMasterConnection::run() { if(disconnectSessionFlag) { - x2goDebug<<"Session is already disconnected, exiting."<<endl; + x2goDebug<<"Session is already disconnected, exiting."<<Qt::endl; return; } QString err; @@ -940,7 +940,7 @@ int SshMasterConnection::serverAuth ( QString& errorMsg ) if ( 0 >= hlen ) return SSH_SERVER_ERROR; - x2goDebug<<"state: "<<state<<endl; + x2goDebug<<"state: "<<state<<Qt::endl; switch ( state ) { @@ -1007,9 +1007,9 @@ bool SshMasterConnection::userAuthKeyboardInteractive(QString prompt) QString name= ssh_userauth_kbdint_getname(my_ssh_session); instruction = ssh_userauth_kbdint_getinstruction(my_ssh_session); - x2goDebug<<"Have prompts: "<<prompts<<endl; - x2goDebug<<"Name: "<<name<<endl; - x2goDebug<<"Instruction: "<<instruction<<endl; + x2goDebug<<"Have prompts: "<<prompts<<Qt::endl; + x2goDebug<<"Name: "<<name<<Qt::endl; + x2goDebug<<"Instruction: "<<instruction<<Qt::endl; } if(prompts>0) { @@ -1082,15 +1082,15 @@ bool SshMasterConnection::userChallengeAuth() { case SSH_AUTH_INFO: prompts=ssh_userauth_kbdint_getnprompts(my_ssh_session); - x2goDebug<<"Have prompts: "<<prompts<<endl; + x2goDebug<<"Have prompts: "<<prompts<<Qt::endl; if(prompts) { const char *prompt= ssh_userauth_kbdint_getprompt(my_ssh_session,0,NULL); - x2goDebug<<"Prompt[0]: |"<<prompt<<"|"<<endl; + x2goDebug<<"Prompt[0]: |"<<prompt<<"|"<<Qt::endl; QString pr=prompt; if(pr.startsWith ("Password:")) { - x2goDebug<<"Password request"<<endl; + x2goDebug<<"Password request"<<Qt::endl; ssh_userauth_kbdint_setanswer(my_ssh_session,0,pass.toLatin1()); return userChallengeAuth(); } @@ -1100,13 +1100,13 @@ bool SshMasterConnection::userChallengeAuth() const std::size_t challenge_auth_code_prompts_size = (sizeof (challenge_auth_code_prompts_)/sizeof (*challenge_auth_code_prompts_)); if (pr.contains ("challenge", Qt::CaseInsensitive)) { - x2goDebug << "prompt contains 'challenge': " << pr << endl; + x2goDebug << "prompt contains 'challenge': " << pr << Qt::endl; has_challenge_auth_code_prompt = true; need_to_display_auth_code_prompt = true; } else { for (std::size_t i = 0; i < challenge_auth_code_prompts_size; ++i) { - x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl; + x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << Qt::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", Qt::SkipEmptyParts); @@ -1126,7 +1126,7 @@ bool SshMasterConnection::userChallengeAuth() } if (has_challenge_auth_code_prompt) { - x2goDebug<<"Verification code request"<<endl; + x2goDebug<<"Verification code request"<<Qt::endl; challengeAuthPasswordAccepted=true; if(challengeAuthVerificationCode == QString()) @@ -1168,7 +1168,7 @@ bool SshMasterConnection::userChallengeAuth() return userChallengeAuth(); } case SSH_AUTH_SUCCESS: - x2goDebug<<"Challenge authentication OK."<<endl; + x2goDebug<<"Challenge authentication OK."<<Qt::endl; return true; case SSH_AUTH_DENIED: if(!challengeAuthPasswordAccepted ) @@ -1204,22 +1204,22 @@ bool SshMasterConnection::userAuthWithPass() int method = ssh_userauth_list(my_ssh_session, NULL); if (method & SSH_AUTH_METHOD_INTERACTIVE) { - x2goDebug << "Challenge authentication requested." << endl; + x2goDebug << "Challenge authentication requested." << Qt::endl; challengeAuthPasswordAccepted = false; ret = userChallengeAuth (); if (!ret) { - x2goDebug << "Challenge authentication failed." << endl; + x2goDebug << "Challenge authentication failed." << Qt::endl; } } if (!ret) { - x2goDebug << "Trying password mechanism if available." << endl; + x2goDebug << "Trying password mechanism if available." << Qt::endl; } if ((!ret) && (method & SSH_AUTH_METHOD_PASSWORD)) { - x2goDebug << "Password mechanism available. Continuing." << endl; + x2goDebug << "Password mechanism available. Continuing." << Qt::endl; QString auth_password = pass; @@ -1248,7 +1248,7 @@ bool SshMasterConnection::userAuthWithPass() { QString err=ssh_get_error ( my_ssh_session ); authErrors<<err; - x2goDebug << "Password authentication failed: " << err << endl; + x2goDebug << "Password authentication failed: " << err << Qt::endl; } else { ret = true; @@ -1259,7 +1259,7 @@ bool SshMasterConnection::userAuthWithPass() /* In case password auth is disabled, make sure the error message is not empty. */ QString err = ssh_get_error (my_ssh_session); authErrors << err; - x2goDebug << "Password authentication not available: " << err << endl; + x2goDebug << "Password authentication not available: " << err << Qt::endl; } return (ret); @@ -1304,7 +1304,7 @@ bool SshMasterConnection::userAuthAuto() { QString err=ssh_get_error ( my_ssh_session ); authErrors<<err; - x2goDebug << "userAuthAuto failed:" << err << " (code " << rc << ")" << endl; + x2goDebug << "userAuthAuto failed:" << err << " (code " << rc << ")" << Qt::endl; return false; } return true; @@ -1504,7 +1504,7 @@ bool SshMasterConnection::userAuthWithKey() ssh_string_free(pubkeyStr); #endif - x2goDebug<<"Authenticating with key: "<<rc<<endl; + x2goDebug<<"Authenticating with key: "<<rc<<Qt::endl; if ( autoRemove ) QFile::remove ( keyName ); @@ -1515,7 +1515,7 @@ bool SshMasterConnection::userAuthWithKey() QString err=ssh_get_error ( my_ssh_session ); authErrors<<err; - x2goDebug<<"userAuthWithKey failed:" <<err<<endl; + x2goDebug<<"userAuthWithKey failed:" <<err<<Qt::endl; return false; } @@ -1576,7 +1576,7 @@ bool SshMasterConnection::userAuthKrb() */ local_args << shcmd; - x2goDebug << "Starting ssh:" << local_cmd << " " << local_args.join (" ") << endl; + x2goDebug << "Starting ssh:" << local_cmd << " " << local_args.join (" ") << Qt::endl; ssh.start (local_cmd, local_args); @@ -1584,7 +1584,7 @@ bool SshMasterConnection::userAuthKrb() { sshProcErrString=ssh.errorString(); authErrors<<sshProcErrString; - x2goDebug<<"SSH start failed:" <<sshProcErrString<<endl; + x2goDebug<<"SSH start failed:" <<sshProcErrString<<Qt::endl; return false; } if (!ssh.waitForFinished(20000)) @@ -1592,16 +1592,16 @@ bool SshMasterConnection::userAuthKrb() sshProcErrString=ssh.errorString(); authErrors<<tr("Failed to start SSH client. Please check your installation and GSSApi configuration."); authErrors<<sshProcErrString; - x2goDebug<<"SSH did not finish:" <<sshProcErrString<<endl; + x2goDebug<<"SSH did not finish:" <<sshProcErrString<<Qt::endl; return false; } QString outp=ssh.readAllStandardOutput(); QString err=ssh.readAllStandardError(); x2goDebug<<"SSH exited."; - x2goDebug<<"stdout: "<<outp<<endl; - x2goDebug<<"stderr: "<<err<<endl; - x2goDebug<<"Exit code: "<<ssh.exitCode()<<"; status: "<<ssh.exitStatus()<<endl; + x2goDebug<<"stdout: "<<outp<<Qt::endl; + x2goDebug<<"stderr: "<<err<<Qt::endl; + x2goDebug<<"Exit code: "<<ssh.exitCode()<<"; status: "<<ssh.exitStatus()<<Qt::endl; QString begin_marker = "X2GODATABEGIN:"+uuidStr+"\n"; QString end_marker = "X2GODATAEND:"+uuidStr+"\n"; @@ -1653,14 +1653,14 @@ bool SshMasterConnection::checkLogin() QString err = ssh_get_error (my_ssh_session); QString error_msg = tr ("%1 failed.").arg ("ssh_channel_new"); - x2goDebug << error_msg.left (error_msg.size () - 1) << ": " << err << endl; + x2goDebug << error_msg.left (error_msg.size () - 1) << ": " << err << Qt::endl; return false; } if ( ssh_channel_open_session ( channel ) !=SSH_OK ) { QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_open_session"); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; ssh_channel_free(channel); return false; } @@ -1668,7 +1668,7 @@ bool SshMasterConnection::checkLogin() { QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_request_pty"); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; ssh_channel_free(channel); return false; } @@ -1676,7 +1676,7 @@ bool SshMasterConnection::checkLogin() { QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_change_pty_size"); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; ssh_channel_free(channel); return false; } @@ -1684,7 +1684,7 @@ bool SshMasterConnection::checkLogin() { QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_request_exec"); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; ssh_channel_free(channel); return false; } @@ -1693,7 +1693,7 @@ bool SshMasterConnection::checkLogin() char buffer[1024*512]; //512K buffer bool hasInterraction=true; bool interactionStarted=false; -// x2goDebug<<"CHECK LOGIN channel created."<<endl; +// x2goDebug<<"CHECK LOGIN channel created."<<Qt::endl; while (ssh_channel_is_open(channel) && !ssh_channel_is_eof(channel)) { @@ -1838,17 +1838,17 @@ void SshMasterConnection::copy() QString dstFile=lst.last(); lst.removeLast(); QString dstPath=lst.join ( "/" ); - x2goDebug<<"SSH Master Connection copy - dst path:"<<dstPath<<" file:"<<dstFile<<endl; + x2goDebug<<"SSH Master Connection copy - dst path:"<<dstPath<<" file:"<<dstFile<<Qt::endl; ssh_scp scp=ssh_scp_new ( my_ssh_session, SSH_SCP_WRITE|SSH_SCP_RECURSIVE, dstPath.toLatin1() ); if ( scp == NULL ) { - x2goDebug<<"Error allocating SCP session: "<< ssh_get_error ( my_ssh_session ) <<endl; + x2goDebug<<"Error allocating SCP session: "<< ssh_get_error ( my_ssh_session ) <<Qt::endl; return; } int rc = ssh_scp_init ( scp ); if ( rc != SSH_OK ) { - x2goDebug<<"Error initializing SCP session: "<< ssh_get_error ( my_ssh_session ) <<endl; + x2goDebug<<"Error initializing SCP session: "<< ssh_get_error ( my_ssh_session ) <<Qt::endl; ssh_scp_free ( scp ); return; } @@ -1869,7 +1869,7 @@ void SshMasterConnection::copy() { QString errMsg=tr ( "Cannot create remote file " ) +copyRequests[i].dst; QString serr=ssh_get_error ( my_ssh_session ); - x2goDebug<<errMsg<<" - "<<serr<<endl; + x2goDebug<<errMsg<<" - "<<serr<<Qt::endl; emit copyErr ( copyRequests[i].creator, errMsg, serr ); copyRequests.removeAt ( i ); ssh_scp_close ( scp ); @@ -1881,7 +1881,7 @@ void SshMasterConnection::copy() { QString serr=ssh_get_error ( my_ssh_session ); QString errMsg=tr ( "Cannot write to remote file " ) +copyRequests[i].dst; - x2goDebug<<errMsg<<" - "<<serr<<endl; + x2goDebug<<errMsg<<" - "<<serr<<Qt::endl; emit copyErr ( copyRequests[i].creator, errMsg, serr ); copyRequests.removeAt ( i ); ssh_scp_close ( scp ); @@ -1889,7 +1889,7 @@ void SshMasterConnection::copy() continue; } emit copyOk ( copyRequests[i].creator ); - x2goDebug<<"scp ok: "<<copyRequests[i].src<<" -> "<<user<<"@"<<host<<":"<<copyRequests[i].dst<<endl; + x2goDebug<<"scp ok: "<<copyRequests[i].src<<" -> "<<user<<"@"<<host<<":"<<copyRequests[i].dst<<Qt::endl; copyRequests.removeAt ( i ); ssh_scp_close ( scp ); ssh_scp_free ( scp ); @@ -1906,7 +1906,7 @@ void SshMasterConnection::channelLoop() if ( disconnect ) { - x2goDebug<<"Disconnecting ..."<<endl; + x2goDebug<<"Disconnecting ..."<<Qt::endl; if (useproxy && proxytype==PROXYSSH&&sshProxy) { @@ -1915,22 +1915,22 @@ void SshMasterConnection::channelLoop() } channelConnectionsMutex.lock(); - x2goDebug<<"Deleting channel connections."<<endl; + x2goDebug<<"Deleting channel connections."<<Qt::endl; for ( int i=0; i<channelConnections.size(); ++i ) { finalize ( i ); } channelConnectionsMutex.unlock(); - x2goDebug<<"Disconnecting session."<<endl; + x2goDebug<<"Disconnecting session."<<Qt::endl; ssh_disconnect ( my_ssh_session ); ssh_free ( my_ssh_session ); - x2goDebug<<"Deleting sockets."<<endl; + x2goDebug<<"Deleting sockets."<<Qt::endl; if (tcpProxySocket != NULL) delete tcpProxySocket; if (tcpNetworkProxy != NULL) delete tcpNetworkProxy; - x2goDebug<<"All channels closed and session disconnected. Quitting session loop."<<endl; + x2goDebug<<"All channels closed and session disconnected. Quitting session loop."<<Qt::endl; quit(); return; } @@ -1988,7 +1988,7 @@ void SshMasterConnection::channelLoop() continue; } - // x2goDebug<<"select exited"<<endl; + // x2goDebug<<"select exited"<<Qt::endl; channelConnectionsMutex.lock(); for ( int i=channelConnections.size()-1; i>=0; --i ) @@ -2002,7 +2002,7 @@ void SshMasterConnection::channelLoop() // x2goDebug<<"read err data from channel\n"; nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer )-1, 1 ); emit stdErr ( channelConnections[i].creator, QByteArray ( buffer,nbytes ) ); - // x2goDebug<<nbytes<<" err from channel"<<endl; + // x2goDebug<<nbytes<<" err from channel"<<Qt::endl; } int rez = ssh_channel_poll ( channel, 0 ); if ( rez==SSH_EOF ) @@ -2015,9 +2015,9 @@ void SshMasterConnection::channelLoop() } if ( rez>0 ) { - // x2goDebug<<"read data from channel "<<channel<<endl; + // x2goDebug<<"read data from channel "<<channel<<Qt::endl; nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer )-1, 0 ); - // x2goDebug<<nbytes<<" from channel "<<channel<<endl; + // x2goDebug<<nbytes<<" from channel "<<channel<<Qt::endl; if ( nbytes > 0 ) { if ( tcpSocket>0 ) @@ -2025,12 +2025,12 @@ void SshMasterConnection::channelLoop() if ( send ( tcpSocket,buffer, nbytes,0 ) != nbytes ) { QString errMsg=tr ( "Error writing to socket." ); - x2goDebug<<"Error writing "<<nbytes<<" to TCP socket"<<tcpSocket<<endl; + x2goDebug<<"Error writing "<<nbytes<<" to TCP socket"<<tcpSocket<<Qt::endl; emit ioErr ( channelConnections[i].creator,errMsg,"" ); finalize ( i ); continue; } - // x2goDebug<<"wrote "<<nbytes<<" to tcp socket "<<tcpSocket<<endl; + // x2goDebug<<"wrote "<<nbytes<<" to tcp socket "<<tcpSocket<<Qt::endl; } else { @@ -2044,7 +2044,7 @@ void SshMasterConnection::channelLoop() QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "Error reading channel." ); emit ioErr ( channelConnections[i].creator, errorMsg, err ); - x2goDebug<<errorMsg<<" - "<<err<<endl; + x2goDebug<<errorMsg<<" - "<<err<<Qt::endl; finalize ( i ); continue; } @@ -2065,7 +2065,7 @@ void SshMasterConnection::channelLoop() if ( FD_ISSET ( tcpSocket,&rfds ) ) { nbytes = recv ( tcpSocket, buffer, sizeof ( buffer )-1,0 ); - // x2goDebug<<nbytes<<" bytes from tcp socket "<<tcpSocket<<endl; + // x2goDebug<<nbytes<<" bytes from tcp socket "<<tcpSocket<<Qt::endl; if ( nbytes > 0 ) { if ( ssh_channel_write ( channel, buffer, nbytes ) !=nbytes ) @@ -2073,11 +2073,11 @@ void SshMasterConnection::channelLoop() QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_write"); emit ioErr ( channelConnections[i].creator, errorMsg, err ); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; finalize ( i ); continue; } - // x2goDebug<<nbytes<<" bytes wrote to channel"<<channel<<endl; + // x2goDebug<<nbytes<<" bytes wrote to channel"<<channel<<Qt::endl; } if ( nbytes < 0 ) { @@ -2085,13 +2085,13 @@ void SshMasterConnection::channelLoop() QString err=""; QString errorMsg=tr ( "Error reading from TCP socket." ); emit ioErr ( channelConnections[i].creator, errorMsg, err ); - x2goDebug<<errorMsg<<" - "<<err<<endl; + x2goDebug<<errorMsg<<" - "<<err<<Qt::endl; finalize ( i ); continue; } if ( nbytes==0 ) { - x2goDebug<<"Socket "<<tcpSocket<<" closed."<<endl; + x2goDebug<<"Socket "<<tcpSocket<<" closed."<<Qt::endl; finalize ( i ); continue; } @@ -2110,7 +2110,7 @@ bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set & FD_SET ( tcpSocket, &rfds ); if ( channelConnections.at ( i ).channel==0l ) { - x2goDebug<<"Creating new channel."<<endl; + x2goDebug<<"Creating new channel."<<Qt::endl; ssh_channel channel = ssh_channel_new ( my_ssh_session ); if (!channel) { @@ -2119,11 +2119,11 @@ bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set & QString error_msg = tr ("%1 failed.").arg ("ssh_channel_new"); emit ioErr (channelConnections[i].creator, error_msg, err); - x2goDebug << error_msg.left (error_msg.size () - 1) << ": " << err << endl; + x2goDebug << error_msg.left (error_msg.size () - 1) << ": " << err << Qt::endl; return (false); } - x2goDebug<<"New channel:"<<channel<<endl; + x2goDebug<<"New channel:"<<channel<<Qt::endl; channelConnections[i].channel=channel; if ( tcpSocket>0 ) { @@ -2188,17 +2188,17 @@ bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set & QString err=ssh_get_error ( my_ssh_session ); QString errorMsg=tr ( "%1 failed." ).arg ("ssh_channel_open_forward"); emit ioErr ( channelConnections[i].creator, errorMsg, err ); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; } else { - x2goDebug<<"New channel forwarded."<<endl; + x2goDebug<<"New channel forwarded."<<Qt::endl; } } } else { - x2goDebug<<"Executing remote: "<<channelConnections.at ( i ).command<<endl; + x2goDebug<<"Executing remote: "<<channelConnections.at ( i ).command<<Qt::endl; if ( ssh_channel_open_session ( channel ) !=SSH_OK ) { QString err=ssh_get_error ( my_ssh_session ); @@ -2208,7 +2208,7 @@ bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set & ssh_channel_free (channel); emit ioErr ( channelConnections[i].creator, errorMsg, err ); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; return (false); } @@ -2222,14 +2222,14 @@ bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set & ssh_channel_free (channel); emit ioErr ( channelConnections[i].creator, errorMsg, err ); - x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<endl; + x2goDebug<<errorMsg.left (errorMsg.size () - 1)<<": "<<err<<Qt::endl; return (false); } else { /* Everything is OK. */ - x2goDebug<<"New exec channel created."<<endl; + x2goDebug<<"New exec channel created."<<Qt::endl; } } } diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp index 8ec6d3bc..db663e26 100644 --- a/src/sshprocess.cpp +++ b/src/sshprocess.cpp @@ -125,7 +125,7 @@ void SshProcess::tunnelLoop() if (serverSocket<=0) { QString err=tr("Error creating socket."); - x2goDebug<<err<<endl; + x2goDebug<<err<<Qt::endl; emit sshFinished(false,err,pid); return; } @@ -143,7 +143,7 @@ void SshProcess::tunnelLoop() if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0) { QString err=tr("Error binding ")+localHost+":"+QString::number(localPort); - x2goDebug<<err<<endl; + x2goDebug<<err<<Qt::endl; emit sshFinished(false,err,pid); return; } @@ -292,7 +292,7 @@ void SshProcess::startNormal(const QString& cmd, bool overridePath) { stdErrString=proc->errorString(); #ifdef DEBUG - //x2goDebug<<"ssh start failed:" <<stdErrString<<endl; + //x2goDebug<<"ssh start failed:" <<stdErrString<<Qt::endl; #endif slotChannelClosed(this, uuidStr); return; @@ -384,7 +384,7 @@ void SshProcess::start_cp(QString src, QString dst) void SshProcess::startTunnel(const QString& forwardHost, uint forwardPort, const QString& localHost, uint localPort, bool reverse) { - x2goDebug<<"Starting tunnel via SshProcess object "<<pid<<": "<<forwardHost<<":"<<forwardPort<<" -> "<<localHost<<":"<<localPort<<endl; + x2goDebug<<"Starting tunnel via SshProcess object "<<pid<<": "<<forwardHost<<":"<<forwardPort<<" -> "<<localHost<<":"<<localPort<<Qt::endl; tunnel=true; tunnelOkEmited=false; @@ -439,7 +439,7 @@ void SshProcess::slotStdErr(SshProcess* creator, QByteArray data) if (creator!=this) return; #ifdef DEBUG -// x2goDebug<<"new err data:"<<data<<endl; +// x2goDebug<<"new err data:"<<data<<Qt::endl; #endif stdErrString+=data; @@ -464,7 +464,7 @@ void SshProcess::slotStdOut(SshProcess* creator, QByteArray data) { if (creator!=this) return; -// x2goDebug<<"new data"<<data<<endl; +// x2goDebug<<"new data"<<data<<Qt::endl; stdOutString+=data; } diff --git a/src/wapi.cpp b/src/wapi.cpp index d32b2bf7..bc38439e 100644 --- a/src/wapi.cpp +++ b/src/wapi.cpp @@ -247,10 +247,10 @@ void wapiSetWindowIcon ( HWND wnd, const QPixmap& icon) x2goDebug<<"Small icon: "<<smallIcon<<smallx<<"x"<<smally; int rez=SetClassLong(wnd,GCL_HICON, (LONG)largeIcon); if (!rez) - x2goDebug<<"ERROR: "<<GetLastError()<<endl; + x2goDebug<<"ERROR: "<<GetLastError()<<Qt::endl; rez=SetClassLong(wnd,GCL_HICONSM,(LONG)smallIcon); if (!rez) - x2goDebug<<"ERROR: "<<GetLastError()<<endl; + x2goDebug<<"ERROR: "<<GetLastError()<<Qt::endl; /* ShowWindow(wnd, SW_HIDE); ShowWindow(wnd, SW_SHOW);*/ } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 834afac7e337a5c7c8739a5ecbd8f12076a39e7d Merge: 5c084d0b f307f618 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 5 08:32:02 2024 +0200 Merge branch 'remove-more-deprecation-warnings' into 'master' remove simple qt5 deprecation warnings Attributes GL MR !8: https://gitlab.x2go.org/x2go/client/x2goclient/-/merge_requests/8 src/SVGFrame.cpp | 6 +- src/brokerpassdlg.cpp | 4 +- src/configdialog.cpp | 16 ++-- src/contest.cpp | 2 +- src/cupsprint.cpp | 4 +- src/exportdialog.cpp | 6 +- src/folderexplorer.cpp | 2 +- src/help.cpp | 12 +-- src/httpbrokerclient.cpp | 30 ++++---- src/onmainwindow.cpp | 178 ++++++++++++++++++++++---------------------- src/onmainwindow.h | 6 +- src/printdialog.cpp | 4 +- src/printprocess.cpp | 2 +- src/printwidget.cpp | 2 +- src/pulsemanager.cpp | 18 ++--- src/sessionbutton.cpp | 10 +-- src/sessionwidget.cpp | 20 ++--- src/sharewidget.cpp | 8 +- src/sshmasterconnection.cpp | 176 +++++++++++++++++++++---------------------- src/sshmasterconnection.h | 4 +- src/sshprocess.cpp | 14 ++-- src/wapi.cpp | 22 +++--- 22 files changed, 273 insertions(+), 273 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org