diff options
Diffstat (limited to 'tdeui/kxmlguiclient.cpp')
| -rw-r--r-- | tdeui/kxmlguiclient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index de015b5a4..b8fd549f5 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -28,8 +28,8 @@ #include <tqregexp.h> #include <tqguardedptr.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeapplication.h> @@ -292,7 +292,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, { TQCString name = e.attribute( attrName ).utf8(); // WABA if ( !actionCollection->action( name.data() ) || - (kapp && !kapp->authorizeTDEAction(name))) + (tdeApp && !tdeApp->authorizeTDEAction(name))) { // remove this child as we aren't using it base.removeChild( e ); |