diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /libkonq/konq_xmlguiclient.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_xmlguiclient.cc')
| -rw-r--r-- | libkonq/konq_xmlguiclient.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc index 5561ced8e..69afd7b0a 100644 --- a/libkonq/konq_xmlguiclient.cc +++ b/libkonq/konq_xmlguiclient.cc @@ -77,7 +77,7 @@ void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu ) void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu ) { - static const TQString& tagAction = KGlobal::staticQString( "action" ); + static const TQString& tagAction = TDEGlobal::staticQString( "action" ); if (!kapp->authorizeKAction(name)) return; @@ -96,7 +96,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu ) void KonqXMLGUIClient::addSeparator( const TQDomElement &menu ) { - static const TQString& tagSeparator = KGlobal::staticQString( "separator" ); + static const TQString& tagSeparator = TDEGlobal::staticQString( "separator" ); TQDomElement parent = menu; if ( parent.isNull() ) { @@ -110,7 +110,7 @@ void KonqXMLGUIClient::addSeparator( const TQDomElement &menu ) //void KonqXMLGUIClient::addWeakSeparator() //{ -// static const TQString& tagWeakSeparator = KGlobal::staticQString( "weakSeparator" ); +// static const TQString& tagWeakSeparator = TDEGlobal::staticQString( "weakSeparator" ); // m_menuElement.appendChild( m_doc.createElement( tagWeakSeparator ) ); //} |