diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index eea44645e..3574756e4 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
{
if ( pluginPages.tqat(i)->plugin == plugin )
{
- TQWidget *w = pluginPages.tqat(i)->page->tqparentWidget();
+ TQWidget *w = pluginPages.tqat(i)->page->parentWidget();
delete pluginPages.tqat(i)->page;
delete w;
pluginPages.remove(pluginPages.tqat(i));
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index 3dcde4490..13d883eab 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -57,7 +57,7 @@ void KateConsole::loadConsoleIfNeeded()
{
if (m_part) return;
- if (!tqtopLevelWidget() || !tqparentWidget()) return;
+ if (!tqtopLevelWidget() || !parentWidget()) return;
if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
@@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
m_part = 0;
// hide the dockwidget
- if (tqparentWidget())
+ if (parentWidget())
{
m_mw->hideToolView (m_toolView);
m_mw->centralWidget()->setFocus ();
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 7d8cfd951..943dff495 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -476,7 +476,7 @@ void GrepTool::childExited()
if ( ! errbuf.isEmpty() )
{
- KMessageBox::information( tqparentWidget(), i18n("Error:") + errbuf, i18n("Grep Tool Error") );
+ KMessageBox::information( parentWidget(), i18n("Error:
") + errbuf, i18n("Grep Tool Error") );
errbuf.truncate(0);
}
else
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 9b3c7602d..369eb0b78 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
// here we go, set some usable default sizes
if (!initialGeometrySet())
{
- int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+ int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
TQSize size;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index d214def27..c2b490fd9 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -660,8 +660,8 @@ void Sidebar::saveSession (KConfig *config)
//BEGIN MAIN WINDOW
-MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
- : KParts::MainWindow( tqparentWidget, name)
+MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
+ : KParts::MainWindow( parentWidget, name)
, m_sidebarsVisible(true)
, m_restoreConfig (0)
, m_guiClient (new GUIClient (this))
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 97a8887e6..3588f4ecc 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -264,7 +264,7 @@ class MainWindow : public KParts::MainWindow
/**
* Constructor
*/
- MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
+ MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
/**
* Destructor
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index bdb4e22e4..c2caba114 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -69,7 +69,7 @@ protected:
TQPainter p( this );
p.setPen( tqcolorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
- p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
+ p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
}
};
@@ -228,7 +228,7 @@ bool KateViewSpace::event( TQEvent *e )
void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
{
- if ((TQWidgetStack *)view->tqparentWidget() != stack)
+ if ((TQWidgetStack *)view->parentWidget() != stack)
return;
mStatusBar->setStatus( r, c, ovr, block, mod, msg );
}
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index d92c5b6ab..afd92fc55 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace)
{
if (!view) return true;
- KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget();
+ KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
viewspace->removeView (view);
@@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
{
if (!v) return;
- KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget();
+ KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
if (!vs->isActiveSpace()) {
setActiveSpace (vs);
@@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
if (!activeView()) return;
if (!vs) vs = activeViewSpace();
- bool isFirstTime = vs->tqparentWidget() == this;
+ bool isFirstTime = vs->parentWidget() == this;
TQValueList psizes;
if ( ! isFirstTime )
- if ( TQSplitter *ps = static_cast(vs->tqparentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+ if ( TQSplitter *ps = static_cast(vs->parentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
psizes = ps->sizes();
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
- KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget());
+ KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
s->setOpaqueResize( KGlobalSettings::opaqueResize() );
if (! isFirstTime) {
// anders: make sure the split' viewspace is always
// correctly positioned.
// If viewSpace is the first child, the new splitter must be moveToFirst'd
- if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) )
- ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
+ if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
+ ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
}
vs->reparent( s, 0, TQPoint(), true );
KateViewSpace* vsNew = new KateViewSpace( this, s );
@@ -471,13 +471,13 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
s->moveToFirst( vsNew );
if (!isFirstTime)
- if (TQSplitter *ps = static_cast(s->tqparentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+ if (TQSplitter *ps = static_cast(s->parentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
ps->setSizes( psizes );
s->show();
TQValueList sizes;
- int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
+ int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
sizes << space << space;
s->setSizes( sizes );
@@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// abort if this is the last viewspace
if (m_viewSpaceList.count() < 2) return;
- KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget();
+ KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();
// find out if it is the first child for repositioning
// see below
@@ -512,9 +512,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// save some size information
KateMDI::Splitter* pp=0L;
TQValueList ppsizes;
- if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this)
+ if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
{
- pp = (KateMDI::Splitter*)p->tqparentWidget();
+ pp = (KateMDI::Splitter*)p->parentWidget();
ppsizes = pp->sizes();
pIsFirst = !pp->isLastChild( p ); // simple logic, right-
}
@@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
{
TQWidget* other = ((TQWidget *)(( TQPtrList)p->childrenListObject()).first());
- other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
+ other->reparent( p->parentWidget(), 0, TQPoint(), true );
// We also need to find the right viewspace to become active
if (pIsFirst)
- ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
+ ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
if ( other->isA("KateViewSpace") ) {
setActiveSpace( (KateViewSpace*)other );
}
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 09d3ecf69..9b7e6e720 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -337,8 +337,8 @@ void WidgetCanvas::drawSampleWidgets()
// Initialize the pixmap which we draw sample widgets into.
smplw.resize(width(), height());
- //smplw.fill( tqparentWidget()->back() );
- smplw.fill( tqparentWidget()->tqcolorGroup().mid() );
+ //smplw.fill( parentWidget()->back() );
+ smplw.fill( parentWidget()->tqcolorGroup().mid() );
// Actually start painting in
@@ -585,7 +585,7 @@ void WidgetCanvas::drawSampleWidgets()
// Valance
qDrawWinPanel ( &paint, 0, 0, width(), height(),
- tqparentWidget()->tqcolorGroup(), TRUE, 0);
+ parentWidget()->tqcolorGroup(), TRUE, 0);
// Stop the painting
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index 8ac48a660..eb57f50ac 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -27,11 +27,11 @@
FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- TQWidget * tqparentWidget = this;
- TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget,
+ TQWidget * parentWidget = this;
+ TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget,
0, KDialog::spacingHint());
- m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget );
+ m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget );
m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed );
// The order of those two items is very important. If you change it, fix typeslistitem.cpp !
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 97b36719a..11317c2d2 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -142,12 +142,12 @@ void ConfigModule::runAsRoot()
// create an embed widget that will embed the
// kcmshell running as root
- _embedLayout = new TQVBoxLayout(_module->tqparentWidget());
- _embedFrame = new TQVBox( _module->tqparentWidget() );
+ _embedLayout = new TQVBoxLayout(_module->parentWidget());
+ _embedFrame = new TQVBox( _module->parentWidget() );
_embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
TQPalette pal( red );
pal.setColor( TQColorGroup::Background,
- _module->tqparentWidget()->tqcolorGroup().background() );
+ _module->parentWidget()->tqcolorGroup().background() );
_embedFrame->setPalette( pal );
_embedFrame->setLineWidth( 2 );
_embedFrame->setMidLineWidth( 2 );
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 103a2f33b..5f8b116dc 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
if(!url->isLocalFile()) {
pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
"kdm/pics/" + url->fileName());
- KIO::NetAccess::copy(*url, pixurl, tqparentWidget());
+ KIO::NetAccess::copy(*url, pixurl, parentWidget());
istmp = true;
} else {
pixurl = *url;
@@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
// By now url should be "file:/..."
if (!setLogo(pixurl.path())) {
- KIO::NetAccess::del(pixurl, tqparentWidget());
+ KIO::NetAccess::del(pixurl, parentWidget());
TQString msg = i18n("There was an error loading the image:\n"
"%1\n"
"It will not be saved.")
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index 75139c284..da6025026 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
KURL *url = decodeImgDrop(e, this);
if (url) {
TQString pixpath;
- KIO::NetAccess::download(*url, pixpath, tqparentWidget());
+ KIO::NetAccess::download(*url, pixpath, parentWidget());
changeUserPix( pixpath );
KIO::NetAccess::removeTempFile(pixpath);
delete url;
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index deaf5587e..6e19c4f7d 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -165,17 +165,17 @@ void CFontViewPart::timeout()
if(Misc::root())
{
destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
- itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+ itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
- if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()))
+ if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
- itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+ itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
}
@@ -220,7 +220,7 @@ void CFontViewPart::install()
{
KURL destUrl(getDest(m_url, KMessageBox::No==resp));
- if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget()))
+ if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
{
//
// OK file copied, now look for any AFM or PFM file...
@@ -236,7 +236,7 @@ void CFontViewPart::install()
for(it=urls.begin(); it!=end; ++it)
{
destUrl=getDest(*it, KMessageBox::No==resp);
- KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget());
+ KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
}
}
@@ -274,7 +274,7 @@ void CFontViewPart::print()
items.append(itsPreview->engine().getName(m_url));
- Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine());
+ Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine());
}
}
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index cd72859db..eb8ddbd7f 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget )
// yuck, here goes.
QVBox *newWidget = new QVBox( this );
- if ( widget->tqparentWidget() != mainWidget ) {
+ if ( widget->parentWidget() != mainWidget ) {
widget->reparent( newWidget, 0, QPoint(0,0) );
} else {
newWidget->insertChild( widget );
diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp
index 66ba882d0..ed0c8b2cf 100644
--- a/kcontrol/screensaver/kswidget.cpp
+++ b/kcontrol/screensaver/kswidget.cpp
@@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f )
}
}
}
- Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
+ Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs );
create( w );
#endif
diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp
index 93876d24d..f4c5dbddb 100644
--- a/kdeprint/kdeprint_part/printpart.cpp
+++ b/kdeprint/kdeprint_part/printpart.cpp
@@ -33,7 +33,7 @@
typedef KParts::GenericFactory PrintPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory )
-PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ ,
+PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ ,
TQObject *parent, const char *name,
const TQStringList & /*args*/ )
: KParts::ReadOnlyPart(parent, name)
@@ -42,7 +42,7 @@ PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ ,
instance()->iconLoader()->addAppDir("kdeprint");
m_extension = new PrintPartExtension(this);
- m_view = new KMMainView(tqparentWidget, "MainView", actionCollection());
+ m_view = new KMMainView(parentWidget, "MainView", actionCollection());
m_view->setFocusPolicy(TQ_ClickFocus);
m_view->enableToolbar(false);
setWidget(m_view);
diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h
index f89a3574b..c84fed1cc 100644
--- a/kdeprint/kdeprint_part/printpart.h
+++ b/kdeprint/kdeprint_part/printpart.h
@@ -31,7 +31,7 @@ class PrintPart : public KParts::ReadOnlyPart
{
Q_OBJECT
public:
- PrintPart(TQWidget *tqparentWidget, const char *widgetName,
+ PrintPart(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const TQStringList & );
virtual ~PrintPart();
diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp
index e67a6b1e9..7410a0191 100644
--- a/kdeprint/kdeprintfax/confsystem.cpp
+++ b/kdeprint/kdeprintfax/confsystem.cpp
@@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID)
m_commands[m_current] = m_command->text();
m_current = ID;
if (ID == EFAX_ID)
- m_device->tqparentWidget()->show();
+ m_device->parentWidget()->show();
else
- m_device->tqparentWidget()->hide();
+ m_device->parentWidget()->hide();
if (ID == HYLAFAX_ID)
- m_server->tqparentWidget()->show();
+ m_server->parentWidget()->show();
else
- m_server->tqparentWidget()->hide();
+ m_server->parentWidget()->hide();
m_command->setText(m_commands[m_current]);
}
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index d721fac0b..51db82870 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *)
}
else
{
- KWin::activateWindow(m_logview->tqparentWidget()->winId());
+ KWin::activateWindow(m_logview->parentWidget()->winId());
}
}
@@ -605,7 +605,7 @@ void FaxCtrl::slotCloseLog()
TQTextEdit *view = m_logview;
m_logview = 0;
if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
- delete view->tqparentWidget();
+ delete view->parentWidget();
kdDebug() << "slotClose()" << endl;
}
}
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index cb7ebbdab..306a4d736 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -558,7 +558,7 @@ int Minicli::runCommand()
case KURIFilterData::HELP:
{
// No need for kfmclient, KRun does it all (David)
- (void) new KRun( m_filterData->uri(), tqparentWidget(), asn );
+ (void) new KRun( m_filterData->uri(), parentWidget(), asn );
return 0;
}
case KURIFilterData::EXECUTABLE:
@@ -570,7 +570,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
- KRun::run(*service, KURL::List(), tqparentWidget(), asn );
+ KRun::run(*service, KURL::List(), parentWidget(), asn );
return 0;
}
}
@@ -605,7 +605,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
- KRun::run(*service, KURL::List(), tqparentWidget(), asn );
+ KRun::run(*service, KURL::List(), parentWidget(), asn );
return 0;
}
@@ -613,7 +613,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
- KRun::run(*service, KURL::List(), tqparentWidget(), asn );
+ KRun::run(*service, KURL::List(), parentWidget(), asn );
return 0;
}
@@ -625,7 +625,7 @@ int Minicli::runCommand()
}
}
- if ( KRun::runCommand( cmd, exec, m_iconName, tqparentWidget(), asn ) )
+ if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) )
return 0;
else
{
diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp
index a9475a7d2..5ae1c4ec1 100644
--- a/kdm/kfrontend/kfdialog.cpp
+++ b/kdm/kfrontend/kfdialog.cpp
@@ -74,7 +74,7 @@ FDialog::adjustGeometry()
adjustSize();
}
- if (tqparentWidget())
+ if (parentWidget())
return;
TQRect grt( rect() );
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 1b2d7af1d..95768833e 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -614,7 +614,7 @@ KdmItem::setFixedLayout( const TQDomNode &node )
}
TQWidget *
-KdmItem::tqparentWidget() const
+KdmItem::parentWidget() const
{
if (myWidget)
return myWidget;
@@ -623,7 +623,7 @@ KdmItem::tqparentWidget() const
if (tqparent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING))
return (TQWidget*)parent();
- return ((KdmItem*)parent())->tqparentWidget();
+ return ((KdmItem*)parent())->parentWidget();
}
#include "kdmitem.moc"
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 1c6450b50..1a87692ac 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -163,7 +163,7 @@ public:
bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; }
TQRect rect() const { return area; }
- TQWidget *tqparentWidget() const;
+ TQWidget *parentWidget() const;
TQString getId() const { return id; }
signals:
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index b36b7e5ad..64c2c4a1c 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -115,7 +115,7 @@ KdmLabel::setTextInt( const TQString &txt)
myAccel = 0;
if (cAccel != -1) {
cText.remove('&');
- myAccel = new TQAccel(tqparentWidget());
+ myAccel = new TQAccel(parentWidget());
myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode());
connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
}
diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h
index 0c4cd3753..e5228973e 100644
--- a/kdm/kfrontend/themer/kdmthemer.h
+++ b/kdm/kfrontend/themer/kdmthemer.h
@@ -62,7 +62,7 @@ public:
/*
* Gives a tqsizeHint to the widget (parent size)
*/
- //TQSize tqsizeHint() const{ return tqparentWidget()->size(); }
+ //TQSize tqsizeHint() const{ return parentWidget()->size(); }
/*
* Takes a shot of the current widget
diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp
index 38556cc7a..5a9c2cbe8 100644
--- a/kdmlib/kgreet_pam.cpp
+++ b/kdmlib/kgreet_pam.cpp
@@ -94,7 +94,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
kg_debug("KPamGreeter constructed\n");
- m_tqparentWidget = parent;
+ m_parentWidget = parent;
KdmItem *user_entry = 0, *pw_entry = 0;
int line = 0;
@@ -314,7 +314,7 @@ KPamGreeter::textMessage( const char *text, bool err )
return false;
if (getLayoutItem()) {
- TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_tqparentWidget);
+ TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_parentWidget);
getLayoutItem()->addWidget(label, state+1, 0, 0);
}
@@ -341,7 +341,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
}
else if (state >= authEdit.size()) {
if (getLayoutItem()) {
- TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_tqparentWidget);
+ TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_parentWidget);
getLayoutItem()->addWidget(label, state+1, 0, 0);
kg_debug("added label widget to layout");
}
@@ -361,9 +361,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
KDMPasswordEdit* passwdEdit;
if (echoMode == -1)
- passwdEdit = new KDMPasswordEdit( m_tqparentWidget );
+ passwdEdit = new KDMPasswordEdit( m_parentWidget );
else
- passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget);
+ passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget);
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) );
connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h
index ebfef6f9e..8691b3350 100644
--- a/kdmlib/kgreet_pam.h
+++ b/kdmlib/kgreet_pam.h
@@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
TQLabel *loginLabel;
TQValueList authLabel;
KLineEdit *loginEdit;
- TQWidget* m_tqparentWidget;
+ TQWidget* m_parentWidget;
TQValueList authEdit;
KSimpleConfig *stsFile;
KdmThemer *m_themer;
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 252aca295..0cce510f2 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -33,7 +33,7 @@ class KonqDirPart;
typedef KParts::GenericFactory KFindFactory;
K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory )
-KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName,
+KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName,
TQObject *parent, const char *name ,
const TQStringList & /*args*/ )
: KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/
@@ -43,7 +43,7 @@ KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName,
setBrowserExtension( new KonqDirPartBrowserExtension( this ) );
kdDebug() << "KFindPart::KFindPart " << this << endl;
- m_kfindWidget = new Kfind( tqparentWidget, widgetName );
+ m_kfindWidget = new Kfind( parentWidget, widgetName );
m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height());
const KFileItem *item = ((KonqDirPart*)parent)->currentItem();
kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl;
diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index f9a0d6cde..47d75a53c 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -44,7 +44,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
Q_OBJECT
Q_PROPERTY( bool showsResult READ showsResult )
public:
- KFindPart( TQWidget * tqparentWidget, const char *widgetName,
+ KFindPart( TQWidget * parentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList & /*args*/ );
virtual ~KFindPart();
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index efcdc98cc..27fe22b87 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -215,7 +215,7 @@ void KfindWindow::saveResults()
TQFile file(filename);
if ( !file.open(IO_WriteOnly) )
- KMessageBox::error(tqparentWidget(),
+ KMessageBox::error(parentWidget(),
i18n("Unable to save results."));
else {
TQTextStream stream( &file );
@@ -255,7 +255,7 @@ void KfindWindow::saveResults()
}
file.close();
- KMessageBox::information(tqparentWidget(),
+ KMessageBox::information(parentWidget(),
i18n("Results were saved to file\n")+
filename);
}
@@ -287,7 +287,7 @@ void KfindWindow::deleteFiles()
{
TQString tmp = i18n("Do you really want to delete the selected file?",
"Do you really want to delete the %n selected files?",selectedItems().count());
- if (KMessageBox::warningContinueCancel(tqparentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
+ if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
return;
// Iterate on all selected elements
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 8d198f9be..68470964d 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -20,9 +20,9 @@
using namespace KHC;
-View::View( TQWidget *tqparentWidget, const char *widgetName,
+View::View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
- : KHTMLPart( tqparentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
+ : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
{
setJScriptEnabled(false);
setJavaEnabled(false);
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 1c5a2bf66..3af2a15b8 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -20,7 +20,7 @@ class View : public KHTMLPart
{
Q_OBJECT
public:
- View( TQWidget *tqparentWidget, const char *widgetName,
+ View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
KActionCollection *col );
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 2e0bb4311..f0c05d83c 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -487,12 +487,12 @@ void MenuEmbed::setMinimumSize( int w, int h )
void MenuEmbed::setBackground()
{
- const TQPixmap *pbg = tqparentWidget()->backgroundPixmap();
+ const TQPixmap *pbg = parentWidget()->backgroundPixmap();
if (pbg)
{
TQPixmap bg(width(), height());
- bg.fill(tqparentWidget(), pos());
+ bg.fill(parentWidget(), pos());
setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin);
}
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index 23bdf62c9..beb70552d 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet
signals:
- void tqlayoutChanged();
+ void layoutChanged();
protected slots:
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 299206032..c347108cc 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -1067,12 +1067,12 @@ void TrayEmbed::getIconSize(int defaultIconSize)
void TrayEmbed::setBackground()
{
- const TQPixmap *pbg = tqparentWidget()->backgroundPixmap();
+ const TQPixmap *pbg = parentWidget()->backgroundPixmap();
if (pbg)
{
TQPixmap bg(width(), height());
- bg.fill(tqparentWidget(), pos());
+ bg.fill(parentWidget(), pos());
setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin);
}
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 85c65deec..482a14db1 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev)
TQPainter p( &offscreen );
paintBackground( &p, TQRect(TQPoint(0,0),size()) );
TQWidget::resizeEvent(ev);
- emit tqlayoutChanged();
+ emit layoutChanged();
}
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index d56a592a5..507712cce 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -251,7 +251,7 @@ signals:
void directionChanged();
/** Emitted when kasbar wants to resize. This happens when a new window is added. */
- void tqlayoutChanged();
+ void layoutChanged();
/** Emitted when the item size is changed. */
void itemSizeChanged( int );
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index dcb1a1ef1..c63d6e277 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );
- connect( kasbar, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
+ connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );
kasbar->setConfig( config() );
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 5f282db97..fe5f02ef6 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent )
setGroupItem( true );
setText( i18n("Group") );
- connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) );
- connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) );
+ connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) );
+ connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );
connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
}
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index ad17182b0..a6cfc11ab 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -354,7 +354,7 @@ void AppletContainer::slotDelayedDestruct()
delete this;
}
-void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a)
+void AppletContainer::alignmentChange(KPanelExtension::Alignment a)
{
if (!_applet)
{
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index fea4d92a1..019e52c96 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -84,7 +84,7 @@ public slots:
protected:
virtual void doLoadConfiguration( KConfigGroup& );
virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
- virtual void tqalignmentChange(KPanelExtension::Alignment a);
+ virtual void alignmentChange(KPanelExtension::Alignment a);
virtual TQPopupMenu* createOpMenu();
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index 2747905cd..2607e3608 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -118,7 +118,7 @@ void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a)
}
_tqalignment = a;
- tqalignmentChange(a);
+ alignmentChange(a);
}
TQPopupMenu* BaseContainer::opMenu()
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index 078926a07..f9c449b1f 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -111,7 +111,7 @@ protected:
virtual void doLoadConfiguration( KConfigGroup& ) {}
virtual void doSaveConfiguration( KConfigGroup&,
bool /* layoutOnly */ ) const {}
- virtual void tqalignmentChange(KPanelExtension::Alignment) {}
+ virtual void alignmentChange(KPanelExtension::Alignment) {}
virtual TQPopupMenu* createOpMenu() = 0;
TQPopupMenu *appletOpMenu() const { return _appletOpMnu; }
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 0c22245bc..c659c1002 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -293,7 +293,7 @@ void ExtensionContainer::readConfig()
}
positionChange(position());
- tqalignmentChange(tqalignment());
+ alignmentChange(tqalignment());
setSize(static_cast(m_settings.size()),
m_settings.customSize());
@@ -471,7 +471,7 @@ void ExtensionContainer::moveMe()
KPanelExtension::Right,
KPanelExtension::Top,
KPanelExtension::Bottom };
- KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop,
+ KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop,
KPanelExtension::Center,
KPanelExtension::RightBottom };
@@ -494,8 +494,8 @@ void ExtensionContainer::moveMe()
// they don't get their "you're changing position" signals through
// heightForWidth/widthForHeight
rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i],
- tqalignments[j], s),
- s, positions[i], tqalignments[j]));
+ alignments[j], s),
+ s, positions[i], alignments[j]));
}
}
}
@@ -1368,7 +1368,7 @@ void ExtensionContainer::leaveEvent(TQEvent*)
maybeStartAutoHideTimer();
}
-void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a)
+void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a)
{
if (!m_extension)
{
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index fdb3be989..735aa2c85 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -159,7 +159,7 @@ private:
int XineramaScreen, const TQSize &s, TQRect workArea,
bool autohidden = false, UserHidden userHidden = Unhidden) const;
void positionChange(KPanelExtension::Position p);
- void tqalignmentChange(KPanelExtension::Alignment a);
+ void alignmentChange(KPanelExtension::Alignment a);
void xineramaScreenChange(int /*XineramaScreen*/) {}
int arrangeHideButtons();
int setupBorderSpace();
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index d7df05170..f86ae537a 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -762,7 +762,7 @@ void ItemView::slotMoveContent()
TQListViewItemIterator it( this );
while ( it.current() ) {
if ( !dynamic_cast( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) {
- it.current()->tqinvalidateHeight();
+ it.current()->invalidateHeight();
item_height += it.current()->totalHeight();
}
++it;
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 931419585..542e08be9 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -495,7 +495,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
if(raiseWidget)
break;
if(receiver->isWidgetType())
- receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true));
+ receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
else
break;
}
@@ -1556,7 +1556,7 @@ bool KMenu::runCommand()
case KURIFilterData::HELP:
{
// No need for kfmclient, KRun does it all (David)
- (void) new KRun( m_filterData->uri(), tqparentWidget());
+ (void) new KRun( m_filterData->uri(), parentWidget());
return false;
}
case KURIFilterData::EXECUTABLE:
@@ -2715,7 +2715,7 @@ void KMenu::slotStartURL(const TQString& u)
}
kapp->propagateSessionManager();
- (void) new KRun( u, tqparentWidget());
+ (void) new KRun( u, parentWidget());
}
}
@@ -3280,7 +3280,7 @@ void KMenu::searchActionClicked(TQListViewItem* item)
data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText()));
}
- (void) new KRun( data.uri(), tqparentWidget());
+ (void) new KRun( data.uri(), parentWidget());
}
}
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index 6fe731933..6be19459c 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -130,7 +130,7 @@ TQSize KickoffTabBar::tqsizeHint() const
void KickoffTabBar::layoutTabs()
{
- TQTabBar::tqlayoutTabs();
+ TQTabBar::layoutTabs();
TQFontMetrics fm = fontMetrics();
int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index c1204598a..d78ad5cf1 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -818,12 +818,12 @@ void TaskBar::reLayout()
void TaskBar::setViewportBackground()
{
- const TQPixmap *bg = tqparentWidget()->backgroundPixmap();
+ const TQPixmap *bg = parentWidget()->backgroundPixmap();
if (bg)
{
- TQPixmap pm(tqparentWidget()->size());
- pm.fill(tqparentWidget(), pos() + viewport()->pos());
+ TQPixmap pm(parentWidget()->size());
+ pm.fill(parentWidget(), pos() + viewport()->pos());
viewport()->setPaletteBackgroundPixmap(pm);
viewport()->setBackgroundOrigin(WidgetOrigin);
}
diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp
index e48754a55..b52085596 100644
--- a/kioslave/man/kmanpart.cpp
+++ b/kioslave/man/kmanpart.cpp
@@ -50,10 +50,10 @@ KManPartFactory::~KManPartFactory()
delete s_about;
}
-KParts::Part* KManPartFactory::createPartObject( TQWidget * tqparentWidget, const char* /*widgetName*/, TQObject *,
+KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const char* /*widgetName*/, TQObject *,
const char* name, const char* /*className*/,const TQStringList & )
{
- KManPart* part = new KManPart(tqparentWidget, name );
+ KManPart* part = new KManPart(parentWidget, name );
return part;
}
diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h
index 92d51e18b..f2d9e3891 100644
--- a/kioslave/man/kmanpart.h
+++ b/kioslave/man/kmanpart.h
@@ -44,7 +44,7 @@ class KManPartFactory: public KParts::Factory
KManPartFactory( TQObject * parent = 0, const char * name = 0 );
virtual ~KManPartFactory();
- virtual KParts::Part* createPartObject( TQWidget * tqparentWidget, const char * widgetName ,
+ virtual KParts::Part* createPartObject( TQWidget * parentWidget, const char * widgetName ,
TQObject* parent, const char* name, const char * classname,
const TQStringList &args);
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 8df573504..059471e0b 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -1017,9 +1017,9 @@ bool KlipperWidget::ignoreClipboardChanges() const
if ( tqfocusWidget )
{
if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
- (tqfocusWidget->tqparentWidget() &&
+ (tqfocusWidget->parentWidget() &&
tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
- tqfocusWidget->tqparentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
+ tqfocusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
{
return true;
}
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 05b0d19e9..78722b1a4 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -50,15 +50,15 @@ KonqAboutPageFactory::~KonqAboutPageFactory()
s_plugins_html = 0;
}
-KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *, const TQStringList & )
{
- //KonqFrame *frame = tqt_dynamic_cast( tqparentWidget );
+ //KonqFrame *frame = tqt_dynamic_cast( parentWidget );
//if ( !frame ) return 0;
return new KonqAboutPage( //frame->childView()->mainWindow(),
- tqparentWidget, widgetName, parent, name );
+ parentWidget, widgetName, parent, name );
}
TQString KonqAboutPageFactory::loadFile( const TQString& file )
@@ -427,9 +427,9 @@ TQString KonqAboutPageFactory::plugins()
KonqAboutPage::KonqAboutPage( //KonqMainWindow *
- TQWidget *tqparentWidget, const char *widgetName,
+ TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name )
- : KHTMLPart( tqparentWidget, widgetName, parent, name, BrowserViewGUI )
+ : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
{
//m_mainWindow = mainWindow;
TQTextCodec* codec = KGlobal::locale()->codecForEncoding();
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index 3d53cf02c..c72a85250 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -13,7 +13,7 @@ public:
KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 );
virtual ~KonqAboutPageFactory();
- virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
@@ -37,7 +37,7 @@ class KonqAboutPage : public KHTMLPart
Q_OBJECT
public:
KonqAboutPage( /*KonqMainWindow *mainWindow,*/
- TQWidget *tqparentWidget, const char *widgetName,
+ TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name );
~KonqAboutPage();
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 87eba006d..c6761ddcc 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -72,13 +72,13 @@ public:
s_defaultViewProps = 0;
}
- virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *,
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *,
TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqKfmIconView: Missing Parameter" << endl;
- KonqKfmIconView *obj = new KonqKfmIconView( tqparentWidget, parent, name,args.first() );
+ KonqKfmIconView *obj = new KonqKfmIconView( parentWidget, parent, name,args.first() );
return obj;
}
@@ -164,7 +164,7 @@ void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter )
m_iconView->m_nameFilter = nameFilter;
}
-KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode )
+KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
, m_bNeedSetCurrentItem( false )
, m_pEnsureVisible( 0 )
@@ -179,7 +179,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co
// Create a properties instance for this view
m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() );
- m_pIconView = new KonqIconViewWidget( tqparentWidget, "qiconview" );
+ m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
m_pIconView->initConfig( true );
connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()),
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index b1ac6df9d..517734182 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -51,7 +51,7 @@ public:
enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date };
- KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode );
+ KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqKfmIconView();
virtual const KFileItem * currentItem();
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 0cc8f823f..148a8b5ca 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -82,7 +82,7 @@ void CmdHistory::slotCommandExecuted(KCommand *k) {
CurrentMgr::self()->notifyManagers(bk.toGroup());
// sets currentItem to something sensible
- // if the currentItem was tqinvalidated by executing
+ // if the currentItem was invalidated by executing
// CreateCommand or DeleteManyCommand
// otherwise does nothing
// sensible is either a already selected item or cmd->currentAddress()
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index e53b3a32c..b7a3868af 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -45,7 +45,7 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args
m_args << TQString::tqfromLatin1( "Browser/View" );
}
-KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const char *widgetName,
+KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName,
TQObject * parent, const char *name )
{
if ( !m_factory )
@@ -56,18 +56,18 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const c
if ( m_factory->inherits( "KParts::Factory" ) )
{
if ( m_createBrowser )
- obj = static_cast(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "Browser/View", m_args );
+ obj = static_cast(m_factory)->createPart( parentWidget, widgetName, parent, name, "Browser/View", m_args );
if ( !obj )
- obj = static_cast(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args );
+ obj = static_cast(m_factory)->createPart( parentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args );
}
else
{
if ( m_createBrowser )
- obj = m_factory->create( TQT_TQOBJECT(tqparentWidget), name, "Browser/View", m_args );
+ obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "Browser/View", m_args );
if ( !obj )
- obj = m_factory->create( TQT_TQOBJECT(tqparentWidget), name, "KParts::ReadOnlyPart", m_args );
+ obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "KParts::ReadOnlyPart", m_args );
}
if ( !obj->inherits( "KParts::ReadOnlyPart" ) )
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index 1f7834d64..ac24061e6 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -52,7 +52,7 @@ public:
return *this;
}
- KParts::ReadOnlyPart *create( TQWidget *tqparentWidget, const char *widgetName,
+ KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name );
bool isNull() const { return m_factory ? false : true; }
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index eb11d0c22..30aa69f8d 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -32,8 +32,8 @@
#include
KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
- TQWidget* tqparentWidget)
- : KonqBaseListViewWidget(parent, tqparentWidget)
+ TQWidget* parentWidget)
+ : KonqBaseListViewWidget(parent, parentWidget)
{
m_metaInfoJob = 0;
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 46bda8b22..5ae497ac2 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -37,7 +37,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
// friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqInfoListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
+ KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
~KonqInfoListViewWidget();
const TQStringList columnKeys() {return m_columnKeys;}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index a01a7aa2c..3cbbae992 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -63,12 +63,12 @@ KonqListViewFactory::~KonqListViewFactory()
s_defaultViewProps = 0;
}
-KParts::Part* KonqListViewFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
+KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqListView: Missing Parameter" << endl;
- KParts::Part *obj = new KonqListView( tqparentWidget, parent, name, args.first() );
+ KParts::Part *obj = new KonqListView( parentWidget, parent, name, args.first() );
return obj;
}
@@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType()
KonqOperations::editMimeType( items.first()->mimetype() );
}
-KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode )
+KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
,m_headerTimer(0)
{
@@ -234,25 +234,25 @@ KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const ch
{
kdDebug(1202) << "Creating KonqTextViewWidget" << endl;
xmlFile = "konq_textview.rc";
- m_pListView=new KonqTextViewWidget(this, tqparentWidget);
+ m_pListView=new KonqTextViewWidget(this, parentWidget);
}
else if (mode=="MixedTree")
{
kdDebug(1202) << "Creating KonqTreeViewWidget" << endl;
xmlFile = "konq_treeview.rc";
- m_pListView=new KonqTreeViewWidget(this,tqparentWidget);
+ m_pListView=new KonqTreeViewWidget(this,parentWidget);
}
else if (mode=="InfoListView")
{
kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl;
xmlFile = "konq_infolistview.rc";
- m_pListView=new KonqInfoListViewWidget(this,tqparentWidget);
+ m_pListView=new KonqInfoListViewWidget(this,parentWidget);
}
else
{
kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl;
xmlFile = "konq_detailedlistview.rc";
- m_pListView = new KonqBaseListViewWidget( this, tqparentWidget);
+ m_pListView = new KonqBaseListViewWidget( this, parentWidget);
}
setWidget( m_pListView );
setDirLister( m_pListView->m_dirLister );
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 0fc8f0340..8665160d3 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -44,7 +44,7 @@ public:
KonqListViewFactory();
virtual ~KonqListViewFactory();
- virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
static KInstance *instance();
static KonqPropsView *defaultViewProps();
@@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart
Q_OBJECT
Q_PROPERTY( bool supportsUndo READ supportsUndo )
public:
- KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode );
+ KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqListView();
virtual const KFileItem * currentItem();
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 36aa10544..b47e43ede 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -211,7 +211,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
{
setup();
widthChanged( column );
- tqinvalidateHeight();
+ invalidateHeight();
return;
}
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 2ecee655f..290557945 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -84,8 +84,8 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio
}
-KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget)
- : KListView(tqparentWidget)
+KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget)
+ : KListView(parentWidget)
,sortedByColumn(0)
,m_pBrowserView(parent)
,m_dirLister(new KDirLister( true /*m_showIcons==false*/))
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 0ad11fc17..c55996306 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -82,7 +82,7 @@ class KonqBaseListViewWidget : public KListView
Q_OBJECT
TQ_OBJECT
public:
- KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
+ KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
virtual ~KonqBaseListViewWidget();
unsigned int NumberOfAtoms;
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index 2012b6480..744e06d85 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@@ -29,8 +29,8 @@
#include
-KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget )
-:KonqBaseListViewWidget(parent,tqparentWidget)
+KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget )
+:KonqBaseListViewWidget(parent,parentWidget)
{
kdDebug(1202) << "+KonqTextViewWidget" << endl;
m_filenameColumn=1;
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index 5596e4d23..06a5cbbb5 100644
--- a/konqueror/listview/konq_textviewwidget.h
+++ b/konqueror/listview/konq_textviewwidget.h
@@ -34,7 +34,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget
friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
+ KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
~KonqTextViewWidget();
virtual bool isExecuteArea( const TQPoint& point );
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 1f19cf979..592ba9e09 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cc
@@ -27,8 +27,8 @@
template class TQDict;
-KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget)
- : KonqBaseListViewWidget( parent, tqparentWidget )
+KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget)
+ : KonqBaseListViewWidget( parent, parentWidget )
{
kdDebug(1202) << "+KonqTreeViewWidget" << endl;
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 8ced17e6b..3f08cc3d5 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -34,7 +34,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
Q_OBJECT
public:
- KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
+ KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
virtual ~KonqTreeViewWidget();
virtual bool openURL( const KURL &url );
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 0e3f3512a..c3e381cd9 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -22,7 +22,7 @@
#include
#include
-KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName,
+KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, bool universalMode )
: KParts::ReadOnlyPart(parent, name),KonqSidebarIface()
{
@@ -30,7 +30,7 @@ KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName,
setInstance( KonqSidebarFactory::instance() );
m_extension = 0;
// this should be your custom internal widget
- m_widget = new Sidebar_Widget( tqparentWidget, this, widgetName ,universalMode, tqparentWidget->tqtopLevelWidget()->property("currentProfile").toString() );
+ m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->tqtopLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
this, TQT_SIGNAL(started(KIO::Job*)));
@@ -97,12 +97,12 @@ KonqSidebarFactory::~KonqSidebarFactory()
s_about = 0L;
}
-KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char * /*classname*/, const TQStringList &args )
{
// Create an instance of our Part
- KonqSidebar* obj = new KonqSidebar( tqparentWidget, widgetName, parent, name, args.tqcontains("universal") );
+ KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.tqcontains("universal") );
// See if we are to be read-write or not
// if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index 0d8bf89ea..56622d40d 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -79,7 +79,7 @@ public:
/**
* Default constructor
*/
- KonqSidebar(TQWidget *tqparentWidget, const char *widgetName,
+ KonqSidebar(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,bool universalMode);
/**
@@ -116,7 +116,7 @@ class KonqSidebarFactory : public KParts::Factory
public:
KonqSidebarFactory();
virtual ~KonqSidebarFactory();
- virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 211b7fb36..d9fa0986a 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -1043,18 +1043,18 @@ void Sidebar_Widget::showHidePage(int page)
void Sidebar_Widget::collapseExpandSidebar()
{
- if (!tqparentWidget())
+ if (!parentWidget())
return; // Can happen during destruction
if (m_visibleViews.count()==0)
{
m_somethingVisible = false;
- tqparentWidget()->setMaximumWidth(tqminimumSizeHint().width());
+ parentWidget()->setMaximumWidth(tqminimumSizeHint().width());
updateGeometry();
emit panelHasBeenExpanded(false);
} else {
m_somethingVisible = true;
- tqparentWidget()->setMaximumWidth(32767);
+ parentWidget()->setMaximumWidth(32767);
updateGeometry();
emit panelHasBeenExpanded(true);
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 404a2f2c5..c17907e7d 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -114,8 +114,8 @@ public:
};
-KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path )
- : KListView( tqparentWidget ),
+KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
+ : KListView( parentWidget ),
m_currentTopLevelItem( 0 ),
m_toolTip( this ),
m_scrollingLocked( false ),
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index 8db2a613e..a8e2ad075 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
{
Q_OBJECT
public:
- KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path );
+ KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
virtual ~KonqSidebarTree();
void followURL( const KURL &url );
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 37dc4785a..3f47f962b 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -1184,8 +1184,8 @@ void TEWidget::propagateSize()
{
setSize(columns, lines);
TQFrame::setFixedSize(tqsizeHint());
- tqparentWidget()->adjustSize();
- tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint());
+ parentWidget()->adjustSize();
+ parentWidget()->setFixedSize(parentWidget()->tqsizeHint());
return;
}
if (image)
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index a2594edc1..3bf2daaee 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory()
s_aboutData = 0;
}
-KParts::Part *konsoleFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const char *classname,
const TQStringList&)
{
-// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl;
- KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname);
+// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
+ KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
return obj;
}
@@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance()
#define DEFAULT_HISTORY_SIZE 1000
-konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
+konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
: KParts::ReadOnlyPart(parent, name)
,te(0)
,se(0)
@@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb
,m_histSize(DEFAULT_HISTORY_SIZE)
,m_runningShell( false )
{
- tqparentWidget=_tqparentWidget;
+ parentWidget=_parentWidget;
setInstance(konsoleFactory::instance());
m_extension = new konsoleBrowserExtension(this);
@@ -137,7 +137,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb
const char* shell = getenv("SHELL");
if (shell == NULL || *shell == '\0') shell = "/bin/sh";
eargs.append(shell);
- te = new TEWidget(tqparentWidget,widgetName);
+ te = new TEWidget(parentWidget,widgetName);
te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget
setWidget(TQT_TQWIDGET(te));
@@ -317,13 +317,13 @@ void konsolePart::makeGUI()
if (!kapp->authorizeKAction("konsole_rmb"))
return;
- actions = new KActionCollection( (KMainWindow*)tqparentWidget );
- settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget );
+ actions = new KActionCollection( (KMainWindow*)parentWidget );
+ settingsActions = new KActionCollection( (KMainWindow*)parentWidget );
// Send Signal Menu -------------------------------------------------------------
if (kapp->authorizeKAction("send_signal"))
{
- m_signals = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_signals = new KPopupMenu((KMainWindow*)parentWidget);
m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP);
m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT);
m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP);
@@ -338,7 +338,7 @@ void konsolePart::makeGUI()
// Settings Menu ----------------------------------------------------------------
if (kapp->authorizeKAction("settings"))
{
- m_options = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_options = new KPopupMenu((KMainWindow*)parentWidget);
// Scrollbar
selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
@@ -379,7 +379,7 @@ void konsolePart::makeGUI()
// Keyboard Options Menu ---------------------------------------------------
if (kapp->authorizeKAction("keyboard"))
{
- m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_keytab = new KPopupMenu((KMainWindow*)parentWidget);
m_keytab->setCheckable(true);
connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
@@ -388,7 +388,7 @@ void konsolePart::makeGUI()
// Schema Options Menu -----------------------------------------------------
if (kapp->authorizeKAction("schema"))
{
- m_schema = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_schema = new KPopupMenu((KMainWindow*)parentWidget);
m_schema->setCheckable(true);
connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
@@ -452,7 +452,7 @@ void konsolePart::makeGUI()
}
// Popup Menu -------------------------------------------------------------------
- m_popupMenu = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget);
KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu);
@@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item)
void konsolePart::slotHistoryType()
{
if ( ! se ) return;
- HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget);
+ HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget);
if (dlg.exec()) {
if (dlg.isOn()) {
if (dlg.nbLines() > 0) {
@@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() {
bool ok;
TQString seps = KInputDialog::getText( i18n( "Word Connectors" ),
- i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, tqparentWidget );
+ i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget );
if ( ok )
{
s_word_seps = seps;
@@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty )
void konsolePart::newSession()
{
if ( se ) delete se;
- se = new TESession(te, "xterm", tqparentWidget->winId());
+ se = new TESession(te, "xterm", parentWidget->winId());
connect( se,TQT_SIGNAL(done(TESession*)),
this,TQT_SLOT(doneSession(TESession*)) );
connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index db7533178..1f65106ad 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -52,7 +52,7 @@ public:
konsoleFactory();
virtual ~konsoleFactory();
- virtual KParts::Part* createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+ virtual KParts::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());
@@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
{
Q_OBJECT
public:
- konsolePart(TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
+ konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
virtual ~konsolePart();
signals:
@@ -140,7 +140,7 @@ signals:
bool doWriteStream( const TQByteArray& );
bool doCloseStream();
- TQWidget* tqparentWidget;
+ TQWidget* parentWidget;
TEWidget* te;
TESession* se;
ColorSchemaList* colors;
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 9916ee82f..b5048f90a 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -650,7 +650,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
list->first();
while( list->current())
{
- if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( TQt::WDestructiveClose ) )
+ if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( TQt::WDestructiveClose ) )
{
list->remove();
continue;
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index ad5687144..91b908553 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -549,7 +549,7 @@ void FancyPlotterSettings::editSensor()
return;
TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 );
- int result = KColorDialog::getColor( color, tqparentWidget() );
+ int result = KColorDialog::getColor( color, parentWidget() );
if ( result == KColorDialog::Accepted ) {
TQPixmap newPm( 12, 12 );
newPm.fill( color );
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index 0438c0eb8..6068e85e5 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -247,7 +247,7 @@ ProcessController::killProcess()
KDialogBase *dlg = new KDialogBase ( i18n ("Kill Process"),
KDialogBase::Yes | KDialogBase::Cancel,
- KDialogBase::Yes, KDialogBase::Cancel, this->tqparentWidget(),
+ KDialogBase::Yes, KDialogBase::Cancel, this->parentWidget(),
"killconfirmation",
true, true, KGuiItem(i18n("Kill")));
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index 0348abfe1..4d8c6eb37 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
@@ -124,7 +124,7 @@ void SensorDisplay::configureUpdateInterval()
if ( dlg.useGlobalUpdate() ) {
mUseGlobalUpdateInterval = true;
- SensorBoard* sb = dynamic_cast( tqparentWidget() );
+ SensorBoard* sb = dynamic_cast( parentWidget() );
if ( !sb ) {
kdDebug(1215) << "dynamic cast lacks" << endl;
setUpdateInterval( 2 );
@@ -344,7 +344,7 @@ bool SensorDisplay::restoreSettings( TQDomElement &element )
} else {
mUseGlobalUpdateInterval = true;
- SensorBoard* sb = dynamic_cast( tqparentWidget() );
+ SensorBoard* sb = dynamic_cast( parentWidget() );
if ( !sb ) {
kdDebug(1215) << "dynamic cast lacks" << endl;
setUpdateInterval( 2 );
diff --git a/kwin/client.h b/kwin/client.h
index d715a8558..4a4ed7025 100644
--- a/kwin/client.h
+++ b/kwin/client.h
@@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines
void setKeepBelow( bool );
Layer layer() const;
Layer belongsToLayer() const;
- void tqinvalidateLayer();
+ void invalidateLayer();
void setModal( bool modal );
bool isModal() const;
@@ -832,7 +832,7 @@ inline pid_t Client::pid() const
return info->pid();
}
-inline void Client::tqinvalidateLayer()
+inline void Client::invalidateLayer()
{
in_layer = UnknownLayer;
}
diff --git a/kwin/layers.cpp b/kwin/layers.cpp
index e5194ed49..8bb3f8c99 100644
--- a/kwin/layers.cpp
+++ b/kwin/layers.cpp
@@ -87,7 +87,7 @@ void Workspace::updateClientLayer( Client* c )
if( c->layer() == c->belongsToLayer())
return;
StackingUpdatesBlocker blocker( this );
- c->tqinvalidateLayer(); // tqinvalidate, will be updated when doing restacking
+ c->invalidateLayer(); // tqinvalidate, will be updated when doing restacking
for( ClientList::ConstIterator it = c->transients().begin();
it != c->transients().end();
++it )
diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc
index 48f6d8bb6..3bc303bae 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/kfileivi.cc
@@ -81,7 +81,7 @@ KFileIVI::~KFileIVI()
delete d;
}
-void KFileIVI::tqinvalidateThumb( int state, bool redraw )
+void KFileIVI::invalidateThumb( int state, bool redraw )
{
TQIconSet::Mode mode;
switch( state )
diff --git a/libkonq/kfileivi.h b/libkonq/kfileivi.h
index 1b2a3402e..6c16907ec 100644
--- a/libkonq/kfileivi.h
+++ b/libkonq/kfileivi.h
@@ -88,14 +88,14 @@ public:
bool redraw=false);
/**
- * Notifies that all icon effects on thumbs should be tqinvalidated,
+ * Notifies that all icon effects on thumbs should be invalidated,
* e.g. because the effect settings have been changed. The thumb itself
* is assumed to be still valid (use setThumbnailPixmap() instead
* otherwise).
* @param state the state of the icon (enum in KIcon)
* @param redraw whether to redraw the item after setting the icon
*/
- void tqinvalidateThumb( int state, bool redraw = false );
+ void invalidateThumb( int state, bool redraw = false );
/**
* Our current thumbnail is not longer "current".
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 5e41ef571..e307b0ddf 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -56,10 +56,10 @@ KDirWatch * KNewMenu::s_pDirWatch = 0L;
class KNewMenu::KNewMenuPrivate
{
public:
- KNewMenuPrivate() : m_tqparentWidget(0) {}
+ KNewMenuPrivate() : m_parentWidget(0) {}
KActionCollection * m_actionCollection;
TQString m_destPath;
- TQWidget *m_tqparentWidget;
+ TQWidget *m_parentWidget;
KActionMenu *m_menuDev;
};
@@ -75,13 +75,13 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) :
makeMenus();
}
-KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name ) :
+KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) :
KActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
menuItemsVersion( 0 )
{
d = new KNewMenuPrivate;
d->m_actionCollection = _collec;
- d->m_tqparentWidget = tqparentWidget;
+ d->m_parentWidget = parentWidget;
makeMenus();
}
@@ -363,7 +363,7 @@ void KNewMenu::slotNewDir()
if (popupFiles.isEmpty())
return;
- KonqOperations::newDir(d->m_tqparentWidget, popupFiles.first());
+ KonqOperations::newDir(d->m_parentWidget, popupFiles.first());
}
void KNewMenu::slotNewFile()
@@ -396,7 +396,7 @@ void KNewMenu::slotNewFile()
{
m_isURLDesktopFile = true;
// entry.comment contains i18n("Enter link to location (URL):"). JFYI :)
- KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_tqparentWidget );
+ KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_parentWidget );
// TODO dlg.setCaption( i18n( ... ) );
if ( dlg.exec() )
{
@@ -428,7 +428,7 @@ void KNewMenu::slotNewFile()
KURL templateURL;
templateURL.setPath( entry.templatePath );
- (void) new KPropertiesDialog( templateURL, *it, text, d->m_tqparentWidget );
+ (void) new KPropertiesDialog( templateURL, *it, text, d->m_parentWidget );
}
return; // done, exit.
}
@@ -447,7 +447,7 @@ void KNewMenu::slotNewFile()
text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
name = KInputDialog::getText( TQString::null, entry.comment,
- text, &ok, d->m_tqparentWidget );
+ text, &ok, d->m_parentWidget );
if ( !ok )
return;
}
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index 3c1b0a78b..6935ae7a4 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -58,7 +58,7 @@ public:
* Constructor
*/
KNewMenu( KActionCollection * _collec, const char *name=0L );
- KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name=0L );
+ KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L );
virtual ~KNewMenu();
/**
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 6ab540761..07cf1cfb7 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -669,7 +669,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
ivi->setIcon( size, ivi->state(), true, false );
}
else
- ivi->tqinvalidateThumb( ivi->state(), true );
+ ivi->invalidateThumb( ivi->state(), true );
}
// Restore viewport update to previous state
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 99afde5dd..fb803a9a9 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -185,7 +185,7 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
return;
}
- if ( askDeleteConfirmation( selectedURLs, method, confirmation, tqparentWidget() ) )
+ if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) )
{
//m_srcURLs = selectedURLs;
KIO::Job *job;
@@ -525,7 +525,7 @@ void KonqOperations::doFileCopy()
}
m_method = TRASH;
- if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, tqparentWidget() ) )
+ if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) )
action = TQDropEvent::Move;
else
{
@@ -815,7 +815,7 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job )
slotStart();
}
-TQWidget* KonqOperations::tqparentWidget() const
+TQWidget* KonqOperations::parentWidget() const
{
return static_cast( parent() );
}
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index fa47b4abe..66e04ee0d 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -173,7 +173,7 @@ protected:
void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; }
private:
- TQWidget* tqparentWidget() const;
+ TQWidget* parentWidget() const;
protected slots:
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 273ce8cfc..c828c4aa8 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -96,12 +96,12 @@ public:
class KonqPopupMenu::KonqPopupMenuPrivate
{
public:
- KonqPopupMenuPrivate() : m_tqparentWidget( 0 ),
+ KonqPopupMenuPrivate() : m_parentWidget( 0 ),
m_itemFlags( KParts::BrowserExtension::DefaultPopupItems )
{
}
TQString m_urlTitle;
- TQWidget *m_tqparentWidget;
+ TQWidget *m_parentWidget;
KParts::BrowserExtension::PopupFlags m_itemFlags;
};
@@ -200,30 +200,30 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
KURL viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
bool showProperties )
- : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+ : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow;
- init(tqparentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
+ init(parentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
}
KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
const KURL& viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags flags)
- : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+ : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
- init(tqparentWidget, kpf, flags);
+ init(parentWidget, kpf, flags);
}
-void KonqPopupMenu::init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
+void KonqPopupMenu::init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
{
d = new KonqPopupMenuPrivate;
- d->m_tqparentWidget = tqparentWidget;
+ d->m_parentWidget = parentWidget;
d->m_itemFlags = flags;
setup(kpf);
}
@@ -1035,7 +1035,7 @@ void KonqPopupMenu::slotPopupNewDir()
if (m_lstPopupURLs.empty())
return;
- KonqOperations::newDir(d->m_tqparentWidget, m_lstPopupURLs.first());
+ KonqOperations::newDir(d->m_parentWidget, m_lstPopupURLs.first());
}
void KonqPopupMenu::slotPopupEmptyTrashBin()
@@ -1116,10 +1116,10 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
if (item->entry().count() == 0) // this item wasn't listed by a slave
{
// KPropertiesDialog will use stat to get more info on the file
- return new KPropertiesDialog( item->url(), d->m_tqparentWidget );
+ return new KPropertiesDialog( item->url(), d->m_parentWidget );
}
}
- return new KPropertiesDialog( m_lstItems, d->m_tqparentWidget );
+ return new KPropertiesDialog( m_lstItems, d->m_parentWidget );
}
KAction *KonqPopupMenu::action( const TQDomElement &element ) const
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 15dbcef5e..e64a721d7 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -69,7 +69,7 @@ public:
// WARNING: bitfield. Next item is 8
/**
- * @deprecated lacks tqparentWidget pointer, and
+ * @deprecated lacks parentWidget pointer, and
* uses bool instead of KonqPopupFlags enum,
* might do strange things with the 'new window' action.
*/
@@ -89,7 +89,7 @@ public:
KURL viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
/**
@@ -99,7 +99,7 @@ public:
* @param viewURL the URL shown in the view, to test for RMB click on view background
* @param actions list of actions the caller wants to see in the menu
* @param newMenu "New" menu, shared with the File menu, in konqueror
- * @param tqparentWidget the widget we're showing this popup for. Helps destroying
+ * @param parentWidget the widget we're showing this popup for. Helps destroying
* the popup if the widget is destroyed before the popup.
* @param kpf flags from the KonqPopupFlags enum, set by the calling application
* @param f flags from the BrowserExtension enum, set by the calling part
@@ -117,7 +117,7 @@ public:
const KURL& viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/);
@@ -177,7 +177,7 @@ protected:
KActionCollection m_ownActions;
private:
- void init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
+ void init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
void setup(KonqPopupFlags kpf);
void addPlugins( );
int insertServicesSubmenus(const TQMap& list, TQDomElement& menu, bool isBuiltin);
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index f55f6469b..4eaabd612 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -171,13 +171,13 @@ PluginFactory::~PluginFactory()
s_instance = 0;
}
-KParts::Part * PluginFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args)
{
Q_UNUSED(classname)
kdDebug(1432) << "PluginFactory::create" << endl;
- KParts::Part *obj = new PluginPart(tqparentWidget, widgetName, parent, name, args);
+ KParts::Part *obj = new PluginPart(parentWidget, widgetName, parent, name, args);
return obj;
}
@@ -201,7 +201,7 @@ KAboutData *PluginFactory::aboutData()
/**************************************************************************/
-PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent,
+PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
const char *name, const TQStringList &args)
: KParts::ReadOnlyPart(parent, name), _widget(0), _args(args),
_destructed(0L)
@@ -226,7 +226,7 @@ PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObjec
_callback = new NSPluginCallback(this);
// create a canvas to insert our widget
- _canvas = new PluginCanvasWidget( tqparentWidget, widgetName );
+ _canvas = new PluginCanvasWidget( parentWidget, widgetName );
//_canvas->setFocusPolicy( TQWidget::ClickFocus );
_canvas->setFocusPolicy( TQ_WheelFocus );
_canvas->setBackgroundMode( TQWidget::NoBackground );
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index 6173eeed8..3e54af412 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -67,7 +67,7 @@ public:
PluginFactory();
virtual ~PluginFactory();
- virtual KParts::Part * createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+ virtual KParts::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());
@@ -102,7 +102,7 @@ class PluginPart: public KParts::ReadOnlyPart
{
Q_OBJECT
public:
- PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent,
+ PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
const char *name, const TQStringList &args = TQStringList());
virtual ~PluginPart();
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index 4ba50e5ae..dff545d9f 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs {
NPN_PostURLNotifyUPP posturlnotify;
NPN_GetValueUPP getvalue;
NPN_SetValueUPP setvalue;
- NPN_InvalidateRectUPP tqinvalidaterect;
- NPN_InvalidateRegionUPP tqinvalidateregion;
+ NPN_InvalidateRectUPP invalidaterect;
+ NPN_InvalidateRegionUPP invalidateregion;
NPN_ForceRedrawUPP forceredraw;
NPN_GetStringIdentifierUPP getstringidentifier;
NPN_GetStringIdentifiersUPP getstringidentifiers;
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index a349468da..ee3ca2d88 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1454,8 +1454,8 @@ int NSPluginClass::initialize()
_nsFuncs.posturlnotify = g_NPN_PostURLNotify;
_nsFuncs.getvalue = g_NPN_GetValue;
_nsFuncs.setvalue = g_NPN_SetValue;
- _nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect;
- _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion;
+ _nsFuncs.invalidaterect = g_NPN_InvalidateRect;
+ _nsFuncs.invalidateregion = g_NPN_InvalidateRegion;
_nsFuncs.forceredraw = g_NPN_ForceRedraw;
// initialize plugin
diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c
index acd07ea91..965868426 100644
--- a/nsplugins/wrapper/wrapper.c
+++ b/nsplugins/wrapper/wrapper.c
@@ -544,7 +544,7 @@ static
void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect)
{
DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect);
- gNetscapeFuncs.tqinvalidaterect( instance, invalidRect );
+ gNetscapeFuncs.invalidaterect( instance, invalidRect );
DEB(ef, "<- NPN_InvalidateRect\n");
}
@@ -552,7 +552,7 @@ static
void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
{
DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion);
- gNetscapeFuncs.tqinvalidateregion( instance, invalidRegion );
+ gNetscapeFuncs.invalidateregion( instance, invalidRegion );
DEB(ef, "<- NPN_InvalidateRegion\n");
}
@@ -605,8 +605,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
DEB(ef, "nsTable->posturlnotify = 0x%x\n", nsTable->posturlnotify);
DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue);
DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue);
- DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", nsTable->tqinvalidaterect);
- DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", nsTable->tqinvalidateregion);
+ DEB(ef, "nsTable->invalidaterect = 0x%x\n", nsTable->invalidaterect);
+ DEB(ef, "nsTable->invalidateregion = 0x%x\n", nsTable->invalidateregion);
DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw);
DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);
@@ -659,8 +659,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify;
gExtNetscapeFuncs.getvalue = MyNPN_GetValue;
gExtNetscapeFuncs.setvalue = MyNPN_SetValue;
- gExtNetscapeFuncs.tqinvalidaterect = MyNPN_InvalidateRect;
- gExtNetscapeFuncs.tqinvalidateregion = MyNPN_InvalidateRegion;
+ gExtNetscapeFuncs.invalidaterect = MyNPN_InvalidateRect;
+ gExtNetscapeFuncs.invalidateregion = MyNPN_InvalidateRegion;
gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw;
gPluginFuncs.size = sizeof( gPluginFuncs );
@@ -709,8 +709,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
DEB(ef, "nsTable->posturlnotify = 0x%x\n", gExtNetscapeFuncs.posturlnotify);
DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue);
DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue);
- DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", gExtNetscapeFuncs.tqinvalidaterect);
- DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", gExtNetscapeFuncs.tqinvalidateregion);
+ DEB(ef, "nsTable->invalidaterect = 0x%x\n", gExtNetscapeFuncs.invalidaterect);
+ DEB(ef, "nsTable->invalidateregion = 0x%x\n", gExtNetscapeFuncs.invalidateregion);
DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw);
DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);