Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 8941737e58
commit c1751ea5db

@ -49,7 +49,7 @@ extern "C"
{ {
TQWidget* allocate_kstyle_config(TQWidget* parent) TQWidget* allocate_kstyle_config(TQWidget* parent)
{ {
KGlobal::locale()->insertCatalogue("kstyle_lipstik_config"); TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
return new LipstikStyleConfig(parent); return new LipstikStyleConfig(parent);
} }
} }
@ -59,7 +59,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10); TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10);
KGlobal::locale()->insertCatalogue("kstyle_lipstik_config"); TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
///Init tabs ///Init tabs
TQTabWidget *tabWidget = new TQTabWidget(this); TQTabWidget *tabWidget = new TQTabWidget(this);

Loading…
Cancel
Save