Port to KF5/Qt5

TerminalDisplayAccessible is disabled for Qt5 currently since I don't
have any experience with accessible stuff and it is more complicated
than just changing a few includes

REVIEW: 111937
This commit is contained in:
Alex Richardson
2013-08-20 23:34:35 +02:00
parent 205a51839c
commit a83db71590
33 changed files with 184 additions and 120 deletions

View File

@@ -48,6 +48,7 @@
#include <KWindowSystem>
#include <KTextEdit>
#include <KMessageBox>
#include <KUrl>
// Konsole
#include "ColorScheme.h"
@@ -261,7 +262,7 @@ void EditProfileDialog::setupGeneralPage(const Profile::Ptr profile)
_ui->commandEdit->setText(command.fullCommand());
KUrlCompletion* exeCompletion = new KUrlCompletion(KUrlCompletion::ExeCompletion);
exeCompletion->setParent(this);
exeCompletion->setDir(QString());
exeCompletion->setDir(QUrl());
_ui->commandEdit->setCompletionObject(exeCompletion);
_ui->initialDirEdit->setText(profile->defaultWorkingDirectory());
@@ -395,7 +396,7 @@ void EditProfileDialog::commandChanged(const QString& command)
}
void EditProfileDialog::selectInitialDir()
{
const KUrl url = KFileDialog::getExistingDirectoryUrl(_ui->initialDirEdit->text(),
const KUrl url = KFileDialog::getExistingDirectoryUrl(KUrl(_ui->initialDirEdit->text()),
this,
i18n("Select Initial Directory"));
@@ -1213,7 +1214,7 @@ void EditProfileDialog::showFontDialog()
QFont currentFont = _ui->fontPreviewLabel->font();
QWeakPointer<KFontDialog> dialog = new KFontDialog(this, KFontChooser::FixedFontsOnly);
dialog.data()->setCaption(i18n("Select Fixed Width Font"));
dialog.data()->setWindowTitle(i18n("Select Fixed Width Font"));
dialog.data()->setFont(currentFont, true);
// TODO (hindenburg): When https://git.reviewboard.kde.org/r/103357 is