diff options
Diffstat (limited to 'tdeparts')
43 files changed, 168 insertions, 506 deletions
diff --git a/tdeparts/CMakeL10n.txt b/tdeparts/CMakeL10n.txt new file mode 100644 index 000000000..89f757ad2 --- /dev/null +++ b/tdeparts/CMakeL10n.txt @@ -0,0 +1,8 @@ +##### create translation templates ############## + +tde_l10n_create_template( + CATALOG "desktop_files/tdeparts-desktops/" + SOURCES *.desktop + EXCLUDES tests/ + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/tdeparts/CMakeLists.txt b/tdeparts/CMakeLists.txt index 341734461..15029bf73 100644 --- a/tdeparts/CMakeLists.txt +++ b/tdeparts/CMakeLists.txt @@ -40,9 +40,12 @@ install( FILES ##### other data ################################ -install( FILES +tde_create_translated_desktop( + SOURCE kpart.desktop krop.desktop krwp.desktop browserview.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR tdeparts-desktops +) #### tdeparts ##################################### diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS index cd65e2db9..15472ac52 100644 --- a/tdeparts/COMMENTS +++ b/tdeparts/COMMENTS @@ -576,7 +576,7 @@ issue compared to what's above though. delegation. It works like this: We have KReadOnlyPart (short KROP) and KonqyViewerExtension (short KVE). KVE is just - a child of KROP that you can query with the QObject::child method. + a child of KROP that you can query with the TQObject::child method. Views which are konquy aware feature their own implementation of KVE and konquy is happy :-) If a KROP does not feature a KVE then Konqui installs a default KVE that just ignores @@ -588,7 +588,7 @@ issue compared to what's above though. (Torben) About the fact that konqy can embed a KReadWritePart (short KRWP): This is IMHO not a konqy problem but a KRWP design bug. KRWP overloads KROP and changes the semantics (editing is possible). By default KRWP should - go into ReadOnly mode. Only if one calls rwpart->setEditable( TRUE ) it should + go into ReadOnly mode. Only if one calls rwpart->setEditable( true ) it should offer editing of the data. It may still happen that some KRWPs dont obeye the "editable" flag, but that is a bug inside of the KRWP. diff --git a/tdeparts/Mainpage.dox b/tdeparts/Mainpage.dox index 2f93a3753..049f62568 100644 --- a/tdeparts/Mainpage.dox +++ b/tdeparts/Mainpage.dox @@ -39,4 +39,3 @@ Michael Koch \<koch@kde.org\> // DOXYGEN_REFERENCES = tdecore tdeui tdeio // DOXYGEN_SET_PROJECT_NAME = KParts -// vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp index ec31eea3e..9b134819d 100644 --- a/tdeparts/browserextension.cpp +++ b/tdeparts/browserextension.cpp @@ -377,14 +377,14 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent, d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) ); } - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( this, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( this, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), - this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( this, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( this, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( slotEnableAction( const char *, bool ) ) ); + connect( this, TQ_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) ); } BrowserExtension::~BrowserExtension() @@ -496,7 +496,7 @@ void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArg req.m_delayedURL = url; req.m_delayedArgs = args; d->m_requests.append( req ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotEmitOpenURLRequestDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotEmitOpenURLRequestDelayed() ) ); } void BrowserExtension::slotEmitOpenURLRequestDelayed() @@ -576,19 +576,19 @@ void BrowserExtension::createActionSlotMap() assert(!s_actionSlotMap); s_actionSlotMap = actionSlotMapsd.setObject( s_actionSlotMap, new ActionSlotMap ); - s_actionSlotMap->insert( "cut", TQT_SLOT( cut() ) ); - s_actionSlotMap->insert( "copy", TQT_SLOT( copy() ) ); - s_actionSlotMap->insert( "paste", TQT_SLOT( paste() ) ); - s_actionSlotMap->insert( "rename", TQT_SLOT( rename() ) ); - s_actionSlotMap->insert( "trash", TQT_SLOT( trash() ) ); - s_actionSlotMap->insert( "del", TQT_SLOT( del() ) ); - s_actionSlotMap->insert( "properties", TQT_SLOT( properties() ) ); - s_actionSlotMap->insert( "editMimeType", TQT_SLOT( editMimeType() ) ); - s_actionSlotMap->insert( "print", TQT_SLOT( print() ) ); + s_actionSlotMap->insert( "cut", TQ_SLOT( cut() ) ); + s_actionSlotMap->insert( "copy", TQ_SLOT( copy() ) ); + s_actionSlotMap->insert( "paste", TQ_SLOT( paste() ) ); + s_actionSlotMap->insert( "rename", TQ_SLOT( rename() ) ); + s_actionSlotMap->insert( "trash", TQ_SLOT( trash() ) ); + s_actionSlotMap->insert( "del", TQ_SLOT( del() ) ); + s_actionSlotMap->insert( "properties", TQ_SLOT( properties() ) ); + s_actionSlotMap->insert( "editMimeType", TQ_SLOT( editMimeType() ) ); + s_actionSlotMap->insert( "print", TQ_SLOT( print() ) ); // Tricky. Those aren't actions in fact, but simply methods that a browserextension // can have or not. No need to return them here. - //s_actionSlotMap->insert( "reparseConfiguration", TQT_SLOT( reparseConfiguration() ) ); - //s_actionSlotMap->insert( "refreshMimeTypes", TQT_SLOT( refreshMimeTypes() ) ); + //s_actionSlotMap->insert( "reparseConfiguration", TQ_SLOT( reparseConfiguration() ) ); + //s_actionSlotMap->insert( "refreshMimeTypes", TQ_SLOT( refreshMimeTypes() ) ); // nothing for setSaveViewPropertiesLocally either // Create the action-number map diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h index a84c3c837..6d1c4d144 100644 --- a/tdeparts/browserextension.h +++ b/tdeparts/browserextension.h @@ -257,7 +257,7 @@ class BrowserExtensionPrivate; * to implement the virtual methods [and the standard-actions slots, see below]. * * The way to associate the BrowserExtension with the part is to simply - * create the BrowserExtension as a child of the part (in QObject's terms). + * create the BrowserExtension as a child of the part (in TQObject's terms). * The hosting application will look for it automatically. * * Another aspect of the browser integration is that a set of standard @@ -307,7 +307,7 @@ class BrowserExtensionPrivate; */ class TDEPARTS_EXPORT BrowserExtension : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled ) public: /** @@ -435,7 +435,7 @@ public: typedef TQMap<TQCString,TQCString> ActionSlotMap; /** * Returns a map containing the action names as keys and corresponding - * TQT_SLOT()'ified method names as data entries. + * TQ_SLOT()'ified method names as data entries. * * This is very useful for * the host component, when connecting the own signals with the @@ -455,7 +455,7 @@ public: * Connecting to the slot can be done like this: * * \code - * connect( yourObject, TQT_SIGNAL( yourSignal() ), + * connect( yourObject, TQ_SIGNAL( yourSignal() ), * extension, mapIterator.data() ) * \endcode * @@ -723,7 +723,7 @@ private: */ class TDEPARTS_EXPORT BrowserHostExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: BrowserHostExtension( KParts::ReadOnlyPart *parent, const char *name = 0L ); @@ -791,12 +791,12 @@ private: */ class TDEPARTS_EXPORT LiveConnectExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Type { TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeString }; - typedef TQValueList<QPair<Type, TQString> > ArgList; + typedef TQValueList<TQPair<Type, TQString> > ArgList; LiveConnectExtension( KParts::ReadOnlyPart *parent, const char *name = 0L ); diff --git a/tdeparts/browserinterface.cpp b/tdeparts/browserinterface.cpp index e02ae34cc..0b46751fc 100644 --- a/tdeparts/browserinterface.cpp +++ b/tdeparts/browserinterface.cpp @@ -4,7 +4,7 @@ #include <tqmetaobject.h> #include <config.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> using namespace KParts; @@ -33,21 +33,21 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument ) case TQVariant::Invalid: break; case TQVariant::String: - static_TQUType_TQString.set( o + 1, argument.toString() ); + static_QUType_TQString.set( o + 1, argument.toString() ); break; case TQVariant::StringList: strLst = argument.toStringList(); - static_TQUType_ptr.set( o + 1, &strLst ); + static_QUType_ptr.set( o + 1, &strLst ); break; case TQVariant::Int: - static_TQUType_int.set( o + 1, argument.toInt() ); + static_QUType_int.set( o + 1, argument.toInt() ); break; case TQVariant::UInt: i = argument.toUInt(); - static_TQUType_ptr.set( o + 1, &i ); + static_QUType_ptr.set( o + 1, &i ); break; case TQVariant::Bool: - static_TQUType_bool.set( o + 1, argument.toBool() ); + static_QUType_bool.set( o + 1, argument.toBool() ); break; default: return; } diff --git a/tdeparts/browserinterface.h b/tdeparts/browserinterface.h index 5934c2c9c..558781bf4 100644 --- a/tdeparts/browserinterface.h +++ b/tdeparts/browserinterface.h @@ -37,7 +37,7 @@ namespace KParts */ class TDEPARTS_EXPORT BrowserInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: BrowserInterface( TQObject *parent, const char *name = 0 ); virtual ~BrowserInterface(); diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index c459e818e..ab3a4c384 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -22,12 +22,12 @@ #include <tdeio/job.h> #include <tdeio/scheduler.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstringhandler.h> #include <kuserprofile.h> #include <tdetempfile.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <assert.h> using namespace KParts; @@ -146,10 +146,10 @@ void BrowserRun::scanFile() job->addMetaData( m_args.metaData() ); job->setWindow( m_window ); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *))); - connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotBrowserScanFinished(TDEIO::Job *))); + connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); m_job = job; } @@ -244,8 +244,8 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& destURL.setPath( tempFile.name() ); TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ ); job->setWindow (m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); return Delayed; // We'll continue after the job has finished } } diff --git a/tdeparts/browserrun.h b/tdeparts/browserrun.h index 0b7e1f514..95fb8a08b 100644 --- a/tdeparts/browserrun.h +++ b/tdeparts/browserrun.h @@ -41,7 +41,7 @@ namespace KParts { */ class TDEPARTS_EXPORT BrowserRun : public KRun { - Q_OBJECT + TQ_OBJECT public: /** * @param url the URL we're probing diff --git a/tdeparts/browserview.desktop b/tdeparts/browserview.desktop index 9c534c8f1..3d0d04d7f 100644 --- a/tdeparts/browserview.desktop +++ b/tdeparts/browserview.desktop @@ -3,86 +3,6 @@ Type=ServiceType X-TDE-ServiceType=Browser/View X-TDE-Derived=KParts/ReadOnlyPart Name=Browser View -Name[af]=Blaaier Besigtig -Name[ar]=عرض تصفحي -Name[az]=Səyyah Görünüşü -Name[be]=Выгляд аглядальніка -Name[bn]=ব্রাউজার দৃশ্য -Name[br]=Gwel Furchal -Name[bs]=Pogled za pretragu -Name[ca]=Vista del navegador -Name[cs]=Prohlížeč -Name[csb]=Wëzdrzatk przezérnika -Name[cy]=Golwg Porydd -Name[da]=Netsøgningsvisning -Name[de]=Browser-Ansicht -Name[el]=Προβολή εξερευνητή -Name[eo]=Rigardo de TTTilo -Name[es]=Vista de navegador -Name[et]=Brauseri vaade -Name[eu]=Arakatzailearen ikuspegia -Name[fa]=نمای مرورگر -Name[fi]=Selainnäkymä -Name[fr]=Affichage du navigateur -Name[fy]=Browserwerjefte -Name[ga]=Amharc Brabhsálaí -Name[gl]=Vista de Navegador -Name[he]=תצוגת דפדפן -Name[hi]=ब्राउज़र दर्शन -Name[hr]=Pogled pretraživača -Name[hu]=Böngészőnézet -Name[id]=View Browser -Name[is]=Vafrasýn -Name[it]=Vista browser -Name[ja]=ブラウズビュー -Name[ka]=ნუსხის ხედი -Name[kk]=Шолғыш көрнісі -Name[km]=ទិដ្ឋភាពកម្មវិធីរុករក -Name[ko]=탐색기 보기 -Name[lb]=Browser-Siicht -Name[lt]=Rodyti naršyklėje -Name[lv]=Pārlūka Skatījums -Name[mk]=Разгледување -Name[mn]=Хөтөч Харах -Name[ms]=Pelihat Pelayar -Name[mt]=Dehra Browser -Name[nb]=Nettleservisning -Name[nds]=Nettkieker-Ansicht -Name[ne]=ब्राउजर दृश्य -Name[nl]=Browserweergave -Name[nn]=Nettlesarvising -Name[nso]=Pono ya Seinyakisi -Name[oc]=Vista de navigador -Name[pa]=ਝਲਕ ਦਰਿਸ਼ -Name[pl]=Widok przeglądarki -Name[pt]=Navegação -Name[pt_BR]=Visão de navegador -Name[ro]=Vizualizare navigator -Name[ru]=Вид страницы -Name[rw]=Igaragaza Mucukumbuzi -Name[se]=Fierpmádatlogana čájeheapmi -Name[sk]=Prehliadač -Name[sl]=Pogled brskalnika -Name[sq]=Shikues për Shfletim -Name[sr]=Претраживачев приказ -Name[sr@Latn]=Pretraživačev prikaz -Name[sv]=Surfvy -Name[ta]=உலாவிக் காட்சி -Name[te]=అన్వేషి వీక్షణం -Name[tg]=Намуди Хониши Парешон -Name[th]=มุมมองแบบบราวเซอร์ -Name[tr]=Tarayıcı Görünümü -Name[tt]=Browser Küreneşe -Name[uk]=Вигляд "Навігація" -Name[uz]=Brauzerning koʻrinishi -Name[uz@cyrillic]=Браузернинг кўриниши -Name[ven]=U vhona ha Burausu -Name[vi]=Xem duyệt -Name[xh]=Imboniselo Yomkhangeli zincwadi -Name[zh_CN]=浏览器视图 -Name[zh_HK]=瀏覽器視圖 -Name[zh_TW]=瀏覽器視圖 -Name[zu]=Umbonisi Womgcingi # Arguments passed to the factory (e.g. view sub-type) [PropertyDef::X-TDE-BrowserView-Args] diff --git a/tdeparts/componentfactory.h b/tdeparts/componentfactory.h index 20b3ebee8..c0b8068f9 100644 --- a/tdeparts/componentfactory.h +++ b/tdeparts/componentfactory.h @@ -66,7 +66,7 @@ namespace KParts T::staticMetaObject()->className(), args ); - T *result = tqt_dynamic_cast<T *>( object ); + T *result = dynamic_cast<T *>( object ); if ( !result ) delete object; return result; @@ -104,7 +104,7 @@ namespace KParts T::staticMetaObject()->className(), args ); - T *result = tqt_dynamic_cast<T *>( object ); + T *result = dynamic_cast<T *>( object ); if ( !result ) delete object; return result; @@ -178,7 +178,7 @@ namespace KParts *error = ErrNoFactory; return 0; } - KParts::Factory *partFactory = tqt_dynamic_cast<KParts::Factory *>( factory ); + KParts::Factory *partFactory = dynamic_cast<KParts::Factory *>( factory ); if ( !partFactory ) { library->unload(); @@ -393,9 +393,4 @@ namespace KParts } -/* - * vim: et sw=4 - */ - #endif - diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp index 9c8d72112..405f26416 100644 --- a/tdeparts/dockmainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -25,9 +25,9 @@ #include <tdeaccel.h> #include <tdeparts/plugin.h> #include <kstatusbar.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <khelpmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <kdebug.h> @@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f ) : KDockMainWindow( parent, name, f ) { d = new DockMainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } DockMainWindow::~DockMainWindow() @@ -89,15 +89,15 @@ void DockMainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -105,10 +105,10 @@ void DockMainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); diff --git a/tdeparts/dockmainwindow.h b/tdeparts/dockmainwindow.h index 4974390de..64cd3bd35 100644 --- a/tdeparts/dockmainwindow.h +++ b/tdeparts/dockmainwindow.h @@ -46,7 +46,7 @@ class DockMainWindowPrivate; */ class TDEPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public PartBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructor, same signature as KDockMainWindow. diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp index 485bd9a36..69636ad6a 100644 --- a/tdeparts/factory.cpp +++ b/tdeparts/factory.cpp @@ -25,7 +25,7 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> using namespace KParts; @@ -63,7 +63,7 @@ const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryNam KLibFactory *factory = library->factory(); if ( !factory ) return 0; - KParts::Factory *pfactory = tqt_dynamic_cast<KParts::Factory *>( factory ); + KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory ); if ( !pfactory ) return 0; return pfactory->partInstance(); @@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { assert( !parent || parent->isWidgetType() ); - return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args ); + return createPart( static_cast<TQWidget*>( parent ), name, parent, name, classname, args ); } #include "factory.moc" diff --git a/tdeparts/factory.h b/tdeparts/factory.h index cdce3bbf4..82312ca19 100644 --- a/tdeparts/factory.h +++ b/tdeparts/factory.h @@ -39,7 +39,7 @@ class Part; */ class TDEPARTS_EXPORT Factory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: Factory( TQObject *parent = 0, const char *name = 0 ); virtual ~Factory(); @@ -119,7 +119,7 @@ protected: /** * Reimplemented from KLibFactory. Calls createPart() */ - virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList() ); /** This 'enum' along with the structure below is NOT part of the public API. * It's going to disappear in KDE 4.0 and is likely to change inbetween. @@ -134,9 +134,4 @@ protected: }; } - -/* - * vim: et sw=4 - */ - #endif diff --git a/tdeparts/genericfactory.h b/tdeparts/genericfactory.h index eb54959a4..0ecc72e4e 100644 --- a/tdeparts/genericfactory.h +++ b/tdeparts/genericfactory.h @@ -111,7 +111,7 @@ namespace KParts if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part ); + KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part ); if ( rwp ) rwp->setReadWrite( false ); } @@ -137,11 +137,11 @@ namespace KParts args ); // (this cast is guaranteed to work...) - KParts::Part *part = tqt_dynamic_cast<KParts::Part *>( object ); + KParts::Part *part = dynamic_cast<KParts::Part *>( object ); if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part ); + KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part ); if ( rwp ) rwp->setReadWrite( false ); } @@ -197,7 +197,3 @@ namespace KParts } #endif - -/** - * vim: et sw=4 - */ diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp index 9c893ae53..11eebfad4 100644 --- a/tdeparts/historyprovider.cpp +++ b/tdeparts/historyprovider.cpp @@ -40,7 +40,7 @@ public: HistoryProvider * HistoryProvider::self() { if ( !s_self ) - s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" ); + s_self = new HistoryProvider( tdeApp, "history provider" ); return s_self; } diff --git a/tdeparts/historyprovider.h b/tdeparts/historyprovider.h index 616668e99..d5f4f817d 100644 --- a/tdeparts/historyprovider.h +++ b/tdeparts/historyprovider.h @@ -40,7 +40,7 @@ namespace KParts { */ class TDEPARTS_EXPORT HistoryProvider : public TQObject { - Q_OBJECT + TQ_OBJECT public: static HistoryProvider * self(); diff --git a/tdeparts/kpart.desktop b/tdeparts/kpart.desktop index ba69bd704..7a487211f 100644 --- a/tdeparts/kpart.desktop +++ b/tdeparts/kpart.desktop @@ -2,84 +2,3 @@ Type=ServiceType X-TDE-ServiceType=KPart Comment=TDE Component -Comment[af]=Tde Komponent -Comment[ar]=عنصر كيدي -Comment[az]=TDE Komponenti -Comment[be]=Кампанент TDE -Comment[bn]=কে.ডি.ই. উপাদান -Comment[br]=Parzhioù TDE -Comment[bs]=TDE komponenta -Comment[ca]=Component del TDE -Comment[cs]=Komponenta TDE -Comment[csb]=Kòmpònent TDE -Comment[cy]=Cydran TDE -Comment[da]=TDE-komponent -Comment[de]=TDE-Komponente -Comment[el]=Στοιχείο του TDE -Comment[eo]=PDF-komponento -Comment[es]=Componente de TDE -Comment[et]=TDE komponent -Comment[eu]=TDEren osagaia -Comment[fa]=مؤلفۀ TDE -Comment[fi]=TDE-komponentti -Comment[fr]=Composant de TDE -Comment[fy]=TDE-komponint -Comment[ga]=Comhpháirt TDE -Comment[gl]=Compoñente de TDE -Comment[he]=רכיב TDE -Comment[hi]=केडीई के घटक -Comment[hr]=TDE komponenta -Comment[hu]=TDE-komponens -Comment[id]=Komponen TDE -Comment[is]=TDE eining -Comment[it]=Componente TDE -Comment[ja]=TDE コンポーネント -Comment[ka]=TDE კომპონენტი -Comment[kk]=TDE компоненті -Comment[km]=សមាសភាគ TDE -Comment[ko]=TDE 구성 요소 -Comment[lb]=TDE-Komponent -Comment[lt]=TDE komponentas -Comment[lv]=TDE Komponente -Comment[mk]=TDE компонента -Comment[mn]=TDE-бүрдэл хэсэг -Comment[ms]=Komponen TDE -Comment[mt]=Komponent tal-TDE -Comment[nb]=TDE-komponent -Comment[nds]=TDE-Komponent -Comment[ne]=TDE अवयव -Comment[nl]=TDE-component -Comment[nn]=TDE-komponent -Comment[nso]=Seripa sa TDE -Comment[oc]=Composant TDE -Comment[pa]=TDE ਭਾਗ -Comment[pl]=Składnik TDE -Comment[pt]=Componente TDE -Comment[pt_BR]=Componente TDE -Comment[ro]=Componentă TDE -Comment[ru]=Компонент TDE -Comment[rw]=Inyangingo TDE -Comment[se]=TDE oassi -Comment[sk]=TDE komponent -Comment[sl]=Komponenta TDE -Comment[sq]=Komponent i TDE-s -Comment[sr]=TDE-ова компонента -Comment[sr@Latn]=TDE-ova komponenta -Comment[ss]=Incenye ye TDE -Comment[sv]=TDE-komponent -Comment[ta]=கேடிஇ பகுதி -Comment[te]=కెడిఈ అంశం -Comment[tg]=Қисмати TDE -Comment[th]=ส่วนประกอบของ TDE -Comment[tr]=TDE Bileşeni -Comment[tt]=TDE Öleşe -Comment[uk]=Компонент TDE -Comment[uz]=TDE komponenti -Comment[uz@cyrillic]=TDE компоненти -Comment[ven]=Khomphonente ya TDE -Comment[vi]=Thành phần TDE. -Comment[xh]=Ingxenye ye TDE -Comment[zh_CN]=TDE 部件 -Comment[zh_HK]=TDE 元件 -Comment[zh_TW]=TDE 元件 -Comment[zu]=Ingxenye ye-TDE diff --git a/tdeparts/krop.desktop b/tdeparts/krop.desktop index 62de2d454..5a7997802 100644 --- a/tdeparts/krop.desktop +++ b/tdeparts/krop.desktop @@ -3,84 +3,3 @@ Type=ServiceType X-TDE-ServiceType=KParts/ReadOnlyPart X-TDE-Derived=KPart Comment=TDE Component -Comment[af]=Tde Komponent -Comment[ar]=عنصر كيدي -Comment[az]=TDE Komponenti -Comment[be]=Кампанент TDE -Comment[bn]=কে.ডি.ই. উপাদান -Comment[br]=Parzhioù TDE -Comment[bs]=TDE komponenta -Comment[ca]=Component del TDE -Comment[cs]=Komponenta TDE -Comment[csb]=Kòmpònent TDE -Comment[cy]=Cydran TDE -Comment[da]=TDE-komponent -Comment[de]=TDE-Komponente -Comment[el]=Στοιχείο του TDE -Comment[eo]=PDF-komponento -Comment[es]=Componente de TDE -Comment[et]=TDE komponent -Comment[eu]=TDEren osagaia -Comment[fa]=مؤلفۀ TDE -Comment[fi]=TDE-komponentti -Comment[fr]=Composant de TDE -Comment[fy]=TDE-komponint -Comment[ga]=Comhpháirt TDE -Comment[gl]=Compoñente de TDE -Comment[he]=רכיב TDE -Comment[hi]=केडीई के घटक -Comment[hr]=TDE komponenta -Comment[hu]=TDE-komponens -Comment[id]=Komponen TDE -Comment[is]=TDE eining -Comment[it]=Componente TDE -Comment[ja]=TDE コンポーネント -Comment[ka]=TDE კომპონენტი -Comment[kk]=TDE компоненті -Comment[km]=សមាសភាគ TDE -Comment[ko]=TDE 구성 요소 -Comment[lb]=TDE-Komponent -Comment[lt]=TDE komponentas -Comment[lv]=TDE Komponente -Comment[mk]=TDE компонента -Comment[mn]=TDE-бүрдэл хэсэг -Comment[ms]=Komponen TDE -Comment[mt]=Komponent tal-TDE -Comment[nb]=TDE-komponent -Comment[nds]=TDE-Komponent -Comment[ne]=TDE अवयव -Comment[nl]=TDE-component -Comment[nn]=TDE-komponent -Comment[nso]=Seripa sa TDE -Comment[oc]=Composant TDE -Comment[pa]=TDE ਭਾਗ -Comment[pl]=Składnik TDE -Comment[pt]=Componente TDE -Comment[pt_BR]=Componente TDE -Comment[ro]=Componentă TDE -Comment[ru]=Компонент TDE -Comment[rw]=Inyangingo TDE -Comment[se]=TDE oassi -Comment[sk]=TDE komponent -Comment[sl]=Komponenta TDE -Comment[sq]=Komponent i TDE-s -Comment[sr]=TDE-ова компонента -Comment[sr@Latn]=TDE-ova komponenta -Comment[ss]=Incenye ye TDE -Comment[sv]=TDE-komponent -Comment[ta]=கேடிஇ பகுதி -Comment[te]=కెడిఈ అంశం -Comment[tg]=Қисмати TDE -Comment[th]=ส่วนประกอบของ TDE -Comment[tr]=TDE Bileşeni -Comment[tt]=TDE Öleşe -Comment[uk]=Компонент TDE -Comment[uz]=TDE komponenti -Comment[uz@cyrillic]=TDE компоненти -Comment[ven]=Khomphonente ya TDE -Comment[vi]=Thành phần TDE. -Comment[xh]=Ingxenye ye TDE -Comment[zh_CN]=TDE 部件 -Comment[zh_HK]=TDE 元件 -Comment[zh_TW]=TDE 元件 -Comment[zu]=Ingxenye ye-TDE diff --git a/tdeparts/krwp.desktop b/tdeparts/krwp.desktop index 5c6bfee1a..03cb5c0ec 100644 --- a/tdeparts/krwp.desktop +++ b/tdeparts/krwp.desktop @@ -3,84 +3,3 @@ Type=ServiceType X-TDE-ServiceType=KParts/ReadWritePart X-TDE-Derived=KParts/ReadOnlyPart Comment=TDE Component -Comment[af]=Tde Komponent -Comment[ar]=عنصر كيدي -Comment[az]=TDE Komponenti -Comment[be]=Кампанент TDE -Comment[bn]=কে.ডি.ই. উপাদান -Comment[br]=Parzhioù TDE -Comment[bs]=TDE komponenta -Comment[ca]=Component del TDE -Comment[cs]=Komponenta TDE -Comment[csb]=Kòmpònent TDE -Comment[cy]=Cydran TDE -Comment[da]=TDE-komponent -Comment[de]=TDE-Komponente -Comment[el]=Στοιχείο του TDE -Comment[eo]=PDF-komponento -Comment[es]=Componente de TDE -Comment[et]=TDE komponent -Comment[eu]=TDEren osagaia -Comment[fa]=مؤلفۀ TDE -Comment[fi]=TDE-komponentti -Comment[fr]=Composant de TDE -Comment[fy]=TDE-komponint -Comment[ga]=Comhpháirt TDE -Comment[gl]=Compoñente de TDE -Comment[he]=רכיב TDE -Comment[hi]=केडीई के घटक -Comment[hr]=TDE komponenta -Comment[hu]=TDE-komponens -Comment[id]=Komponen TDE -Comment[is]=TDE eining -Comment[it]=Componente TDE -Comment[ja]=TDE コンポーネント -Comment[ka]=TDE კომპონენტი -Comment[kk]=TDE компоненті -Comment[km]=សមាសភាគ TDE -Comment[ko]=TDE 구성 요소 -Comment[lb]=TDE-Komponent -Comment[lt]=TDE komponentas -Comment[lv]=TDE Komponente -Comment[mk]=TDE компонента -Comment[mn]=TDE-бүрдэл хэсэг -Comment[ms]=Komponen TDE -Comment[mt]=Komponent tal-TDE -Comment[nb]=TDE-komponent -Comment[nds]=TDE-Komponent -Comment[ne]=TDE अवयव -Comment[nl]=TDE-component -Comment[nn]=TDE-komponent -Comment[nso]=Seripa sa TDE -Comment[oc]=Composant TDE -Comment[pa]=TDE ਭਾਗ -Comment[pl]=Składnik TDE -Comment[pt]=Componente TDE -Comment[pt_BR]=Componente TDE -Comment[ro]=Componentă TDE -Comment[ru]=Компонент TDE -Comment[rw]=Inyangingo TDE -Comment[se]=TDE oassi -Comment[sk]=TDE komponent -Comment[sl]=Komponenta TDE -Comment[sq]=Komponent i TDE-s -Comment[sr]=TDE-ова компонента -Comment[sr@Latn]=TDE-ova komponenta -Comment[ss]=Incenye ye TDE -Comment[sv]=TDE-komponent -Comment[ta]=கேடிஇ பகுதி -Comment[te]=కెడిఈ అంశం -Comment[tg]=Қисмати TDE -Comment[th]=ส่วนประกอบของ TDE -Comment[tr]=TDE Bileşeni -Comment[tt]=TDE Öleşe -Comment[uk]=Компонент TDE -Comment[uz]=TDE komponenti -Comment[uz@cyrillic]=TDE компоненти -Comment[ven]=Khomphonente ya TDE -Comment[vi]=Thành phần TDE. -Comment[xh]=Ingxenye ye TDE -Comment[zh_CN]=TDE 部件 -Comment[zh_HK]=TDE 元件 -Comment[zh_TW]=TDE 元件 -Comment[zu]=Ingxenye ye-TDE diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index b3245da9b..a0a011a96 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -22,10 +22,10 @@ #include <tdeparts/event.h> #include <tdeparts/part.h> #include <tdeparts/plugin.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kstatusbar.h> #include <khelpmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <kxmlguifactory.h> @@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::MainWindow( const char *name, WFlags f ) : TDEMainWindow( 0L, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( cflags, parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::~MainWindow() @@ -107,15 +107,15 @@ void MainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -123,10 +123,10 @@ void MainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h index f39c9f7c0..1721ecc81 100644 --- a/tdeparts/mainwindow.h +++ b/tdeparts/mainwindow.h @@ -46,7 +46,7 @@ class MainWindowPrivate; */ class TDEPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructor, same signature as TDEMainWindow. diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp index 954fc83d5..2ca0c058f 100644 --- a/tdeparts/part.cpp +++ b/tdeparts/part.cpp @@ -32,12 +32,12 @@ #include <tqtextstream.h> #include <tqfileinfo.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdetempfile.h> #include <tdemessagebox.h> #include <tdeio/job.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kdirnotify_stub.h> @@ -146,8 +146,8 @@ Part::~Part() if ( m_widget ) { // We need to disconnect first, to avoid calling it ! - disconnect( m_widget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( m_widget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); } if ( m_manager ) @@ -195,8 +195,8 @@ void Part::setWidget( TQWidget *widget ) { assert ( !m_widget ); // otherwise we get two connects m_widget = widget; - connect( m_widget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( m_widget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); // Tell the actionCollection() which widget its // action shortcuts should be connected to. @@ -367,7 +367,7 @@ bool ReadOnlyPart::openURL( const KURL &url ) d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo ); d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 ); emit started( d->m_job ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } } @@ -639,7 +639,7 @@ bool ReadWritePart::saveToURL() } d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ ); d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 ); - connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( d->m_uploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -690,7 +690,7 @@ bool ReadWritePart::waitSaveComplete() d->m_waitForSave = true; TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -701,5 +701,3 @@ bool ReadWritePart::waitSaveComplete() } #include "part.moc" - -// vim:sw=2:ts=8:et diff --git a/tdeparts/part.h b/tdeparts/part.h index 90c1804c5..1c91a8d5e 100644 --- a/tdeparts/part.h +++ b/tdeparts/part.h @@ -180,7 +180,7 @@ private: */ class TDEPARTS_EXPORT Part : public TQObject, public PartBase { - Q_OBJECT + TQ_OBJECT public: @@ -337,7 +337,7 @@ class ReadOnlyPartPrivate; */ class TDEPARTS_EXPORT ReadOnlyPart : public Part { - Q_OBJECT + TQ_OBJECT friend class ReadWritePart; public: /** @@ -543,7 +543,7 @@ private: */ class TDEPARTS_EXPORT ReadWritePart : public ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp index 0f6f59561..1ca3f9dab 100644 --- a/tdeparts/partmanager.cpp +++ b/tdeparts/partmanager.cpp @@ -1,4 +1,3 @@ -// -*- mode: c++; c-basic-offset: 2 -*- /* This file is part of the KDE project Copyright (C) 1999 Simon Hausmann <hausmann@kde.org> (C) 1999 David Faure <faure@kde.org> @@ -46,7 +45,7 @@ public: m_selectedWidget = 0; m_bAllowNestedParts = false; m_bIgnoreScrollBars = false; - m_activationButtonMask = Qt::LeftButton | Qt::MidButton | Qt::RightButton; + m_activationButtonMask = TQt::LeftButton | TQt::MidButton | TQt::RightButton; m_reason = PartManager::NoReason; } ~PartManagerPrivate() @@ -56,16 +55,16 @@ public: switch( ev->type() ) { case TQEvent::MouseButtonPress: case TQEvent::MouseButtonDblClick: { - TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev ); - m_reason = mev->button() == Qt::LeftButton + TQMouseEvent* mev = static_cast<TQMouseEvent*>( ev ); + m_reason = mev->button() == TQt::LeftButton ? PartManager::ReasonLeftClick - : ( mev->button() == Qt::MidButton + : ( mev->button() == TQt::MidButton ? PartManager::ReasonMidClick : PartManager::ReasonRightClick ); break; } case TQEvent::FocusIn: - m_reason = TQT_TQFOCUSEVENT( ev )->reason(); + m_reason = static_cast<TQFocusEvent*>( ev )->reason(); break; default: kdWarning(1000) << "PartManagerPrivate::setReason got unexpected ev type " << ev->type() << endl; @@ -120,8 +119,8 @@ PartManager::~PartManager() { for ( TQPtrListIterator<TQWidget> it( d->m_managedTopLevelWidgets ); it.current(); ++it ) - disconnect( it.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); + disconnect( it.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); for ( TQPtrListIterator<Part> it( d->m_parts ); it.current(); ++it ) { @@ -184,7 +183,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !obj->isWidgetType() ) return false; - TQWidget *w = TQT_TQWIDGET( obj ); + TQWidget *w = static_cast<TQWidget*>( obj ); if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) @@ -193,7 +192,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) TQMouseEvent* mev = 0L; if ( ev->type() == TQEvent::MouseButtonPress || ev->type() == TQEvent::MouseButtonDblClick ) { - mev = TQT_TQMOUSEEVENT( ev ); + mev = static_cast<TQMouseEvent*>( ev ); #ifdef DEBUG_PARTMANAGER kdDebug(1000) << "PartManager::eventFilter button: " << mev->button() << " " << "d->m_activationButtonMask=" << d->m_activationButtonMask << endl; #endif @@ -209,7 +208,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) ) return false; - if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) ) + if ( d->m_bIgnoreScrollBars && w->inherits( "TQScrollBar" ) ) return false; if ( mev ) // mouse press or mouse double-click event @@ -352,11 +351,11 @@ void PartManager::addPart( Part *part, bool setActive ) } // Prevent focus problems - if ( part->widget() && part->widget()->focusPolicy() == TQ_NoFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQWidget::NoFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of NoFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } - if ( part->widget() && part->widget()->focusPolicy() == TQ_TabFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQWidget::TabFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of TabFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } @@ -420,7 +419,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) //tree recursively (Simon) if ( part && !d->m_bAllowNestedParts ) { - TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory! + TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory! if ( parentPart && parentPart->inherits( "KParts::Part" ) ) { KParts::Part *parPart = static_cast<KParts::Part *>( parentPart ); @@ -456,8 +455,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( oldActivePart, &ev ); if ( oldActiveWidget ) { - disconnect( oldActiveWidget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( oldActiveWidget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); TQApplication::sendEvent( oldActiveWidget, &ev ); } @@ -474,8 +473,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( d->m_activePart, &ev ); if ( d->m_activeWidget ) { - connect( d->m_activeWidget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( d->m_activeWidget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); TQApplication::sendEvent( d->m_activeWidget, &ev ); } } @@ -569,8 +568,8 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel ) return; d->m_managedTopLevelWidgets.append( topLevel ); - connect( topLevel, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); + connect( topLevel, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); } void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel ) diff --git a/tdeparts/partmanager.h b/tdeparts/partmanager.h index 83165f84a..30a25e37a 100644 --- a/tdeparts/partmanager.h +++ b/tdeparts/partmanager.h @@ -1,4 +1,3 @@ -// -*- mode: c++; c-basic-offset: 2 -*- /* This file is part of the KDE project Copyright (C) 1999 Simon Hausmann <hausmann@kde.org> (C) 1999 David Faure <faure@kde.org> @@ -49,7 +48,7 @@ class PartManagerPrivate; */ class TDEPARTS_EXPORT PartManager : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( SelectionPolicy ) TQ_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy ) TQ_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts ) @@ -131,7 +130,7 @@ public: /** * Specifies which mouse buttons the partmanager should react upon. * By default it reacts on all mouse buttons (LMB/MMB/RMB). - * @param buttonMask a combination of TQt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton + * @param buttonMask a combination of TQt::ButtonState values e.g. TQt::LeftButton | TQt::MidButton */ void setActivationButtonMask( short int buttonMask ); /** diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp index 378db4a27..9d1c78940 100644 --- a/tdeparts/plugin.cpp +++ b/tdeparts/plugin.cpp @@ -30,13 +30,13 @@ #include <tqfileinfo.h> #include <klibloader.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kxmlguifactory.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> using namespace KParts; @@ -256,7 +256,7 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEI if( !desktopfile.isEmpty() ) { //kdDebug(1000) << "loadPlugins found desktop file for " << name << ": " << desktopfile << endl; - KSimpleConfig desktop( desktopfile, true ); + TDESimpleConfig desktop( desktopfile, true ); desktop.setDesktopGroup(); pluginEnabled = desktop.readBoolEntry( "X-TDE-PluginInfo-EnabledByDefault", enableNewPluginsByDefault ); @@ -309,7 +309,4 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEI } } } - -// vim:sw=4:et:sts=4 - #include "plugin.moc" diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h index 6815e9f02..cdb55b00b 100644 --- a/tdeparts/plugin.h +++ b/tdeparts/plugin.h @@ -48,7 +48,7 @@ namespace KParts */ class TDEPARTS_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: /** * Struct holding information about a plugin diff --git a/tdeparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp index 3803efa95..353ec733c 100644 --- a/tdeparts/statusbarextension.cpp +++ b/tdeparts/statusbarextension.cpp @@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const { if ( !m_statusBar ) { TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget(); - TDEMainWindow* mw = tqt_dynamic_cast<TDEMainWindow *>( w->topLevelWidget() ); + TDEMainWindow* mw = dynamic_cast<TDEMainWindow *>( w->topLevelWidget() ); if ( mw ) m_statusBar = mw->statusBar(); } @@ -174,5 +174,3 @@ void StatusBarExtension::removeStatusBarItem( TQWidget * widget ) } #include "statusbarextension.moc" - -// vim: ts=2 sw=2 et diff --git a/tdeparts/statusbarextension.h b/tdeparts/statusbarextension.h index 28b3b825b..49a165f4e 100644 --- a/tdeparts/statusbarextension.h +++ b/tdeparts/statusbarextension.h @@ -52,7 +52,7 @@ namespace KParts */ class TDEPARTS_EXPORT StatusBarExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: StatusBarExtension( KParts::ReadOnlyPart *parent, const char *name=0L ); @@ -122,5 +122,3 @@ namespace KParts } #endif // TDEPARTS_STATUSBAREXTENSION_H - -// vim: ts=2 sw=2 et diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp index fedf93ee6..319c970a8 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -8,7 +8,7 @@ #include <tqdir.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdeaction.h> @@ -21,8 +21,8 @@ Shell::Shell() m_manager = new KParts::PartManager( this ); // When the manager says the active part changes, the builder updates (recreates) the GUI - connect( m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( createGUI( KParts::Part * ) ) ); + connect( m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( createGUI( KParts::Part * ) ) ); // We can do this "switch active part" because we have a splitter with // two items in it. @@ -34,13 +34,13 @@ Shell::Shell() TDEActionCollection *coll = actionCollection(); - (void)new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); - (void)new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + (void)new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" ); + (void)new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); - m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); - m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); - TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("system-log-out"))); (void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" ); diff --git a/tdeparts/tests/example.h b/tdeparts/tests/example.h index 76541437d..9264bfa25 100644 --- a/tdeparts/tests/example.h +++ b/tdeparts/tests/example.h @@ -10,7 +10,7 @@ class TQWidget; class Shell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: Shell(); virtual ~Shell(); diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index 39af41a73..e955a5463 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -1,5 +1,5 @@ #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeaction.h> #include <tdelocale.h> @@ -21,9 +21,9 @@ Shell::Shell() setXMLFile( "ghostviewtest_shell.rc" ); TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this, - TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); + TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQ_SLOT( close() ), actionCollection(), "file_quit" ); // Try to find a postscript component first TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)"); diff --git a/tdeparts/tests/ghostview.h b/tdeparts/tests/ghostview.h index 2974ded5e..983813f27 100644 --- a/tdeparts/tests/ghostview.h +++ b/tdeparts/tests/ghostview.h @@ -5,7 +5,7 @@ class Shell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: Shell(); virtual ~Shell(); diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp index 3fe7f1a7a..0ecabbfca 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -8,7 +8,7 @@ #include <tqdir.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdeaction.h> @@ -29,21 +29,21 @@ Shell::Shell() TQPopupMenu * pFile = new TQPopupMenu( this ); menuBar()->insertItem( "File", pFile ); TQObject * coll = this; - TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); + TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" ); // No XML : we need to plug our actions ourselves paLocal->plug( pFile ); - TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); paRemote->plug( pFile ); - m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" ); m_paEditFile->plug( pFile ); - m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); m_paCloseEditor->plug( pFile ); - TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("system-log-out"))); paQuit->plug( pFile ); diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h index f60d490a6..962a71cc7 100644 --- a/tdeparts/tests/normalktm.h +++ b/tdeparts/tests/normalktm.h @@ -10,7 +10,7 @@ class TQWidget; class Shell : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: Shell(); virtual ~Shell(); diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp index ad81b91b3..84de3ac1d 100644 --- a/tdeparts/tests/notepad.cpp +++ b/tdeparts/tests/notepad.cpp @@ -14,7 +14,7 @@ #include <tdeaction.h> #include <tdelocale.h> #include <kstatusbar.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, TQObject* parent, const char* name, @@ -26,7 +26,7 @@ NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" ); setWidget( m_edit ); - (void)new TDEAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); + (void)new TDEAction( "Search and replace", 0, this, TQ_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); setXMLFile( "notepadpart.rc" ); setReadWrite( true ); } @@ -39,9 +39,9 @@ void NotepadPart::setReadWrite( bool rw ) { m_edit->setReadOnly( !rw ); if (rw) - connect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) ); + connect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) ); else - disconnect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) ); + disconnect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) ); ReadWritePart::setReadWrite( rw ); } diff --git a/tdeparts/tests/notepad.h b/tdeparts/tests/notepad.h index bd502599b..25d452fac 100644 --- a/tdeparts/tests/notepad.h +++ b/tdeparts/tests/notepad.h @@ -15,7 +15,7 @@ class TQMultiLineEdit; */ class NotepadPart : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: NotepadPart( TQWidget*, const char* widgetName, TQObject* parent, const char* name, diff --git a/tdeparts/tests/parts.h b/tdeparts/tests/parts.h index 37af4911e..b2e8d2ee9 100644 --- a/tdeparts/tests/parts.h +++ b/tdeparts/tests/parts.h @@ -11,7 +11,7 @@ class GUIActivateEvent; class Part1 : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: Part1( TQObject *parent, TQWidget * parentWidget ); virtual ~Part1(); @@ -26,7 +26,7 @@ protected: class Part2 : public KParts::Part { - Q_OBJECT + TQ_OBJECT public: Part2( TQObject *parent, TQWidget * parentWidget ); virtual ~Part2(); diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp index ae7af326f..927bc9123 100644 --- a/tdeparts/tests/plugin_spellcheck.cpp +++ b/tdeparts/tests/plugin_spellcheck.cpp @@ -11,7 +11,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, const TQStringList& ) : Plugin( parent, name ) { - (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()), + (void) new TDEAction( "&Select current line (plugin)", 0, this, TQ_SLOT(slotSpellCheck()), actionCollection(), "tools-check-spelling" ); } diff --git a/tdeparts/tests/plugin_spellcheck.h b/tdeparts/tests/plugin_spellcheck.h index d27966c0c..3c7506c5c 100644 --- a/tdeparts/tests/plugin_spellcheck.h +++ b/tdeparts/tests/plugin_spellcheck.h @@ -5,7 +5,7 @@ class PluginSpellCheck : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: PluginSpellCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); |