summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-12-21 11:50:23 +0900
committerMichele Calgaro <[email protected]>2023-12-21 12:48:57 +0900
commitd5688771d8a6837975be512ee37f61bad7dbd345 (patch)
treeb8ef261c559484b01e3a035333561e5226042b4e /tdecore
parent44e712a770ad0ab59d33790a80b5f6235cff6921 (diff)
downloadtdelibs-d5688771d8a6837975be512ee37f61bad7dbd345.tar.gz
tdelibs-d5688771d8a6837975be512ee37f61bad7dbd345.zip
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kcheckaccelerators.cpp2
-rw-r--r--tdecore/kclipboard.cpp2
-rw-r--r--tdecore/kextsock.cpp2
-rw-r--r--tdecore/kgenericfactory.h4
-rw-r--r--tdecore/kmanagerselection.cpp4
-rw-r--r--tdecore/knotifyclient.cpp2
-rw-r--r--tdecore/network/kresolver.cpp4
-rw-r--r--tdecore/tdeaccel.cpp2
-rw-r--r--tdecore/tdeaccelmanager.cpp4
-rw-r--r--tdecore/tdeapplication.cpp8
10 files changed, 17 insertions, 17 deletions
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index b71084243..fd722a964 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on)
void KCheckAccelerators::checkAccelerators( bool automatic )
{
- TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow());
+ TQWidget* actWin = tqApp->activeWindow();
if ( !actWin )
return;
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 8ab23cccc..5937a3392 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false;
TDEClipboardSynchronizer * TDEClipboardSynchronizer::self()
{
if ( !s_self )
- s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" );
+ s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" );
return s_self;
}
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index 933691855..2e10f873e 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -1228,7 +1228,7 @@ int KExtendedSocket::startAsyncConnect()
// here we have d->status >= lookupDone and <= connecting
// we can do our connection
d->status = connecting;
- TQGuardedPtr<TQObject> p = TQT_TQOBJECT(this);
+ TQGuardedPtr<TQObject> p = this;
connectionEvent();
if (!p)
return -1; // We have been deleted.
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index e229e73fd..e6722b8dd 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -190,8 +190,8 @@ protected:
const char *className, const TQStringList &args )
{
KGenericFactoryBase<Product>::initializeMessageCatalogue();
- return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType>
- ::create( 0, 0, parent, name, className, args )));
+ return (KDEPrivate::ConcreteFactory<Product, ParentType>
+ ::create( 0, 0, parent, name, className, args ));
}
};
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index 0655a4d7e..5bda6d6ed 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate
TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P )
: owner( owner_P )
{
- kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+ kapp->installX11EventFilter( this );
}
bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P )
@@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate
TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P )
: watcher( watcher_P )
{
- kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+ kapp->installX11EventFilter( this );
}
bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P )
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index b1989fbf6..a1fad6a36 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -97,7 +97,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure!
// knotify daemon needs toplevel window
- TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId ));
+ TQWidget* widget = TQWidget::find( (WId)winId );
if( widget )
winId = (int)widget->topLevelWidget()->winId();
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 4c2f34ff5..17ab2f068 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -591,7 +591,7 @@ KResolverResults
KResolver::resolve(const TQString& host, const TQString& service, int flags,
int families)
{
- KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver");
+ KResolver qres(host, service, tqApp, "synchronous KResolver");
qres.setFlags(flags);
qres.setFamily(families);
qres.start();
@@ -603,7 +603,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot,
const TQString& host, const TQString& service,
int flags, int families)
{
- KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver");
+ KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver");
TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot);
qres->setFlags(flags);
qres->setFamily(families);
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index eaa33a9c0..58499f7e4 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -111,7 +111,7 @@ TDEAccelEventHandler::TDEAccelEventHandler()
{
# ifdef Q_WS_X11
if ( kapp )
- kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+ kapp->installX11EventFilter( this );
# endif
}
diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
index 2c0e10aa3..e7cfb10eb 100644
--- a/tdecore/tdeaccelmanager.cpp
+++ b/tdecore/tdeaccelmanager.cpp
@@ -265,7 +265,7 @@ void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item
TQObjectList *childList = widget->queryList("TQWidget", 0, false, false);
for ( TQObject *it = childList->first(); it; it = childList->next() )
{
- TQWidget *w = TQT_TQWIDGET(it);
+ TQWidget *w = static_cast<TQWidget*>(it);
if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
continue;
@@ -846,7 +846,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
{
if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
- TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) );
+ TDEAcceleratorManager::manage( tqApp->activeWindow() );
watched->removeEventFilter( this );
}
return false;
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index fd1e04c32..810942e21 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -626,7 +626,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
}
if( t == TQEvent::Show && receiver->isWidgetType())
{
- TQWidget* w = TQT_TQWIDGET( receiver );
+ TQWidget* w = static_cast<TQWidget*>( receiver );
#if defined Q_WS_X11
if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader?
TDEStartupInfo::setWindowStartupId( w->winId(), startupId());
@@ -1099,7 +1099,7 @@ void TDEApplication::init(bool GUIenabled)
TQMimeSourceFactory::addFactory( oldDefaultFactory );
}
- d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) );
+ d->checkAccelerators = new KCheckAccelerators( this );
}
#ifdef Q_WS_MACX
@@ -1132,7 +1132,7 @@ void TDEApplication::init(bool GUIenabled)
// save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage,
// which makes it impossible to use the -reverse cmdline switch with KDE apps
bool rtl = reverseLayout();
- installTranslator(new KDETranslator(TQT_TQOBJECT(this)));
+ installTranslator(new KDETranslator(this));
setReverseLayout( rtl );
if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in "
"left-to-right languages (as english) or to 'RTL' in right-to-left "
@@ -2307,7 +2307,7 @@ void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigne
void TDEApplication::invokeEditSlot( const char *slot )
{
- TQObject *object = TQT_TQOBJECT(focusWidget());
+ TQObject *object = focusWidget();
if( !object )
return;