From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kommander/editor/assoctexteditorimpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kommander/editor/assoctexteditorimpl.cpp') diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 8498b96f..334fa177 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -68,12 +68,12 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, : AssocTextEditorBase(a_parent, a_name, a_modal) { // text editor -/* associatedTextEdit->setFont(KGlobalSettings::fixedFont()); +/* associatedTextEdit->setFont(TDEGlobalSettings::fixedFont()); associatedTextEdit->setTabStopWidth(associatedTextEdit->fontMetrics().maxWidth() * 3); associatedTextEdit->setTextFormat(TQt::PlainText);*/ // icon for non-empty scripts - scriptPixmap = KGlobal::iconLoader()->loadIcon("source", KIcon::Small); + scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", KIcon::Small); // signals and slots connections m_formWindow = a_form; -- cgit v1.2.3