diff options
Diffstat (limited to 'libtdepim/tdepartsdesignerplugin')
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp | 14 | ||||
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index 2801a9d3..618fccdd 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 <kdemacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) @@ -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(); @@ -104,14 +104,14 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { } /// 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(); \ +#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" diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h index 91c96d2f..bb4514c1 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h @@ -30,7 +30,7 @@ namespace KParts { class ReadOnlyPart; } * a KParts::ReadOnlyPart is available */ class KPartsGenericPart : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setURL ) TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) |