summaryrefslogtreecommitdiffstats
path: root/tdeui/kxmlguibuilder.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:20:05 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/kxmlguibuilder.cpp
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kxmlguibuilder.cpp')
-rw-r--r--tdeui/kxmlguibuilder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index c31242ff1..43f716870 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -61,7 +61,7 @@ public:
TQString attrIcon;
- KInstance *m_instance;
+ TDEInstance *m_instance;
KXMLGUIClient *m_client;
};
@@ -174,7 +174,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
if ( !icon.isEmpty() )
{
- KInstance *instance = d->m_instance;
+ TDEInstance *instance = d->m_instance;
if ( !instance )
instance = KGlobal::instance();
@@ -371,7 +371,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
if ( !icon.isEmpty() )
{
- KInstance *instance = d->m_instance;
+ TDEInstance *instance = d->m_instance;
if ( !instance )
instance = KGlobal::instance();
@@ -409,12 +409,12 @@ void KXMLGUIBuilder::setBuilderClient( KXMLGUIClient *client )
setBuilderInstance( client->instance() );
}
-KInstance *KXMLGUIBuilder::builderInstance() const
+TDEInstance *KXMLGUIBuilder::builderInstance() const
{
return d->m_instance;
}
-void KXMLGUIBuilder::setBuilderInstance( KInstance *instance )
+void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance )
{
d->m_instance = instance;
}