diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/kxmlguifactory.cpp | |
parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kxmlguifactory.cpp')
-rw-r--r-- | tdeui/kxmlguifactory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 7aa427937..3c3f24668 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -96,14 +96,14 @@ public: BuildStateStack m_stateStack; }; -TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const KInstance *instance ) +TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInstance *instance ) { return readConfigFile( filename, false, instance ); } -TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const KInstance *_instance ) +TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance ) { - const KInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); TQString xml_file; if (!TQDir::isRelativePath(filename)) @@ -140,9 +140,9 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu } bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, - const TQString& filename, const KInstance *_instance ) + const TQString& filename, const TDEInstance *_instance ) { - const KInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) |