summaryrefslogtreecommitdiffstats
path: root/extra/kde301
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:31:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:31:20 -0600
commit1244eb7c0136985569a71f525ef5bcee08a431c4 (patch)
treeb611e304794fa1b9ec4cce9dd762e572d301aa4e /extra/kde301
parent44249e7b6a1264a1d56b6ac085fa797d831d9bb2 (diff)
downloadpytde-1244eb7c0136985569a71f525ef5bcee08a431c4.tar.gz
pytde-1244eb7c0136985569a71f525ef5bcee08a431c4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'extra/kde301')
-rw-r--r--extra/kde301/kaccelbase.h2
-rw-r--r--extra/kde301/ktoolbarbutton.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/kde301/kaccelbase.h b/extra/kde301/kaccelbase.h
index 23e9396..e485433 100644
--- a/extra/kde301/kaccelbase.h
+++ b/extra/kde301/kaccelbase.h
@@ -167,7 +167,7 @@ class KAccelBase
/**
* Read all key associations from @p config, or (if @p config
* is zero) from the application's configuration file
- * @ref KGlobal::config().
+ * @ref TDEGlobal::config().
*
* The group in which the configuration is stored can be
* set with @ref setConfigGroup().
diff --git a/extra/kde301/ktoolbarbutton.h b/extra/kde301/ktoolbarbutton.h
index 7147029..8a7c277 100644
--- a/extra/kde301/ktoolbarbutton.h
+++ b/extra/kde301/ktoolbarbutton.h
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- TDEInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = TDEGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not