From 5e6e2fd8352a86fb70f804472a6346868483623a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:13:55 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/gui/configuration/TabbedConfigurationPage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/configuration/TabbedConfigurationPage.cpp') diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp index ae64894..fa26a5c 100644 --- a/src/gui/configuration/TabbedConfigurationPage.cpp +++ b/src/gui/configuration/TabbedConfigurationPage.cpp @@ -46,7 +46,7 @@ TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc, init(); } -TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg, +TabbedConfigurationPage::TabbedConfigurationPage(TDEConfig *cfg, TQWidget *parent, const char *name) : ConfigurationPage(cfg, parent, name) @@ -55,7 +55,7 @@ TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg, } TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc, - KConfig *cfg, + TDEConfig *cfg, TQWidget *parent, const char *name) : ConfigurationPage(doc, cfg, parent, name) -- cgit v1.2.1