From a8c7c1de8922273d1fc7a381ff4ea3c8f895a73d Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Mon, 31 Aug 2009 00:25:54 +0000 Subject: [PATCH] Fix an issue with my 1017187 commit and fix 1 krazy2 issue svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1017606 --- src/ProcessInfo.cpp | 2 +- src/SessionController.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp index 5a0ac9ca9..77899a0f7 100644 --- a/src/ProcessInfo.cpp +++ b/src/ProcessInfo.cpp @@ -613,7 +613,7 @@ private: QString fullDeviceName = QString("/dev/") + deviceNumber.rightJustified(3, '0'); delete [] kInfoProc; - QByteArray deviceName = fullDeviceName.toLatin1().constData(); + QByteArray deviceName = fullDeviceName.toLatin1(); const char* ttyName = deviceName.data(); if (KDE_stat(ttyName, &statInfo) != 0) diff --git a/src/SessionController.cpp b/src/SessionController.cpp index f666bbb34..86e53c0a7 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -1103,7 +1103,7 @@ void SessionController::zmodemUpload() QStringList files = KFileDialog::getOpenFileNames(KUrl(), QString(), _view, i18n("Select Files for ZModem Upload")); if(!files.isEmpty()) { - _session->startZModem(zmodem, QString::null, files); + _session->startZModem(zmodem, QString(), files); } }