summaryrefslogtreecommitdiffstats
path: root/extra/kde313
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/kde313
parent44249e7b6a1264a1d56b6ac085fa797d831d9bb2 (diff)
downloadpytde-1244eb7c0136985569a71f525ef5bcee08a431c4.tar.gz
pytde-1244eb7c0136985569a71f525ef5bcee08a431c4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'extra/kde313')
-rw-r--r--extra/kde313/kaccelaction.h2
-rw-r--r--extra/kde313/kaccelbase.h2
-rw-r--r--extra/kde313/ktoolbarbutton.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/extra/kde313/kaccelaction.h b/extra/kde313/kaccelaction.h
index 8e42250..b339517 100644
--- a/extra/kde313/kaccelaction.h
+++ b/extra/kde313/kaccelaction.h
@@ -65,7 +65,7 @@ class KConfigBase;
* </pre>
* @short An accelerator action
* @see KAccel
- * @see KGlobalAccel
+ * @see TDEGlobalAccel
* @see KKeyChooser
* @see KKeyDialog
*/
diff --git a/extra/kde313/kaccelbase.h b/extra/kde313/kaccelbase.h
index def607f..efa075a 100644
--- a/extra/kde313/kaccelbase.h
+++ b/extra/kde313/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/kde313/ktoolbarbutton.h b/extra/kde313/ktoolbarbutton.h
index 50d08ae..d0230ab 100644
--- a/extra/kde313/ktoolbarbutton.h
+++ b/extra/kde313/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