summaryrefslogtreecommitdiffstats
path: root/kparts
diff options
context:
space:
mode:
Diffstat (limited to 'kparts')
-rw-r--r--kparts/browserextension.cpp30
-rw-r--r--kparts/browserextension.h8
-rw-r--r--kparts/browserinterface.cpp16
-rw-r--r--kparts/browserinterface.h2
-rw-r--r--kparts/browserrun.cpp10
-rw-r--r--kparts/browserrun.h2
-rw-r--r--kparts/componentfactory.h34
-rw-r--r--kparts/dockmainwindow.cpp8
-rw-r--r--kparts/dockmainwindow.h2
-rw-r--r--kparts/event.h2
-rw-r--r--kparts/factory.cpp6
-rw-r--r--kparts/factory.h8
-rw-r--r--kparts/genericfactory.h10
-rw-r--r--kparts/historyprovider.cpp6
-rw-r--r--kparts/historyprovider.h2
-rw-r--r--kparts/mainwindow.cpp8
-rw-r--r--kparts/mainwindow.h6
-rw-r--r--kparts/part.cpp18
-rw-r--r--kparts/part.h2
-rw-r--r--kparts/partmanager.cpp42
-rw-r--r--kparts/partmanager.h2
-rw-r--r--kparts/plugin.cpp10
-rw-r--r--kparts/statusbarextension.cpp8
-rw-r--r--kparts/statusbarextension.h2
-rw-r--r--kparts/tests/notepad.cpp4
-rw-r--r--kparts/tests/parts.cpp8
-rw-r--r--kparts/tests/parts.h4
27 files changed, 130 insertions, 130 deletions
diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp
index 060d9220e..81aa4fb52 100644
--- a/kparts/browserextension.cpp
+++ b/kparts/browserextension.cpp
@@ -370,11 +370,11 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent,
// they're supported or not
ActionSlotMap::ConstIterator it = s_actionSlotMap->begin();
ActionSlotMap::ConstIterator itEnd = s_actionSlotMap->end();
- TQStrList slotNames = metaObject()->slotNames();
+ TQStrList slotNames = tqmetaObject()->slotNames();
for ( int i=0 ; it != itEnd ; ++it, ++i )
{
// Does the extension have a slot with the name of this action ?
- d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) );
+ d->m_actionStatus.setBit( i, slotNames.tqcontains( it.key()+"()" ) );
}
connect( m_part, TQT_SIGNAL( completed() ),
@@ -415,13 +415,13 @@ int BrowserExtension::yOffset()
void BrowserExtension::saveState( TQDataStream &stream )
{
- stream << m_part->url() << (Q_INT32)xOffset() << (Q_INT32)yOffset();
+ stream << m_part->url() << (TQ_INT32)xOffset() << (TQ_INT32)yOffset();
}
void BrowserExtension::restoreState( TQDataStream &stream )
{
KURL u;
- Q_INT32 xOfs, yOfs;
+ TQ_INT32 xOfs, yOfs;
stream >> u >> xOfs >> yOfs;
URLArgs args( urlArgs() );
@@ -452,7 +452,7 @@ void BrowserExtension::slotCompleted()
void BrowserExtension::pasteRequest()
{
TQCString plain( "plain" );
- TQString url = TQApplication::clipboard()->text(plain, QClipboard::Selection).stripWhiteSpace();
+ TQString url = TQApplication::tqclipboard()->tqtext(plain, TQClipboard::Selection).stripWhiteSpace();
// Remove linefeeds and any whitespace surrounding it.
url.remove(TQRegExp("[\\ ]*\\n+[\\ ]*"));
@@ -552,7 +552,7 @@ void BrowserExtension::slotSetActionText( const char * name, const TQString& tex
TQString BrowserExtension::actionText( const char * name ) const
{
int actionNumber = (*s_actionNumberMap)[ name ];
- TQMap<int, TQString>::ConstIterator it = d->m_actionText.find( actionNumber );
+ TQMap<int, TQString>::ConstIterator it = d->m_actionText.tqfind( actionNumber );
if ( it != d->m_actionText.end() )
return *it;
return TQString::null;
@@ -605,13 +605,13 @@ void BrowserExtension::createActionSlotMap()
BrowserExtension *BrowserExtension::childObject( TQObject *obj )
{
- if ( !obj || !obj->children() )
+ if ( !obj || obj->childrenListObject().isEmpty() )
return 0L;
// we try to do it on our own, in hope that we are faster than
// queryList, which looks kind of big :-)
- const TQObjectList *children = obj->children();
- TQObjectListIt it( *children );
+ const TQObjectList children = obj->childrenListObject();
+ TQObjectListIt it( children );
for (; it.current(); ++it )
if ( it.current()->inherits( "KParts::BrowserExtension" ) )
return static_cast<KParts::BrowserExtension *>( it.current() );
@@ -666,13 +666,13 @@ bool BrowserHostExtension::openURLInFrame( const KURL &, const KParts::URLArgs &
BrowserHostExtension *BrowserHostExtension::childObject( TQObject *obj )
{
- if ( !obj || !obj->children() )
+ if ( !obj || obj->childrenListObject().isEmpty() )
return 0L;
// we try to do it on our own, in hope that we are faster than
// queryList, which looks kind of big :-)
- const TQObjectList *children = obj->children();
- TQObjectListIt it( *children );
+ const TQObjectList children = obj->childrenListObject();
+ TQObjectListIt it( children );
for (; it.current(); ++it )
if ( it.current()->inherits( "KParts::BrowserHostExtension" ) )
return static_cast<KParts::BrowserHostExtension *>( it.current() );
@@ -715,13 +715,13 @@ void LiveConnectExtension::unregister( const unsigned long ) {}
LiveConnectExtension *LiveConnectExtension::childObject( TQObject *obj )
{
- if ( !obj || !obj->children() )
+ if ( !obj || obj->childrenListObject().isEmpty() )
return 0L;
// we try to do it on our own, in hope that we are faster than
// queryList, which looks kind of big :-)
- const TQObjectList *children = obj->children();
- TQObjectListIt it( *children );
+ const TQObjectList children = obj->childrenListObject();
+ TQObjectListIt it( children );
for (; it.current(); ++it )
if ( it.current()->inherits( "KParts::LiveConnectExtension" ) )
return static_cast<KParts::LiveConnectExtension *>( it.current() );
diff --git a/kparts/browserextension.h b/kparts/browserextension.h
index edb376d27..364e300c4 100644
--- a/kparts/browserextension.h
+++ b/kparts/browserextension.h
@@ -305,7 +305,7 @@ class BrowserExtensionPrivate;
* otherwise, they are saved globally.
* @li @p disableScrolling: no scrollbars
*/
-class KPARTS_EXPORT BrowserExtension : public QObject
+class KPARTS_EXPORT BrowserExtension : public TQObject
{
Q_OBJECT
Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled )
@@ -446,7 +446,7 @@ public:
* Checking if the extension implements a certain slot can be done like this:
*
* \code
- * extension->metaObject()->slotNames().contains( actionName + "()" )
+ * extension->tqmetaObject()->slotNames().contains( actionName + "()" )
* \endcode
*
* (note that @p actionName is the iterator's key value if already
@@ -721,7 +721,7 @@ private:
* other parts.
* For instance a KHTMLPart hosts one part per frame.
*/
-class KPARTS_EXPORT BrowserHostExtension : public QObject
+class KPARTS_EXPORT BrowserHostExtension : public TQObject
{
Q_OBJECT
public:
@@ -789,7 +789,7 @@ private:
* A part can have an object hierarchie by using objid as a reference
* to an object.
*/
-class KPARTS_EXPORT LiveConnectExtension : public QObject
+class KPARTS_EXPORT LiveConnectExtension : public TQObject
{
Q_OBJECT
public:
diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp
index fc9909a9f..52200a20b 100644
--- a/kparts/browserinterface.cpp
+++ b/kparts/browserinterface.cpp
@@ -4,7 +4,7 @@
#include <tqmetaobject.h>
#include <config.h>
-#include <private/qucomextra_p.h>
+#include <tqucomextra_p.h>
using namespace KParts;
@@ -19,12 +19,12 @@ BrowserInterface::~BrowserInterface()
void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
{
- int slot = metaObject()->findSlot( name );
+ int slot = tqmetaObject()->tqfindSlot( name );
if ( slot == -1 )
return;
- QUObject o[ 2 ];
+ TQUObject o[ 2 ];
TQStringList strLst;
uint i;
@@ -33,21 +33,21 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
case TQVariant::Invalid:
break;
case TQVariant::String:
- static_QUType_QString.set( o + 1, argument.toString() );
+ static_TQUType_TQString.set( o + 1, argument.toString() );
break;
case TQVariant::StringList:
strLst = argument.toStringList();
- static_QUType_ptr.set( o + 1, &strLst );
+ static_TQUType_ptr.set( o + 1, &strLst );
break;
case TQVariant::Int:
- static_QUType_int.set( o + 1, argument.toInt() );
+ static_TQUType_int.set( o + 1, argument.toInt() );
break;
case TQVariant::UInt:
i = argument.toUInt();
- static_QUType_ptr.set( o + 1, &i );
+ static_TQUType_ptr.set( o + 1, &i );
break;
case TQVariant::Bool:
- static_QUType_bool.set( o + 1, argument.toBool() );
+ static_TQUType_bool.set( o + 1, argument.toBool() );
break;
default: return;
}
diff --git a/kparts/browserinterface.h b/kparts/browserinterface.h
index 8d3f0ad98..37e6cef41 100644
--- a/kparts/browserinterface.h
+++ b/kparts/browserinterface.h
@@ -35,7 +35,7 @@ namespace KParts
* </code>
*
*/
-class KPARTS_EXPORT BrowserInterface : public QObject
+class KPARTS_EXPORT BrowserInterface : public TQObject
{
Q_OBJECT
public:
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index 4d23d6300..a0d7aee80 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -128,7 +128,7 @@ void BrowserRun::scanFile()
}
// Set the PropagateHttpHeader meta-data if it has not already been set...
- if (!m_args.metaData().contains("PropagateHttpHeader"))
+ if (!m_args.metaData().tqcontains("PropagateHttpHeader"))
m_args.metaData().insert("PropagateHttpHeader", "TRUE");
}
@@ -209,7 +209,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
!m_strURL.isLocalFile() )
{
if ( isTextExecutable(mimeType) )
- mimeType = TQString::fromLatin1("text/plain"); // view, don't execute
+ mimeType = TQString::tqfromLatin1("text/plain"); // view, don't execute
kdDebug(1000) << "BrowserRun: ask for saving" << endl;
KService::Ptr offer = KServiceTypeProfile::preferredService(mimeType, "Application");
// ... -> ask whether to save
@@ -236,7 +236,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
m_sMimeType = mimeType;
TQString extension;
TQString fileName = m_suggestedFilename.isEmpty() ? m_strURL.fileName() : m_suggestedFilename;
- int extensionPos = fileName.findRev( '.' );
+ int extensionPos = fileName.tqfindRev( '.' );
if ( extensionPos != -1 )
extension = fileName.mid( extensionPos ); // keep the '.'
KTempFile tempFile( TQString::null, extension );
@@ -313,7 +313,7 @@ BrowserRun::AskSaveResult BrowserRun::askSave( const KURL & url, KService::Ptr o
int choice = KMessageBox::questionYesNoCancel(
0L, question, url.host(),
KStdGuiItem::saveAs(), openText,
- TQString::fromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
+ TQString::tqfromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
@@ -351,7 +351,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
int choice = KMessageBox::questionYesNoCancel(
0L, question, url.host(),
KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"),
- TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
+ TQString::tqfromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
}
diff --git a/kparts/browserrun.h b/kparts/browserrun.h
index 79a7386c6..0a0ec1be4 100644
--- a/kparts/browserrun.h
+++ b/kparts/browserrun.h
@@ -98,7 +98,7 @@ namespace KParts {
*/
TQString contentDisposition() const;
- bool serverSuggestsSave() const { return contentDisposition() == TQString::fromLatin1("attachment"); }
+ bool serverSuggestsSave() const { return contentDisposition() == TQString::tqfromLatin1("attachment"); }
enum AskSaveResult { Save, Open, Cancel };
/**
diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h
index 7e9de4280..3e6578781 100644
--- a/kparts/componentfactory.h
+++ b/kparts/componentfactory.h
@@ -63,7 +63,7 @@ namespace KParts
const TQStringList &args = TQStringList() )
{
TQObject *object = factory->create( parent, name,
- T::staticMetaObject()->className(),
+ T::tqstaticMetaObject()->className(),
args );
T *result = dynamic_cast<T *>( object );
@@ -82,7 +82,7 @@ namespace KParts
* \endcode
*
* @param factory The factory to ask for the creation of the component
- * @param parentWidget the parent widget for the part
+ * @param tqparentWidget the parent widget for the part
* @param widgetName the name of the part's widget
* @param parent The parent object (see TQObject constructor)
* @param name The name of the object to create (see TQObject constructor)
@@ -93,13 +93,13 @@ namespace KParts
*/
template <class T>
static T *createPartInstanceFromFactory( KParts::Factory *factory,
- TQWidget *parentWidget = 0,
+ TQWidget *tqparentWidget = 0,
const char *widgetName = 0,
TQObject *parent = 0,
const char *name = 0,
const TQStringList &args = TQStringList() )
{
- KParts::Part *object = factory->createPart( parentWidget, widgetName,
+ KParts::Part *object = factory->createPart( tqparentWidget, widgetName,
parent, name,
T::staticMetaObject()->className(),
args );
@@ -156,7 +156,7 @@ namespace KParts
template <class T>
static T *createPartInstanceFromLibrary( const char *libraryName,
- TQWidget *parentWidget = 0,
+ TQWidget *tqparentWidget = 0,
const char *widgetName = 0,
TQObject *parent = 0,
const char *name = 0,
@@ -186,7 +186,7 @@ namespace KParts
*error = ErrNoFactory;
return 0;
}
- T *res = createPartInstanceFromFactory<T>( partFactory, parentWidget,
+ T *res = createPartInstanceFromFactory<T>( partFactory, tqparentWidget,
widgetName, parent, name, args );
if ( !res )
{
@@ -218,7 +218,7 @@ namespace KParts
template <class T>
static T *createPartInstanceFromService( const KService::Ptr &service,
- TQWidget *parentWidget = 0,
+ TQWidget *tqparentWidget = 0,
const char *widgetName = 0,
TQObject *parent = 0,
const char *name = 0,
@@ -233,7 +233,7 @@ namespace KParts
return 0;
}
- return createPartInstanceFromLibrary<T>( library.local8Bit().data(), parentWidget,
+ return createPartInstanceFromLibrary<T>( library.local8Bit().data(), tqparentWidget,
widgetName, parent, name, args, error );
}
@@ -267,7 +267,7 @@ namespace KParts
template <class T, class ServiceIterator>
static T *createPartInstanceFromServices( ServiceIterator begin,
ServiceIterator end,
- TQWidget *parentWidget = 0,
+ TQWidget *tqparentWidget = 0,
const char *widgetName = 0,
TQObject *parent = 0,
const char *name = 0,
@@ -281,7 +281,7 @@ namespace KParts
if ( error )
*error = 0;
- T *component = createPartInstanceFromService<T>( service, parentWidget,
+ T *component = createPartInstanceFromService<T>( service, tqparentWidget,
widgetName, parent,
name, args, error );
if ( component )
@@ -344,18 +344,18 @@ namespace KParts
* You can use this method to create a generic viewer - that can display any
* kind of file, provided that there is a ReadOnlyPart installed for it - in 5 lines:
* \code
- * // Given the following: KURL url, TQWidget* parentWidget and TQObject* parentObject.
+ * // Given the following: KURL url, TQWidget* tqparentWidget and TQObject* parentObject.
* TQString mimetype = KMimeType::findByURL( url )->name();
- * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, parentWidget, 0, parentObject, 0 );
+ * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, tqparentWidget, 0, parentObject, 0 );
* if ( part ) {
* part->openURL( url );
- * part->widget()->show(); // also insert the widget into a layout, or simply use a TQVBox as parentWidget
+ * part->widget()->show(); // also insert the widget into a layout, or simply use a TQVBox as tqparentWidget
* }
* \endcode
*
* @param serviceType the type of service for which to find a part, e.g. a mimetype
* @param constraint an optional constraint to pass to the trader (see KTrader)
- * @param parentWidget the parent widget, will be set as the parent of the part's widget
+ * @param tqparentWidget the parent widget, will be set as the parent of the part's widget
* @param widgetName the name that will be given to the part's widget
* @param parent the parent object for the part itself
* @param name the name that will be given to the part
@@ -369,14 +369,14 @@ namespace KParts
template <class T>
static T *createPartInstanceFromQuery( const TQString &serviceType,
const TQString &constraint,
- TQWidget *parentWidget = 0,
+ TQWidget *tqparentWidget = 0,
const char *widgetName = 0,
TQObject *parent = 0,
const char *name = 0,
const TQStringList &args = TQStringList(),
int *error = 0 )
{
- KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
+ KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::tqfromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
if ( offers.isEmpty() )
{
if ( error )
@@ -385,7 +385,7 @@ namespace KParts
}
return createPartInstanceFromServices<T>( offers.begin(), offers.end(),
- parentWidget, widgetName,
+ tqparentWidget, widgetName,
parent, name, args, error );
}
diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp
index b5370e2c0..9f7703ab6 100644
--- a/kparts/dockmainwindow.cpp
+++ b/kparts/dockmainwindow.cpp
@@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f )
: KDockMainWindow( parent, name, f )
{
d = new DockMainWindowPrivate();
- PartBase::setPartObject( this );
+ PartBase::setPartObject( TQT_TQOBJECT(this) );
}
DockMainWindow::~DockMainWindow()
@@ -72,7 +72,7 @@ DockMainWindow::~DockMainWindow()
void DockMainWindow::createGUI( Part * part )
{
- kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl;
+ kdDebug(1000) << TQString(TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L")) << endl;
KXMLGUIFactory *factory = guiFactory();
@@ -82,7 +82,7 @@ void DockMainWindow::createGUI( Part * part )
if ( d->m_activePart )
{
- kdDebug(1000) << TQString("deactivating GUI for %1").arg(d->m_activePart->name()) << endl;
+ kdDebug(1000) << TQString(TQString("deactivating GUI for %1").arg(d->m_activePart->name())) << endl;
GUIActivateEvent ev( false );
TQApplication::sendEvent( d->m_activePart, &ev );
@@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part )
if ( !d->m_bShellGUIActivated )
{
- loadPlugins( this, this, KGlobal::instance() );
+ loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() );
createShellGUI();
d->m_bShellGUIActivated = true;
}
diff --git a/kparts/dockmainwindow.h b/kparts/dockmainwindow.h
index c81dda47c..32b1df1d4 100644
--- a/kparts/dockmainwindow.h
+++ b/kparts/dockmainwindow.h
@@ -51,7 +51,7 @@ class KPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public Part
/**
* Constructor, same signature as KDockMainWindow.
*/
- DockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WDestructiveClose );
+ DockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = (WFlags)WDestructiveClose );
/**
* Destructor.
*/
diff --git a/kparts/event.h b/kparts/event.h
index 2a3421617..001cc0a1b 100644
--- a/kparts/event.h
+++ b/kparts/event.h
@@ -33,7 +33,7 @@ class Part;
/**
* Base class for all KParts events.
*/
-class KPARTS_EXPORT Event : public QCustomEvent
+class KPARTS_EXPORT Event : public TQCustomEvent
{
public:
Event( const char *eventName );
diff --git a/kparts/factory.cpp b/kparts/factory.cpp
index 9be2f4f92..fc33feccf 100644
--- a/kparts/factory.cpp
+++ b/kparts/factory.cpp
@@ -39,9 +39,9 @@ Factory::~Factory()
{
}
-Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
+Part *Factory::createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
{
- Part* part = createPartObject( parentWidget, widgetName, parent, name, classname, args );
+ Part* part = createPartObject( tqparentWidget, widgetName, parent, name, classname, args );
if ( part )
emit objectCreated( part );
return part;
@@ -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( static_cast<TQWidget *>( parent ), name, parent, name, classname, args );
+ return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args );
}
#include "factory.moc"
diff --git a/kparts/factory.h b/kparts/factory.h
index c1b98eca1..2ac834ba4 100644
--- a/kparts/factory.h
+++ b/kparts/factory.h
@@ -60,7 +60,7 @@ public:
* \endcode
* This could result in a call to
* \code
- * createPart( parentWidget, name, parentObject, parentName, "KParts::Part",
+ * createPart( tqparentWidget, name, parentObject, parentName, "KParts::Part",
* TQStringList("name1="value1"", "name2="value2") );
* \endcode
*
@@ -71,7 +71,7 @@ public:
* important for reference counting, and allows unloading the
* library automatically once all its objects have been destroyed.
*/
- Part *createPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() );
+ Part *createPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() );
/**
* If you have a part contained in a shared library you might want to query
@@ -108,13 +108,13 @@ protected:
* \endcode
* This could result in a call to
* \code
- * createPart( parentWidget, name, parentObject, parentName, "Kparts::Part",
+ * createPart( tqparentWidget, name, parentObject, parentName, "Kparts::Part",
* TQStringList("name1="value1"", "name2="value2") );
* \endcode
*
* @returns the newly created part.
*/
- virtual Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0;
+ virtual Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0;
/**
* Reimplemented from KLibFactory. Calls createPart()
diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h
index 950214ee5..99ce7c3be 100644
--- a/kparts/genericfactory.h
+++ b/kparts/genericfactory.h
@@ -66,7 +66,7 @@ namespace KParts
*
* The template argument has to inherit from KParts::Part and has to implement two methods:
* 1) There needs to be a public constructor with the following signature:
- * MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
+ * MyPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
*
* 2) It needs to provide one static method to create a KAboutData object per
* request, holding information about the component's name, its authors, license, etc.
@@ -97,12 +97,12 @@ namespace KParts
public:
GenericFactory() { }
- virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
+ virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *className,
const TQStringList &args )
{
- T *part = KDEPrivate::ConcreteFactory<T>::create( parentWidget,
+ T *part = KDEPrivate::ConcreteFactory<T>::create( tqparentWidget,
widgetName,
parent,
name,
@@ -125,12 +125,12 @@ namespace KParts
public:
GenericFactory() { }
- virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
+ virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *className,
const TQStringList &args )
{
- TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( parentWidget,
+ TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( tqparentWidget,
widgetName,
parent, name,
className,
diff --git a/kparts/historyprovider.cpp b/kparts/historyprovider.cpp
index 416a109f6..d62d94b3a 100644
--- a/kparts/historyprovider.cpp
+++ b/kparts/historyprovider.cpp
@@ -40,7 +40,7 @@ public:
HistoryProvider * HistoryProvider::self()
{
if ( !s_self )
- s_self = new HistoryProvider( kapp, "history provider" );
+ s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" );
return s_self;
}
@@ -63,13 +63,13 @@ HistoryProvider::~HistoryProvider()
bool HistoryProvider::contains( const TQString& item ) const
{
- return (bool) d->dict.find( item );
+ return (bool) d->dict.tqfind( item );
}
void HistoryProvider::insert( const TQString& item )
{
// no need to allocate memory, we only want to have fast lookup, no mapping
- d->dict.replace( item, (void*) 1 );
+ d->dict.tqreplace( item, (void*) 1 );
emit inserted( item );
}
diff --git a/kparts/historyprovider.h b/kparts/historyprovider.h
index 40bf36aa7..91fefd67f 100644
--- a/kparts/historyprovider.h
+++ b/kparts/historyprovider.h
@@ -38,7 +38,7 @@ namespace KParts {
*
* @author Carsten Pfeiffer <pfeiffer@kde.org>
*/
-class KPARTS_EXPORT HistoryProvider : public QObject
+class KPARTS_EXPORT HistoryProvider : public TQObject
{
Q_OBJECT
diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp
index ee286fd15..c0c4cd086 100644
--- a/kparts/mainwindow.cpp
+++ b/kparts/mainwindow.cpp
@@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f )
: KMainWindow( parent, name, f )
{
d = new MainWindowPrivate();
- PartBase::setPartObject( this );
+ PartBase::setPartObject( TQT_TQOBJECT(this) );
}
MainWindow::MainWindow( const char *name, WFlags f )
: KMainWindow( 0L, name, f )
{
d = new MainWindowPrivate();
- PartBase::setPartObject( this );
+ PartBase::setPartObject( TQT_TQOBJECT(this) );
}
MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f )
: KMainWindow( cflags, parent, name, f )
{
d = new MainWindowPrivate();
- PartBase::setPartObject( this );
+ PartBase::setPartObject( TQT_TQOBJECT(this) );
}
MainWindow::~MainWindow()
@@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part )
if ( !d->m_bShellGUIActivated )
{
- loadPlugins( this, this, KGlobal::instance() );
+ loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() );
createShellGUI();
d->m_bShellGUIActivated = true;
}
diff --git a/kparts/mainwindow.h b/kparts/mainwindow.h
index 1dbc43975..08262c19a 100644
--- a/kparts/mainwindow.h
+++ b/kparts/mainwindow.h
@@ -51,16 +51,16 @@ class KPARTS_EXPORT MainWindow : public KMainWindow, virtual public PartBase
/**
* Constructor, same signature as KMainWindow.
*/
- MainWindow( TQWidget* parent, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
+ MainWindow( TQWidget* parent, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) );
/**
* Compatibility Constructor
*/
- MainWindow( const char *name = 0L, WFlags f = WDestructiveClose );
+ MainWindow( const char *name = 0L, WFlags f = (WFlags)WDestructiveClose );
/**
* Constructor with creation flags, see KMainWindow.
* @since 3.2
*/
- MainWindow( int cflags, TQWidget* parent, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
+ MainWindow( int cflags, TQWidget* parent, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) );
/**
* Destructor.
*/
diff --git a/kparts/part.cpp b/kparts/part.cpp
index fcd426abf..201a774a7 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -114,7 +114,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
// install 'instancename'data resource type
KGlobal::dirs()->addResourceType( inst->instanceName() + "data",
KStandardDirs::kde_default( "data" )
- + TQString::fromLatin1( inst->instanceName() ) + '/' );
+ + TQString::tqfromLatin1( inst->instanceName() ) + '/' );
if ( bLoadPlugins )
loadPlugins( m_obj, this, instance() );
}
@@ -162,10 +162,10 @@ Part::~Part()
delete d;
}
-void Part::embed( TQWidget * parentWidget )
+void Part::embed( TQWidget * tqparentWidget )
{
if ( widget() )
- widget()->reparent( parentWidget, 0, TQPoint( 0, 0 ), true );
+ widget()->reparent( tqparentWidget, 0, TQPoint( 0, 0 ), true );
}
TQWidget *Part::widget()
@@ -365,7 +365,7 @@ bool ReadOnlyPart::openURL( const KURL &url )
KURL destURL;
destURL.setPath( m_file );
d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
- d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 );
+ d->m_job->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 );
emit started( d->m_job );
connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
return true;
@@ -638,7 +638,7 @@ bool ReadWritePart::saveToURL()
return false;
}
d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
- d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 );
+ d->m_uploadJob->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 );
connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
return true;
}
@@ -674,7 +674,7 @@ void ReadWritePart::slotUploadFinished( KIO::Job * )
d->m_originalFilePath = TQString::null;
if (d->m_waitForSave)
{
- qApp->exit_loop();
+ tqApp->exit_loop();
}
}
@@ -689,10 +689,10 @@ bool ReadWritePart::waitSaveComplete()
d->m_waitForSave = true;
- TQWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQWidget::NoFocus );
+ TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
+ dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy);
- qApp->enter_loop();
+ tqApp->enter_loop();
qt_leave_modal(&dummy);
d->m_waitForSave = false;
diff --git a/kparts/part.h b/kparts/part.h
index 0c4023f6c..7913710c7 100644
--- a/kparts/part.h
+++ b/kparts/part.h
@@ -208,7 +208,7 @@ public:
* This method is not recommended since creating the widget with the correct
* parent is simpler anyway.
*/
- virtual void embed( TQWidget * parentWidget );
+ virtual void embed( TQWidget * tqparentWidget );
/**
* @return The widget defined by this part, set by setWidget().
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp
index 0ff139532..bc2afd2a1 100644
--- a/kparts/partmanager.cpp
+++ b/kparts/partmanager.cpp
@@ -56,7 +56,7 @@ public:
switch( ev->type() ) {
case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonDblClick: {
- TQMouseEvent* mev = static_cast<TQMouseEvent *>( ev );
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev );
m_reason = mev->button() == Qt::LeftButton
? PartManager::ReasonLeftClick
: ( mev->button() == Qt::MidButton
@@ -65,7 +65,7 @@ public:
break;
}
case TQEvent::FocusIn:
- m_reason = static_cast<TQFocusEvent *>( ev )->reason();
+ m_reason = TQT_TQFOCUSEVENT( ev )->reason();
break;
default:
kdWarning(1000) << "PartManagerPrivate::setReason got unexpected ev type " << ev->type() << endl;
@@ -97,7 +97,7 @@ PartManager::PartManager( TQWidget * parent, const char * name )
{
d = new PartManagerPrivate;
- qApp->installEventFilter( this );
+ tqApp->installEventFilter( this );
d->m_policy = Direct;
@@ -109,7 +109,7 @@ PartManager::PartManager( TQWidget *topLevel, TQObject *parent, const char *name
{
d = new PartManagerPrivate;
- qApp->installEventFilter( this );
+ tqApp->installEventFilter( this );
d->m_policy = Direct;
@@ -129,7 +129,7 @@ PartManager::~PartManager()
}
// core dumps ... setActivePart( 0L );
- qApp->removeEventFilter( this );
+ tqApp->removeEventFilter( this );
delete d;
}
@@ -184,7 +184,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
if ( !obj->isWidgetType() )
return false;
- TQWidget *w = static_cast<TQWidget *>( obj );
+ TQWidget *w = TQT_TQWIDGET( obj );
if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) )
@@ -193,7 +193,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
TQMouseEvent* mev = 0L;
if ( ev->type() == TQEvent::MouseButtonPress || ev->type() == TQEvent::MouseButtonDblClick )
{
- mev = static_cast<TQMouseEvent *>( ev );
+ mev = TQT_TQMOUSEEVENT( ev );
#ifdef DEBUG_PARTMANAGER
kdDebug(1000) << "PartManager::eventFilter button: " << mev->button() << " " << "d->m_activationButtonMask=" << d->m_activationButtonMask << endl;
#endif
@@ -206,7 +206,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
{
TQPoint pos;
- if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) )
+ if ( !d->m_managedTopLevelWidgets.tqcontainsRef( w->tqtopLevelWidget() ) )
return false;
if ( d->m_bIgnoreScrollBars && w->inherits( "QScrollBar" ) )
@@ -288,7 +288,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
return false;
}
- w = w->parentWidget();
+ w = w->tqparentWidget();
if ( w && ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) )
@@ -313,7 +313,7 @@ Part * PartManager::findPartFromWidget( TQWidget * widget, const TQPoint &pos )
for ( ; it.current() ; ++it )
{
Part *part = it.current()->hitTest( widget, pos );
- if ( part && d->m_parts.findRef( part ) != -1 )
+ if ( part && d->m_parts.tqfindRef( part ) != -1 )
return part;
}
return 0L;
@@ -332,7 +332,7 @@ Part * PartManager::findPartFromWidget( TQWidget * widget )
void PartManager::addPart( Part *part, bool setActive )
{
- if ( d->m_parts.findRef( part ) != -1 ) // don't add parts more than once :)
+ if ( d->m_parts.tqfindRef( part ) != -1 ) // don't add parts more than once :)
{
#ifdef DEBUG_PARTMANAGER
kdWarning(1000) << k_funcinfo << part << " already added" << kdBacktrace(5) << endl;
@@ -352,11 +352,11 @@ void PartManager::addPart( Part *part, bool setActive )
}
// Prevent focus problems
- if ( part->widget() && part->widget()->focusPolicy() == TQWidget::NoFocus )
+ if ( part->widget() && part->widget()->focusPolicy() == TQ_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() == TQWidget::TabFocus )
+ if ( part->widget() && part->widget()->focusPolicy() == TQ_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;
}
@@ -368,9 +368,9 @@ void PartManager::addPart( Part *part, bool setActive )
void PartManager::removePart( Part *part )
{
- if ( d->m_parts.findRef( part ) == -1 )
+ if ( d->m_parts.tqfindRef( part ) == -1 )
{
- kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name()) << endl;
+ kdFatal(1000) << TQString(TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name())) << endl;
return;
}
@@ -394,9 +394,9 @@ void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive )
{
//kdDebug(1000) << "replacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl;
// This methods does exactly removePart + addPart but without calling setActivePart(0) in between
- if ( d->m_parts.findRef( oldPart ) == -1 )
+ if ( d->m_parts.tqfindRef( oldPart ) == -1 )
{
- kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name()) << endl;
+ kdFatal(1000) << TQString(TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name())) << endl;
return;
}
@@ -410,7 +410,7 @@ void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive )
void PartManager::setActivePart( Part *part, TQWidget *widget )
{
- if ( part && d->m_parts.findRef( part ) == -1 )
+ if ( part && d->m_parts.tqfindRef( part ) == -1 )
{
kdWarning( 1000 ) << "PartManager::setActivePart : trying to activate a non-registered part! " << part->name() << endl;
return; // don't allow someone call setActivePart with a part we don't know about
@@ -420,7 +420,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
//tree recursively (Simon)
if ( part && !d->m_bAllowNestedParts )
{
- TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory!
+ TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory!
if ( parentPart && parentPart->inherits( "KParts::Part" ) )
{
KParts::Part *parPart = static_cast<KParts::Part *>( parentPart );
@@ -565,7 +565,7 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel )
if ( !topLevel->isTopLevel() )
return;
- if ( d->m_managedTopLevelWidgets.containsRef( topLevel ) )
+ if ( d->m_managedTopLevelWidgets.tqcontainsRef( topLevel ) )
return;
d->m_managedTopLevelWidgets.append( topLevel );
@@ -578,7 +578,7 @@ void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel )
if ( !topLevel->isTopLevel() )
return;
- if ( d->m_managedTopLevelWidgets.findRef( topLevel ) == -1 )
+ if ( d->m_managedTopLevelWidgets.tqfindRef( topLevel ) == -1 )
return;
d->m_managedTopLevelWidgets.remove();
diff --git a/kparts/partmanager.h b/kparts/partmanager.h
index a9b150a67..83bd975b2 100644
--- a/kparts/partmanager.h
+++ b/kparts/partmanager.h
@@ -47,7 +47,7 @@ class PartManagerPrivate;
* Parts know about the part manager to add nested parts to it.
* See also KParts::Part::manager() and KParts::Part::setManager().
*/
-class KPARTS_EXPORT PartManager : public QObject
+class KPARTS_EXPORT PartManager : public TQObject
{
Q_OBJECT
Q_ENUMS( SelectionPolicy )
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index c9b0d2e36..b9b60fc0b 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -68,7 +68,7 @@ TQString Plugin::xmlFile() const
if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) )
return path;
- TQString absPath = locate( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
+ TQString absPath = locate( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
assert( !absPath.isEmpty() );
return absPath;
}
@@ -80,7 +80,7 @@ TQString Plugin::localXMLFile() const
if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) )
return path;
- TQString absPath = locateLocal( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
+ TQString absPath = locateLocal( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
assert( !absPath.isEmpty() );
return absPath;
}
@@ -104,10 +104,10 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
for (; pIt != pEnd; ++pIt )
{
TQFileInfo fInfo( *pIt );
- if ( fInfo.extension() == TQString::fromLatin1( "desktop" ) )
+ if ( fInfo.extension() == TQString::tqfromLatin1( "desktop" ) )
continue;
- TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.find( fInfo.fileName() );
+ TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.tqfind( fInfo.fileName() );
if ( mapIt == sortedPlugins.end() )
mapIt = sortedPlugins.insert( fInfo.fileName(), TQStringList() );
@@ -249,7 +249,7 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KIns
else
{ // no user-setting, load plugin default setting
TQString relPath = TQString( instance->instanceName() ) + "/" + (*pIt).m_relXMLFileName;
- relPath.truncate( relPath.findRev( '.' ) ); // remove extension
+ relPath.truncate( relPath.tqfindRev( '.' ) ); // remove extension
relPath += ".desktop";
//kdDebug(1000) << "looking for " << relPath << endl;
const TQString desktopfile = instance->dirs()->findResource( "data", relPath );
diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
index 6b0ee3cb2..c3277752d 100644
--- a/kparts/statusbarextension.cpp
+++ b/kparts/statusbarextension.cpp
@@ -88,13 +88,13 @@ StatusBarExtension::~StatusBarExtension()
StatusBarExtension *StatusBarExtension::childObject( TQObject *obj )
{
- if ( !obj || !obj->children() )
+ if ( !obj || obj->childrenListObject().isEmpty() )
return 0L;
// we try to do it on our own, in hope that we are faster than
// queryList, which looks kind of big :-)
- const TQObjectList *children = obj->children();
- TQObjectListIt it( *children );
+ const TQObjectList children = obj->childrenListObject();
+ TQObjectListIt it( children );
for (; it.current(); ++it )
if ( it.current()->inherits( "KParts::StatusBarExtension" ) )
return static_cast<KParts::StatusBarExtension *>( it.current() );
@@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const
{
if ( !m_statusBar ) {
TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget();
- KMainWindow* mw = dynamic_cast<KMainWindow *>( w->topLevelWidget() );
+ KMainWindow* mw = dynamic_cast<KMainWindow *>( w->tqtopLevelWidget() );
if ( mw )
m_statusBar = mw->statusBar();
}
diff --git a/kparts/statusbarextension.h b/kparts/statusbarextension.h
index 79d449a98..81bf6854b 100644
--- a/kparts/statusbarextension.h
+++ b/kparts/statusbarextension.h
@@ -50,7 +50,7 @@ namespace KParts
*
* @since 3.2
*/
- class KPARTS_EXPORT StatusBarExtension : public QObject
+ class KPARTS_EXPORT StatusBarExtension : public TQObject
{
Q_OBJECT
diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp
index e0857a51e..4472bfe55 100644
--- a/kparts/tests/notepad.cpp
+++ b/kparts/tests/notepad.cpp
@@ -16,14 +16,14 @@
#include <kstatusbar.h>
#include <kstandarddirs.h>
-NotepadPart::NotepadPart( TQWidget* parentWidget, const char*,
+NotepadPart::NotepadPart( TQWidget* tqparentWidget, const char*,
TQObject* parent, const char* name,
const TQStringList& )
: KParts::ReadWritePart( parent, name )
{
setInstance( NotepadFactory::instance() );
- m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" );
+ m_edit = new TQMultiLineEdit( tqparentWidget, "NotepadPart's multiline edit" );
setWidget( m_edit );
(void)new KAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" );
diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp
index d932a168f..f11f0194f 100644
--- a/kparts/tests/parts.cpp
+++ b/kparts/tests/parts.cpp
@@ -18,12 +18,12 @@
#include <kaction.h>
#include <klocale.h>
-Part1::Part1( TQObject *parent, TQWidget * parentWidget )
+Part1::Part1( TQObject *parent, TQWidget * tqparentWidget )
: KParts::ReadOnlyPart( parent, "Part1" )
{
m_instance = new KInstance( "kpartstestpart" );
setInstance( m_instance );
- m_edit = new TQMultiLineEdit( parentWidget );
+ m_edit = new TQMultiLineEdit( tqparentWidget );
setWidget( m_edit );
setXMLFile( "kpartstest_part1.rc" );
@@ -56,12 +56,12 @@ bool Part1::openFile()
return true;
}
-Part2::Part2( TQObject *parent, TQWidget * parentWidget )
+Part2::Part2( TQObject *parent, TQWidget * tqparentWidget )
: KParts::Part( parent, "Part2" )
{
m_instance = new KInstance( "part2" );
setInstance( m_instance );
- TQWidget * w = new TQWidget( parentWidget, "Part2Widget" );
+ TQWidget * w = new TQWidget( tqparentWidget, "Part2Widget" );
setWidget( w );
TQCheckBox * cb = new TQCheckBox( "something", w );
diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h
index 6f373a85c..873a6fea4 100644
--- a/kparts/tests/parts.h
+++ b/kparts/tests/parts.h
@@ -13,7 +13,7 @@ class Part1 : public KParts::ReadOnlyPart
{
Q_OBJECT
public:
- Part1( TQObject *parent, TQWidget * parentWidget );
+ Part1( TQObject *parent, TQWidget * tqparentWidget );
virtual ~Part1();
protected:
@@ -28,7 +28,7 @@ class Part2 : public KParts::Part
{
Q_OBJECT
public:
- Part2( TQObject *parent, TQWidget * parentWidget );
+ Part2( TQObject *parent, TQWidget * tqparentWidget );
virtual ~Part2();
protected: