diff options
Diffstat (limited to 'libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp')
| -rw-r--r-- | libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index 2801a9d3..f1e4f941 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <tdepimmacros.h> +#include <tdemacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) @@ -39,7 +39,7 @@ void KPartsGenericPart::load() return; // not enough info yet // Here it crashes in KSycoca::openDatabase when trying to load the stuff from designer itself // Not sure why - but it's not really needed anyway. - if ( !kapp ) + if ( !tdeApp ) return; TQString mimetype = m_mimetype; if ( mimetype == "auto" ) @@ -48,7 +48,7 @@ void KPartsGenericPart::load() delete m_part; } // "this" is both the parent widget and the parent object - m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( m_part ) { m_part->openURL( m_url ); m_part->widget()->show(); @@ -103,15 +103,15 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { return false; } -/// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4 -#ifndef KDE_TQ_EXPORT_PLUGIN -#define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ - TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ +/// Duplicated from tdelibs/tdecore/tdemacros.h.in for those with tdelibs < 3.4 +#ifndef TDE_EXPORT_PLUGIN +#define TDE_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) #endif -KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin ) +TDE_EXPORT_PLUGIN( KPartsWidgetPlugin ) #include "tdepartsdesignerplugin.moc" |