From c1751ea5db2067176d258974c054e3af51ff48e5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:26:56 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- style/config/lipstikconf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style/config/lipstikconf.cpp b/style/config/lipstikconf.cpp index 5e67d9f..5592590 100644 --- a/style/config/lipstikconf.cpp +++ b/style/config/lipstikconf.cpp @@ -49,7 +49,7 @@ extern "C" { TQWidget* allocate_kstyle_config(TQWidget* parent) { - KGlobal::locale()->insertCatalogue("kstyle_lipstik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config"); return new LipstikStyleConfig(parent); } } @@ -59,7 +59,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent) TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10); - KGlobal::locale()->insertCatalogue("kstyle_lipstik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config"); ///Init tabs TQTabWidget *tabWidget = new TQTabWidget(this);