Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 02ee984b9d
commit bee265d855

@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
{ {
if ( pluginPages.tqat(i)->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 pluginPages.tqat(i)->page;
delete w; delete w;
pluginPages.remove(pluginPages.tqat(i)); pluginPages.remove(pluginPages.tqat(i));

@ -57,7 +57,7 @@ void KateConsole::loadConsoleIfNeeded()
{ {
if (m_part) return; if (m_part) return;
if (!tqtopLevelWidget() || !tqparentWidget()) return; if (!tqtopLevelWidget() || !parentWidget()) return;
if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return; if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
m_part = 0; m_part = 0;
// hide the dockwidget // hide the dockwidget
if (tqparentWidget()) if (parentWidget())
{ {
m_mw->hideToolView (m_toolView); m_mw->hideToolView (m_toolView);
m_mw->centralWidget()->setFocus (); m_mw->centralWidget()->setFocus ();

@ -476,7 +476,7 @@ void GrepTool::childExited()
if ( ! errbuf.isEmpty() ) if ( ! errbuf.isEmpty() )
{ {
KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") ); KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
errbuf.truncate(0); errbuf.truncate(0);
} }
else else

@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
// here we go, set some usable default sizes // here we go, set some usable default sizes
if (!initialGeometrySet()) if (!initialGeometrySet())
{ {
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum); TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
TQSize size; TQSize size;

@ -660,8 +660,8 @@ void Sidebar::saveSession (KConfig *config)
//BEGIN MAIN WINDOW //BEGIN MAIN WINDOW
MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name) MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
: KParts::MainWindow( tqparentWidget, name) : KParts::MainWindow( parentWidget, name)
, m_sidebarsVisible(true) , m_sidebarsVisible(true)
, m_restoreConfig (0) , m_restoreConfig (0)
, m_guiClient (new GUIClient (this)) , m_guiClient (new GUIClient (this))

@ -264,7 +264,7 @@ class MainWindow : public KParts::MainWindow
/** /**
* Constructor * Constructor
*/ */
MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0); MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
/** /**
* Destructor * Destructor

@ -69,7 +69,7 @@ protected:
TQPainter p( this ); TQPainter p( this );
p.setPen( tqcolorGroup().shadow() ); p.setPen( tqcolorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); 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 ); 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) 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; return;
mStatusBar->setStatus( r, c, ovr, block, mod, msg ); mStatusBar->setStatus( r, c, ovr, block, mod, msg );
} }

@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace)
{ {
if (!view) return true; if (!view) return true;
KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget(); KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
viewspace->removeView (view); viewspace->removeView (view);
@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
{ {
if (!v) return; if (!v) return;
KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget(); KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
if (!vs->isActiveSpace()) { if (!vs->isActiveSpace()) {
setActiveSpace (vs); setActiveSpace (vs);
@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
if (!activeView()) return; if (!activeView()) return;
if (!vs) vs = activeViewSpace(); if (!vs) vs = activeViewSpace();
bool isFirstTime = vs->tqparentWidget() == this; bool isFirstTime = vs->parentWidget() == this;
TQValueList<int> psizes; TQValueList<int> psizes;
if ( ! isFirstTime ) if ( ! isFirstTime )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
psizes = ps->sizes(); psizes = ps->sizes();
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; 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() ); s->setOpaqueResize( KGlobalSettings::opaqueResize() );
if (! isFirstTime) { if (! isFirstTime) {
// anders: make sure the split' viewspace is always // anders: make sure the split' viewspace is always
// correctly positioned. // correctly positioned.
// If viewSpace is the first child, the new splitter must be moveToFirst'd // If viewSpace is the first child, the new splitter must be moveToFirst'd
if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) ) if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s ); ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
} }
vs->reparent( s, 0, TQPoint(), true ); vs->reparent( s, 0, TQPoint(), true );
KateViewSpace* vsNew = new KateViewSpace( this, s ); KateViewSpace* vsNew = new KateViewSpace( this, s );
@ -471,13 +471,13 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
s->moveToFirst( vsNew ); s->moveToFirst( vsNew );
if (!isFirstTime) if (!isFirstTime)
if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
ps->setSizes( psizes ); ps->setSizes( psizes );
s->show(); s->show();
TQValueList<int> sizes; TQValueList<int> 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; sizes << space << space;
s->setSizes( sizes ); s->setSizes( sizes );
@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// abort if this is the last viewspace // abort if this is the last viewspace
if (m_viewSpaceList.count() < 2) return; 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 // find out if it is the first child for repositioning
// see below // see below
@ -512,9 +512,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// save some size information // save some size information
KateMDI::Splitter* pp=0L; KateMDI::Splitter* pp=0L;
TQValueList<int> ppsizes; TQValueList<int> 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(); ppsizes = pp->sizes();
pIsFirst = !pp->isLastChild( p ); // simple logic, right- pIsFirst = !pp->isLastChild( p ); // simple logic, right-
} }
@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
{ {
TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>)p->childrenListObject()).first()); TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>)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 // We also need to find the right viewspace to become active
if (pIsFirst) if (pIsFirst)
((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other ); ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
if ( other->isA("KateViewSpace") ) { if ( other->isA("KateViewSpace") ) {
setActiveSpace( (KateViewSpace*)other ); setActiveSpace( (KateViewSpace*)other );
} }

@ -337,8 +337,8 @@ void WidgetCanvas::drawSampleWidgets()
// Initialize the pixmap which we draw sample widgets into. // Initialize the pixmap which we draw sample widgets into.
smplw.resize(width(), height()); smplw.resize(width(), height());
//smplw.fill( tqparentWidget()->back() ); //smplw.fill( parentWidget()->back() );
smplw.fill( tqparentWidget()->tqcolorGroup().mid() ); smplw.fill( parentWidget()->tqcolorGroup().mid() );
// Actually start painting in // Actually start painting in
@ -585,7 +585,7 @@ void WidgetCanvas::drawSampleWidgets()
// Valance // Valance
qDrawWinPanel ( &paint, 0, 0, width(), height(), qDrawWinPanel ( &paint, 0, 0, width(), height(),
tqparentWidget()->tqcolorGroup(), TRUE, 0); parentWidget()->tqcolorGroup(), TRUE, 0);
// Stop the painting // Stop the painting

@ -27,11 +27,11 @@
FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
: TQWidget( parent, name ) : TQWidget( parent, name )
{ {
TQWidget * tqparentWidget = this; TQWidget * parentWidget = this;
TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget, TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget,
0, KDialog::spacingHint()); 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() ); m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed ); secondLayout->addWidget( m_autoEmbed );
// The order of those two items is very important. If you change it, fix typeslistitem.cpp ! // The order of those two items is very important. If you change it, fix typeslistitem.cpp !

@ -142,12 +142,12 @@ void ConfigModule::runAsRoot()
// create an embed widget that will embed the // create an embed widget that will embed the
// kcmshell running as root // kcmshell running as root
_embedLayout = new TQVBoxLayout(_module->tqparentWidget()); _embedLayout = new TQVBoxLayout(_module->parentWidget());
_embedFrame = new TQVBox( _module->tqparentWidget() ); _embedFrame = new TQVBox( _module->parentWidget() );
_embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
TQPalette pal( red ); TQPalette pal( red );
pal.setColor( TQColorGroup::Background, pal.setColor( TQColorGroup::Background,
_module->tqparentWidget()->tqcolorGroup().background() ); _module->parentWidget()->tqcolorGroup().background() );
_embedFrame->setPalette( pal ); _embedFrame->setPalette( pal );
_embedFrame->setLineWidth( 2 ); _embedFrame->setLineWidth( 2 );
_embedFrame->setMidLineWidth( 2 ); _embedFrame->setMidLineWidth( 2 );

@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
if(!url->isLocalFile()) { if(!url->isLocalFile()) {
pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
"kdm/pics/" + url->fileName()); "kdm/pics/" + url->fileName());
KIO::NetAccess::copy(*url, pixurl, tqparentWidget()); KIO::NetAccess::copy(*url, pixurl, parentWidget());
istmp = true; istmp = true;
} else { } else {
pixurl = *url; pixurl = *url;
@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
// By now url should be "file:/..." // By now url should be "file:/..."
if (!setLogo(pixurl.path())) { 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" TQString msg = i18n("There was an error loading the image:\n"
"%1\n" "%1\n"
"It will not be saved.") "It will not be saved.")

@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
KURL *url = decodeImgDrop(e, this); KURL *url = decodeImgDrop(e, this);
if (url) { if (url) {
TQString pixpath; TQString pixpath;
KIO::NetAccess::download(*url, pixpath, tqparentWidget()); KIO::NetAccess::download(*url, pixpath, parentWidget());
changeUserPix( pixpath ); changeUserPix( pixpath );
KIO::NetAccess::removeTempFile(pixpath); KIO::NetAccess::removeTempFile(pixpath);
delete url; delete url;

@ -165,17 +165,17 @@ void CFontViewPart::timeout()
if(Misc::root()) if(Misc::root())
{ {
destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); 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 else
{ {
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); 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; itsShowInstallButton=false;
else else
{ {
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); 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)); 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... // 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) for(it=urls.begin(); it!=end; ++it)
{ {
destUrl=getDest(*it, KMessageBox::No==resp); 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)); items.append(itsPreview->engine().getName(m_url));
Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine()); Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine());
} }
} }

@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget )
// yuck, here goes. // yuck, here goes.
QVBox *newWidget = new QVBox( this ); QVBox *newWidget = new QVBox( this );
if ( widget->tqparentWidget() != mainWidget ) { if ( widget->parentWidget() != mainWidget ) {
widget->reparent( newWidget, 0, QPoint(0,0) ); widget->reparent( newWidget, 0, QPoint(0,0) );
} else { } else {
newWidget->insertChild( widget ); newWidget->insertChild( widget );

@ -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 ); x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs );
create( w ); create( w );
#endif #endif

@ -33,7 +33,7 @@
typedef KParts::GenericFactory<PrintPart> PrintPartFactory; typedef KParts::GenericFactory<PrintPart> PrintPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, 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, TQObject *parent, const char *name,
const TQStringList & /*args*/ ) const TQStringList & /*args*/ )
: KParts::ReadOnlyPart(parent, name) : KParts::ReadOnlyPart(parent, name)
@ -42,7 +42,7 @@ PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ ,
instance()->iconLoader()->addAppDir("kdeprint"); instance()->iconLoader()->addAppDir("kdeprint");
m_extension = new PrintPartExtension(this); 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->setFocusPolicy(TQ_ClickFocus);
m_view->enableToolbar(false); m_view->enableToolbar(false);
setWidget(m_view); setWidget(m_view);

@ -31,7 +31,7 @@ class PrintPart : public KParts::ReadOnlyPart
{ {
Q_OBJECT Q_OBJECT
public: public:
PrintPart(TQWidget *tqparentWidget, const char *widgetName, PrintPart(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const TQStringList & ); const TQStringList & );
virtual ~PrintPart(); virtual ~PrintPart();

@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID)
m_commands[m_current] = m_command->text(); m_commands[m_current] = m_command->text();
m_current = ID; m_current = ID;
if (ID == EFAX_ID) if (ID == EFAX_ID)
m_device->tqparentWidget()->show(); m_device->parentWidget()->show();
else else
m_device->tqparentWidget()->hide(); m_device->parentWidget()->hide();
if (ID == HYLAFAX_ID) if (ID == HYLAFAX_ID)
m_server->tqparentWidget()->show(); m_server->parentWidget()->show();
else else
m_server->tqparentWidget()->hide(); m_server->parentWidget()->hide();
m_command->setText(m_commands[m_current]); m_command->setText(m_commands[m_current]);
} }

@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *)
} }
else else
{ {
KWin::activateWindow(m_logview->tqparentWidget()->winId()); KWin::activateWindow(m_logview->parentWidget()->winId());
} }
} }
@ -605,7 +605,7 @@ void FaxCtrl::slotCloseLog()
TQTextEdit *view = m_logview; TQTextEdit *view = m_logview;
m_logview = 0; m_logview = 0;
if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
delete view->tqparentWidget(); delete view->parentWidget();
kdDebug() << "slotClose()" << endl; kdDebug() << "slotClose()" << endl;
} }
} }

@ -558,7 +558,7 @@ int Minicli::runCommand()
case KURIFilterData::HELP: case KURIFilterData::HELP:
{ {
// No need for kfmclient, KRun does it all (David) // 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; return 0;
} }
case KURIFilterData::EXECUTABLE: case KURIFilterData::EXECUTABLE:
@ -570,7 +570,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application") if (service && service->isValid() && service->type() == "Application")
{ {
notifyServiceStarted(service); notifyServiceStarted(service);
KRun::run(*service, KURL::List(), tqparentWidget(), asn ); KRun::run(*service, KURL::List(), parentWidget(), asn );
return 0; return 0;
} }
} }
@ -605,7 +605,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application") if (service && service->isValid() && service->type() == "Application")
{ {
notifyServiceStarted(service); notifyServiceStarted(service);
KRun::run(*service, KURL::List(), tqparentWidget(), asn ); KRun::run(*service, KURL::List(), parentWidget(), asn );
return 0; return 0;
} }
@ -613,7 +613,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application") if (service && service->isValid() && service->type() == "Application")
{ {
notifyServiceStarted(service); notifyServiceStarted(service);
KRun::run(*service, KURL::List(), tqparentWidget(), asn ); KRun::run(*service, KURL::List(), parentWidget(), asn );
return 0; 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; return 0;
else else
{ {

@ -74,7 +74,7 @@ FDialog::adjustGeometry()
adjustSize(); adjustSize();
} }
if (tqparentWidget()) if (parentWidget())
return; return;
TQRect grt( rect() ); TQRect grt( rect() );

@ -614,7 +614,7 @@ KdmItem::setFixedLayout( const TQDomNode &node )
} }
TQWidget * TQWidget *
KdmItem::tqparentWidget() const KdmItem::parentWidget() const
{ {
if (myWidget) if (myWidget)
return myWidget; return myWidget;
@ -623,7 +623,7 @@ KdmItem::tqparentWidget() const
if (tqparent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) if (tqparent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING))
return (TQWidget*)parent(); return (TQWidget*)parent();
return ((KdmItem*)parent())->tqparentWidget(); return ((KdmItem*)parent())->parentWidget();
} }
#include "kdmitem.moc" #include "kdmitem.moc"

@ -163,7 +163,7 @@ public:
bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; } bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; }
TQRect rect() const { return area; } TQRect rect() const { return area; }
TQWidget *tqparentWidget() const; TQWidget *parentWidget() const;
TQString getId() const { return id; } TQString getId() const { return id; }
signals: signals:

@ -115,7 +115,7 @@ KdmLabel::setTextInt( const TQString &txt)
myAccel = 0; myAccel = 0;
if (cAccel != -1) { if (cAccel != -1) {
cText.remove('&'); cText.remove('&');
myAccel = new TQAccel(tqparentWidget()); myAccel = new TQAccel(parentWidget());
myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode()); myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode());
connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
} }

@ -62,7 +62,7 @@ public:
/* /*
* Gives a tqsizeHint to the widget (parent size) * 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 * Takes a shot of the current widget

@ -94,7 +94,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
kg_debug("KPamGreeter constructed\n"); kg_debug("KPamGreeter constructed\n");
m_tqparentWidget = parent; m_parentWidget = parent;
KdmItem *user_entry = 0, *pw_entry = 0; KdmItem *user_entry = 0, *pw_entry = 0;
int line = 0; int line = 0;
@ -314,7 +314,7 @@ KPamGreeter::textMessage( const char *text, bool err )
return false; return false;
if (getLayoutItem()) { 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); 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()) { else if (state >= authEdit.size()) {
if (getLayoutItem()) { 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); getLayoutItem()->addWidget(label, state+1, 0, 0);
kg_debug("added label widget to layout"); kg_debug("added label widget to layout");
} }
@ -361,9 +361,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
KDMPasswordEdit* passwdEdit; KDMPasswordEdit* passwdEdit;
if (echoMode == -1) if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( m_tqparentWidget ); passwdEdit = new KDMPasswordEdit( m_parentWidget );
else else
passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget); passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget);
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) ); TQT_SLOT(slotActivity()) );
connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );

@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
TQLabel *loginLabel; TQLabel *loginLabel;
TQValueList<TQLabel*> authLabel; TQValueList<TQLabel*> authLabel;
KLineEdit *loginEdit; KLineEdit *loginEdit;
TQWidget* m_tqparentWidget; TQWidget* m_parentWidget;
TQValueList<KPasswordEdit*> authEdit; TQValueList<KPasswordEdit*> authEdit;
KSimpleConfig *stsFile; KSimpleConfig *stsFile;
KdmThemer *m_themer; KdmThemer *m_themer;

@ -33,7 +33,7 @@ class KonqDirPart;
typedef KParts::GenericFactory<KFindPart> KFindFactory; typedef KParts::GenericFactory<KFindPart> KFindFactory;
K_EXPORT_COMPONENT_FACTORY( libkfindpart, 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 , TQObject *parent, const char *name ,
const TQStringList & /*args*/ ) const TQStringList & /*args*/ )
: KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/ : KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/
@ -43,7 +43,7 @@ KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName,
setBrowserExtension( new KonqDirPartBrowserExtension( this ) ); setBrowserExtension( new KonqDirPartBrowserExtension( this ) );
kdDebug() << "KFindPart::KFindPart " << this << endl; kdDebug() << "KFindPart::KFindPart " << this << endl;
m_kfindWidget = new Kfind( tqparentWidget, widgetName ); m_kfindWidget = new Kfind( parentWidget, widgetName );
m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height()); m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height());
const KFileItem *item = ((KonqDirPart*)parent)->currentItem(); const KFileItem *item = ((KonqDirPart*)parent)->currentItem();
kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl; kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl;

@ -44,7 +44,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
Q_OBJECT Q_OBJECT
Q_PROPERTY( bool showsResult READ showsResult ) Q_PROPERTY( bool showsResult READ showsResult )
public: public:
KFindPart( TQWidget * tqparentWidget, const char *widgetName, KFindPart( TQWidget * parentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList & /*args*/ ); TQObject *parent, const char *name, const TQStringList & /*args*/ );
virtual ~KFindPart(); virtual ~KFindPart();

@ -215,7 +215,7 @@ void KfindWindow::saveResults()
TQFile file(filename); TQFile file(filename);
if ( !file.open(IO_WriteOnly) ) if ( !file.open(IO_WriteOnly) )
KMessageBox::error(tqparentWidget(), KMessageBox::error(parentWidget(),
i18n("Unable to save results.")); i18n("Unable to save results."));
else { else {
TQTextStream stream( &file ); TQTextStream stream( &file );
@ -255,7 +255,7 @@ void KfindWindow::saveResults()
} }
file.close(); file.close();
KMessageBox::information(tqparentWidget(), KMessageBox::information(parentWidget(),
i18n("Results were saved to file\n")+ i18n("Results were saved to file\n")+
filename); filename);
} }
@ -287,7 +287,7 @@ void KfindWindow::deleteFiles()
{ {
TQString tmp = i18n("Do you really want to delete the selected file?", TQString tmp = i18n("Do you really want to delete the selected file?",
"Do you really want to delete the %n selected files?",selectedItems().count()); "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; return;
// Iterate on all selected elements // Iterate on all selected elements

@ -20,9 +20,9 @@
using namespace KHC; 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 ) 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); setJScriptEnabled(false);
setJavaEnabled(false); setJavaEnabled(false);

@ -20,7 +20,7 @@ class View : public KHTMLPart
{ {
Q_OBJECT Q_OBJECT
public: public:
View( TQWidget *tqparentWidget, const char *widgetName, View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
KActionCollection *col ); KActionCollection *col );

@ -487,12 +487,12 @@ void MenuEmbed::setMinimumSize( int w, int h )
void MenuEmbed::setBackground() void MenuEmbed::setBackground()
{ {
const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); const TQPixmap *pbg = parentWidget()->backgroundPixmap();
if (pbg) if (pbg)
{ {
TQPixmap bg(width(), height()); TQPixmap bg(width(), height());
bg.fill(tqparentWidget(), pos()); bg.fill(parentWidget(), pos());
setPaletteBackgroundPixmap(bg); setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin); setBackgroundOrigin(WidgetOrigin);
} }

@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet
signals: signals:
void tqlayoutChanged(); void layoutChanged();
protected slots: protected slots:

@ -1067,12 +1067,12 @@ void TrayEmbed::getIconSize(int defaultIconSize)
void TrayEmbed::setBackground() void TrayEmbed::setBackground()
{ {
const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); const TQPixmap *pbg = parentWidget()->backgroundPixmap();
if (pbg) if (pbg)
{ {
TQPixmap bg(width(), height()); TQPixmap bg(width(), height());
bg.fill(tqparentWidget(), pos()); bg.fill(parentWidget(), pos());
setPaletteBackgroundPixmap(bg); setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin); setBackgroundOrigin(WidgetOrigin);
} }

@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev)
TQPainter p( &offscreen ); TQPainter p( &offscreen );
paintBackground( &p, TQRect(TQPoint(0,0),size()) ); paintBackground( &p, TQRect(TQPoint(0,0),size()) );
TQWidget::resizeEvent(ev); TQWidget::resizeEvent(ev);
emit tqlayoutChanged(); emit layoutChanged();
} }

@ -251,7 +251,7 @@ signals:
void directionChanged(); void directionChanged();
/** Emitted when kasbar wants to resize. This happens when a new window is added. */ /** 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. */ /** Emitted when the item size is changed. */
void itemSizeChanged( int ); void itemSizeChanged( int );

@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
// setBackgroundMode( NoBackground ); // setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name ); 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) ) ); connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );
kasbar->setConfig( config() ); kasbar->setConfig( config() );

@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent )
setGroupItem( true ); setGroupItem( true );
setText( i18n("Group") ); setText( i18n("Group") );
connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) ); connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) );
connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) ); connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );
connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
} }

@ -354,7 +354,7 @@ void AppletContainer::slotDelayedDestruct()
delete this; delete this;
} }
void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a) void AppletContainer::alignmentChange(KPanelExtension::Alignment a)
{ {
if (!_applet) if (!_applet)
{ {

@ -84,7 +84,7 @@ public slots:
protected: protected:
virtual void doLoadConfiguration( KConfigGroup& ); virtual void doLoadConfiguration( KConfigGroup& );
virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
virtual void tqalignmentChange(KPanelExtension::Alignment a); virtual void alignmentChange(KPanelExtension::Alignment a);
virtual TQPopupMenu* createOpMenu(); virtual TQPopupMenu* createOpMenu();

@ -118,7 +118,7 @@ void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a)
} }
_tqalignment = a; _tqalignment = a;
tqalignmentChange(a); alignmentChange(a);
} }
TQPopupMenu* BaseContainer::opMenu() TQPopupMenu* BaseContainer::opMenu()

@ -111,7 +111,7 @@ protected:
virtual void doLoadConfiguration( KConfigGroup& ) {} virtual void doLoadConfiguration( KConfigGroup& ) {}
virtual void doSaveConfiguration( KConfigGroup&, virtual void doSaveConfiguration( KConfigGroup&,
bool /* layoutOnly */ ) const {} bool /* layoutOnly */ ) const {}
virtual void tqalignmentChange(KPanelExtension::Alignment) {} virtual void alignmentChange(KPanelExtension::Alignment) {}
virtual TQPopupMenu* createOpMenu() = 0; virtual TQPopupMenu* createOpMenu() = 0;
TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } TQPopupMenu *appletOpMenu() const { return _appletOpMnu; }

@ -293,7 +293,7 @@ void ExtensionContainer::readConfig()
} }
positionChange(position()); positionChange(position());
tqalignmentChange(tqalignment()); alignmentChange(tqalignment());
setSize(static_cast<KPanelExtension::Size>(m_settings.size()), setSize(static_cast<KPanelExtension::Size>(m_settings.size()),
m_settings.customSize()); m_settings.customSize());
@ -471,7 +471,7 @@ void ExtensionContainer::moveMe()
KPanelExtension::Right, KPanelExtension::Right,
KPanelExtension::Top, KPanelExtension::Top,
KPanelExtension::Bottom }; KPanelExtension::Bottom };
KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop, KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop,
KPanelExtension::Center, KPanelExtension::Center,
KPanelExtension::RightBottom }; KPanelExtension::RightBottom };
@ -494,8 +494,8 @@ void ExtensionContainer::moveMe()
// they don't get their "you're changing position" signals through // they don't get their "you're changing position" signals through
// heightForWidth/widthForHeight // heightForWidth/widthForHeight
rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i], rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i],
tqalignments[j], s), alignments[j], s),
s, positions[i], tqalignments[j])); s, positions[i], alignments[j]));
} }
} }
} }
@ -1368,7 +1368,7 @@ void ExtensionContainer::leaveEvent(TQEvent*)
maybeStartAutoHideTimer(); maybeStartAutoHideTimer();
} }
void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a) void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a)
{ {
if (!m_extension) if (!m_extension)
{ {

@ -159,7 +159,7 @@ private:
int XineramaScreen, const TQSize &s, TQRect workArea, int XineramaScreen, const TQSize &s, TQRect workArea,
bool autohidden = false, UserHidden userHidden = Unhidden) const; bool autohidden = false, UserHidden userHidden = Unhidden) const;
void positionChange(KPanelExtension::Position p); void positionChange(KPanelExtension::Position p);
void tqalignmentChange(KPanelExtension::Alignment a); void alignmentChange(KPanelExtension::Alignment a);
void xineramaScreenChange(int /*XineramaScreen*/) {} void xineramaScreenChange(int /*XineramaScreen*/) {}
int arrangeHideButtons(); int arrangeHideButtons();
int setupBorderSpace(); int setupBorderSpace();

@ -762,7 +762,7 @@ void ItemView::slotMoveContent()
TQListViewItemIterator it( this ); TQListViewItemIterator it( this );
while ( it.current() ) { while ( it.current() ) {
if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) {
it.current()->tqinvalidateHeight(); it.current()->invalidateHeight();
item_height += it.current()->totalHeight(); item_height += it.current()->totalHeight();
} }
++it; ++it;

@ -495,7 +495,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
if(raiseWidget) if(raiseWidget)
break; break;
if(receiver->isWidgetType()) if(receiver->isWidgetType())
receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true)); receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
else else
break; break;
} }
@ -1556,7 +1556,7 @@ bool KMenu::runCommand()
case KURIFilterData::HELP: case KURIFilterData::HELP:
{ {
// No need for kfmclient, KRun does it all (David) // 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; return false;
} }
case KURIFilterData::EXECUTABLE: case KURIFilterData::EXECUTABLE:
@ -2715,7 +2715,7 @@ void KMenu::slotStartURL(const TQString& u)
} }
kapp->propagateSessionManager(); 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())); data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText()));
} }
(void) new KRun( data.uri(), tqparentWidget()); (void) new KRun( data.uri(), parentWidget());
} }
} }

@ -130,7 +130,7 @@ TQSize KickoffTabBar::tqsizeHint() const
void KickoffTabBar::layoutTabs() void KickoffTabBar::layoutTabs()
{ {
TQTabBar::tqlayoutTabs(); TQTabBar::layoutTabs();
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;

@ -818,12 +818,12 @@ void TaskBar::reLayout()
void TaskBar::setViewportBackground() void TaskBar::setViewportBackground()
{ {
const TQPixmap *bg = tqparentWidget()->backgroundPixmap(); const TQPixmap *bg = parentWidget()->backgroundPixmap();
if (bg) if (bg)
{ {
TQPixmap pm(tqparentWidget()->size()); TQPixmap pm(parentWidget()->size());
pm.fill(tqparentWidget(), pos() + viewport()->pos()); pm.fill(parentWidget(), pos() + viewport()->pos());
viewport()->setPaletteBackgroundPixmap(pm); viewport()->setPaletteBackgroundPixmap(pm);
viewport()->setBackgroundOrigin(WidgetOrigin); viewport()->setBackgroundOrigin(WidgetOrigin);
} }

@ -50,10 +50,10 @@ KManPartFactory::~KManPartFactory()
delete s_about; 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 & ) const char* name, const char* /*className*/,const TQStringList & )
{ {
KManPart* part = new KManPart(tqparentWidget, name ); KManPart* part = new KManPart(parentWidget, name );
return part; return part;
} }

@ -44,7 +44,7 @@ class KManPartFactory: public KParts::Factory
KManPartFactory( TQObject * parent = 0, const char * name = 0 ); KManPartFactory( TQObject * parent = 0, const char * name = 0 );
virtual ~KManPartFactory(); 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, TQObject* parent, const char* name, const char * classname,
const TQStringList &args); const TQStringList &args);

@ -1017,9 +1017,9 @@ bool KlipperWidget::ignoreClipboardChanges() const
if ( tqfocusWidget ) if ( tqfocusWidget )
{ {
if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) || if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
(tqfocusWidget->tqparentWidget() && (tqfocusWidget->parentWidget() &&
tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
tqfocusWidget->tqparentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) ) tqfocusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
{ {
return true; return true;
} }

@ -50,15 +50,15 @@ KonqAboutPageFactory::~KonqAboutPageFactory()
s_plugins_html = 0; 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, TQObject *parent, const char *name,
const char *, const TQStringList & ) const char *, const TQStringList & )
{ {
//KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( tqparentWidget ); //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget );
//if ( !frame ) return 0; //if ( !frame ) return 0;
return new KonqAboutPage( //frame->childView()->mainWindow(), return new KonqAboutPage( //frame->childView()->mainWindow(),
tqparentWidget, widgetName, parent, name ); parentWidget, widgetName, parent, name );
} }
TQString KonqAboutPageFactory::loadFile( const TQString& file ) TQString KonqAboutPageFactory::loadFile( const TQString& file )
@ -427,9 +427,9 @@ TQString KonqAboutPageFactory::plugins()
KonqAboutPage::KonqAboutPage( //KonqMainWindow * KonqAboutPage::KonqAboutPage( //KonqMainWindow *
TQWidget *tqparentWidget, const char *widgetName, TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name ) TQObject *parent, const char *name )
: KHTMLPart( tqparentWidget, widgetName, parent, name, BrowserViewGUI ) : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
{ {
//m_mainWindow = mainWindow; //m_mainWindow = mainWindow;
TQTextCodec* codec = KGlobal::locale()->codecForEncoding(); TQTextCodec* codec = KGlobal::locale()->codecForEncoding();

@ -13,7 +13,7 @@ public:
KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 ); KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 );
virtual ~KonqAboutPageFactory(); 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, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
@ -37,7 +37,7 @@ class KonqAboutPage : public KHTMLPart
Q_OBJECT Q_OBJECT
public: public:
KonqAboutPage( /*KonqMainWindow *mainWindow,*/ KonqAboutPage( /*KonqMainWindow *mainWindow,*/
TQWidget *tqparentWidget, const char *widgetName, TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name ); TQObject *parent, const char *name );
~KonqAboutPage(); ~KonqAboutPage();

@ -72,13 +72,13 @@ public:
s_defaultViewProps = 0; 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 ) TQObject *parent, const char *name, const char*, const TQStringList &args )
{ {
if( args.count() < 1 ) if( args.count() < 1 )
kdWarning() << "KonqKfmIconView: Missing Parameter" << endl; 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; return obj;
} }
@ -164,7 +164,7 @@ void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter )
m_iconView->m_nameFilter = 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 ) : KonqDirPart( parent, name )
, m_bNeedSetCurrentItem( false ) , m_bNeedSetCurrentItem( false )
, m_pEnsureVisible( 0 ) , m_pEnsureVisible( 0 )
@ -179,7 +179,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co
// Create a properties instance for this view // Create a properties instance for this view
m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() ); m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() );
m_pIconView = new KonqIconViewWidget( tqparentWidget, "qiconview" ); m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
m_pIconView->initConfig( true ); m_pIconView->initConfig( true );
connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()),

@ -51,7 +51,7 @@ public:
enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date }; 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 ~KonqKfmIconView();
virtual const KFileItem * currentItem(); virtual const KFileItem * currentItem();

@ -82,7 +82,7 @@ void CmdHistory::slotCommandExecuted(KCommand *k) {
CurrentMgr::self()->notifyManagers(bk.toGroup()); CurrentMgr::self()->notifyManagers(bk.toGroup());
// sets currentItem to something sensible // sets currentItem to something sensible
// if the currentItem was tqinvalidated by executing // if the currentItem was invalidated by executing
// CreateCommand or DeleteManyCommand // CreateCommand or DeleteManyCommand
// otherwise does nothing // otherwise does nothing
// sensible is either a already selected item or cmd->currentAddress() // sensible is either a already selected item or cmd->currentAddress()

@ -45,7 +45,7 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args
m_args << TQString::tqfromLatin1( "Browser/View" ); 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 ) TQObject * parent, const char *name )
{ {
if ( !m_factory ) if ( !m_factory )
@ -56,18 +56,18 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const c
if ( m_factory->inherits( "KParts::Factory" ) ) if ( m_factory->inherits( "KParts::Factory" ) )
{ {
if ( m_createBrowser ) if ( m_createBrowser )
obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "Browser/View", m_args ); obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "Browser/View", m_args );
if ( !obj ) if ( !obj )
obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args ); obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args );
} }
else else
{ {
if ( m_createBrowser ) 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 ) 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" ) ) if ( !obj->inherits( "KParts::ReadOnlyPart" ) )

@ -52,7 +52,7 @@ public:
return *this; return *this;
} }
KParts::ReadOnlyPart *create( TQWidget *tqparentWidget, const char *widgetName, KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name ); TQObject *parent, const char *name );
bool isNull() const { return m_factory ? false : true; } bool isNull() const { return m_factory ? false : true; }

@ -32,8 +32,8 @@
#include <tqstringlist.h> #include <tqstringlist.h>
KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
TQWidget* tqparentWidget) TQWidget* parentWidget)
: KonqBaseListViewWidget(parent, tqparentWidget) : KonqBaseListViewWidget(parent, parentWidget)
{ {
m_metaInfoJob = 0; m_metaInfoJob = 0;

@ -37,7 +37,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
// friend class KonqTextViewItem; // friend class KonqTextViewItem;
Q_OBJECT Q_OBJECT
public: public:
KonqInfoListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
~KonqInfoListViewWidget(); ~KonqInfoListViewWidget();
const TQStringList columnKeys() {return m_columnKeys;} const TQStringList columnKeys() {return m_columnKeys;}

@ -63,12 +63,12 @@ KonqListViewFactory::~KonqListViewFactory()
s_defaultViewProps = 0; 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 ) if( args.count() < 1 )
kdWarning() << "KonqListView: Missing Parameter" << endl; 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; return obj;
} }
@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType()
KonqOperations::editMimeType( items.first()->mimetype() ); 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 ) : KonqDirPart( parent, name )
,m_headerTimer(0) ,m_headerTimer(0)
{ {
@ -234,25 +234,25 @@ KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const ch
{ {
kdDebug(1202) << "Creating KonqTextViewWidget" << endl; kdDebug(1202) << "Creating KonqTextViewWidget" << endl;
xmlFile = "konq_textview.rc"; xmlFile = "konq_textview.rc";
m_pListView=new KonqTextViewWidget(this, tqparentWidget); m_pListView=new KonqTextViewWidget(this, parentWidget);
} }
else if (mode=="MixedTree") else if (mode=="MixedTree")
{ {
kdDebug(1202) << "Creating KonqTreeViewWidget" << endl; kdDebug(1202) << "Creating KonqTreeViewWidget" << endl;
xmlFile = "konq_treeview.rc"; xmlFile = "konq_treeview.rc";
m_pListView=new KonqTreeViewWidget(this,tqparentWidget); m_pListView=new KonqTreeViewWidget(this,parentWidget);
} }
else if (mode=="InfoListView") else if (mode=="InfoListView")
{ {
kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl; kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl;
xmlFile = "konq_infolistview.rc"; xmlFile = "konq_infolistview.rc";
m_pListView=new KonqInfoListViewWidget(this,tqparentWidget); m_pListView=new KonqInfoListViewWidget(this,parentWidget);
} }
else else
{ {
kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl; kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl;
xmlFile = "konq_detailedlistview.rc"; xmlFile = "konq_detailedlistview.rc";
m_pListView = new KonqBaseListViewWidget( this, tqparentWidget); m_pListView = new KonqBaseListViewWidget( this, parentWidget);
} }
setWidget( m_pListView ); setWidget( m_pListView );
setDirLister( m_pListView->m_dirLister ); setDirLister( m_pListView->m_dirLister );

@ -44,7 +44,7 @@ public:
KonqListViewFactory(); KonqListViewFactory();
virtual ~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 KInstance *instance();
static KonqPropsView *defaultViewProps(); static KonqPropsView *defaultViewProps();
@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart
Q_OBJECT Q_OBJECT
Q_PROPERTY( bool supportsUndo READ supportsUndo ) Q_PROPERTY( bool supportsUndo READ supportsUndo )
public: 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 ~KonqListView();
virtual const KFileItem * currentItem(); virtual const KFileItem * currentItem();

@ -211,7 +211,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
{ {
setup(); setup();
widthChanged( column ); widthChanged( column );
tqinvalidateHeight(); invalidateHeight();
return; return;
} }

@ -84,8 +84,8 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio
} }
KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget) KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget)
: KListView(tqparentWidget) : KListView(parentWidget)
,sortedByColumn(0) ,sortedByColumn(0)
,m_pBrowserView(parent) ,m_pBrowserView(parent)
,m_dirLister(new KDirLister( true /*m_showIcons==false*/)) ,m_dirLister(new KDirLister( true /*m_showIcons==false*/))

@ -82,7 +82,7 @@ class KonqBaseListViewWidget : public KListView
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
virtual ~KonqBaseListViewWidget(); virtual ~KonqBaseListViewWidget();
unsigned int NumberOfAtoms; unsigned int NumberOfAtoms;

@ -29,8 +29,8 @@
#include <assert.h> #include <assert.h>
KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget ) KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget )
:KonqBaseListViewWidget(parent,tqparentWidget) :KonqBaseListViewWidget(parent,parentWidget)
{ {
kdDebug(1202) << "+KonqTextViewWidget" << endl; kdDebug(1202) << "+KonqTextViewWidget" << endl;
m_filenameColumn=1; m_filenameColumn=1;

@ -34,7 +34,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget
friend class KonqTextViewItem; friend class KonqTextViewItem;
Q_OBJECT Q_OBJECT
public: public:
KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
~KonqTextViewWidget(); ~KonqTextViewWidget();
virtual bool isExecuteArea( const TQPoint& point ); virtual bool isExecuteArea( const TQPoint& point );

@ -27,8 +27,8 @@
template class TQDict<KonqListViewDir>; template class TQDict<KonqListViewDir>;
KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget) KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget)
: KonqBaseListViewWidget( parent, tqparentWidget ) : KonqBaseListViewWidget( parent, parentWidget )
{ {
kdDebug(1202) << "+KonqTreeViewWidget" << endl; kdDebug(1202) << "+KonqTreeViewWidget" << endl;

@ -34,7 +34,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
Q_OBJECT Q_OBJECT
public: public:
KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
virtual ~KonqTreeViewWidget(); virtual ~KonqTreeViewWidget();
virtual bool openURL( const KURL &url ); virtual bool openURL( const KURL &url );

@ -22,7 +22,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <kaccelmanager.h> #include <kaccelmanager.h>
KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName, KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, bool universalMode ) TQObject *parent, const char *name, bool universalMode )
: KParts::ReadOnlyPart(parent, name),KonqSidebarIface() : KParts::ReadOnlyPart(parent, name),KonqSidebarIface()
{ {
@ -30,7 +30,7 @@ KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName,
setInstance( KonqSidebarFactory::instance() ); setInstance( KonqSidebarFactory::instance() );
m_extension = 0; m_extension = 0;
// this should be your custom internal widget // 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" ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
this, TQT_SIGNAL(started(KIO::Job*))); this, TQT_SIGNAL(started(KIO::Job*)));
@ -97,12 +97,12 @@ KonqSidebarFactory::~KonqSidebarFactory()
s_about = 0L; 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, TQObject *parent, const char *name,
const char * /*classname*/, const TQStringList &args ) const char * /*classname*/, const TQStringList &args )
{ {
// Create an instance of our Part // 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 // See if we are to be read-write or not
// if (TQCString(classname) == "KParts::ReadOnlyPart") // if (TQCString(classname) == "KParts::ReadOnlyPart")

@ -79,7 +79,7 @@ public:
/** /**
* Default constructor * Default constructor
*/ */
KonqSidebar(TQWidget *tqparentWidget, const char *widgetName, KonqSidebar(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,bool universalMode); TQObject *parent, const char *name,bool universalMode);
/** /**
@ -116,7 +116,7 @@ class KonqSidebarFactory : public KParts::Factory
public: public:
KonqSidebarFactory(); KonqSidebarFactory();
virtual ~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, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static KInstance* instance();

@ -1043,18 +1043,18 @@ void Sidebar_Widget::showHidePage(int page)
void Sidebar_Widget::collapseExpandSidebar() void Sidebar_Widget::collapseExpandSidebar()
{ {
if (!tqparentWidget()) if (!parentWidget())
return; // Can happen during destruction return; // Can happen during destruction
if (m_visibleViews.count()==0) if (m_visibleViews.count()==0)
{ {
m_somethingVisible = false; m_somethingVisible = false;
tqparentWidget()->setMaximumWidth(tqminimumSizeHint().width()); parentWidget()->setMaximumWidth(tqminimumSizeHint().width());
updateGeometry(); updateGeometry();
emit panelHasBeenExpanded(false); emit panelHasBeenExpanded(false);
} else { } else {
m_somethingVisible = true; m_somethingVisible = true;
tqparentWidget()->setMaximumWidth(32767); parentWidget()->setMaximumWidth(32767);
updateGeometry(); updateGeometry();
emit panelHasBeenExpanded(true); emit panelHasBeenExpanded(true);
} }

@ -114,8 +114,8 @@ public:
}; };
KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path ) KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
: KListView( tqparentWidget ), : KListView( parentWidget ),
m_currentTopLevelItem( 0 ), m_currentTopLevelItem( 0 ),
m_toolTip( this ), m_toolTip( this ),
m_scrollingLocked( false ), m_scrollingLocked( false ),

@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
{ {
Q_OBJECT Q_OBJECT
public: 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(); virtual ~KonqSidebarTree();
void followURL( const KURL &url ); void followURL( const KURL &url );

@ -1184,8 +1184,8 @@ void TEWidget::propagateSize()
{ {
setSize(columns, lines); setSize(columns, lines);
TQFrame::setFixedSize(tqsizeHint()); TQFrame::setFixedSize(tqsizeHint());
tqparentWidget()->adjustSize(); parentWidget()->adjustSize();
tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint()); parentWidget()->setFixedSize(parentWidget()->tqsizeHint());
return; return;
} }
if (image) if (image)

@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory()
s_aboutData = 0; 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, TQObject *parent, const char *name, const char *classname,
const TQStringList&) const TQStringList&)
{ {
// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl; // kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname); KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
return obj; return obj;
} }
@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance()
#define DEFAULT_HISTORY_SIZE 1000 #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) : KParts::ReadOnlyPart(parent, name)
,te(0) ,te(0)
,se(0) ,se(0)
@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb
,m_histSize(DEFAULT_HISTORY_SIZE) ,m_histSize(DEFAULT_HISTORY_SIZE)
,m_runningShell( false ) ,m_runningShell( false )
{ {
tqparentWidget=_tqparentWidget; parentWidget=_parentWidget;
setInstance(konsoleFactory::instance()); setInstance(konsoleFactory::instance());
m_extension = new konsoleBrowserExtension(this); m_extension = new konsoleBrowserExtension(this);
@ -137,7 +137,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb
const char* shell = getenv("SHELL"); const char* shell = getenv("SHELL");
if (shell == NULL || *shell == '\0') shell = "/bin/sh"; if (shell == NULL || *shell == '\0') shell = "/bin/sh";
eargs.append(shell); eargs.append(shell);
te = new TEWidget(tqparentWidget,widgetName); te = new TEWidget(parentWidget,widgetName);
te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget
setWidget(TQT_TQWIDGET(te)); setWidget(TQT_TQWIDGET(te));
@ -317,13 +317,13 @@ void konsolePart::makeGUI()
if (!kapp->authorizeKAction("konsole_rmb")) if (!kapp->authorizeKAction("konsole_rmb"))
return; return;
actions = new KActionCollection( (KMainWindow*)tqparentWidget ); actions = new KActionCollection( (KMainWindow*)parentWidget );
settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget ); settingsActions = new KActionCollection( (KMainWindow*)parentWidget );
// Send Signal Menu ------------------------------------------------------------- // Send Signal Menu -------------------------------------------------------------
if (kapp->authorizeKAction("send_signal")) 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( "&Suspend Task" ) + " (STOP)", SIGSTOP);
m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT); m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT);
m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP); m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP);
@ -338,7 +338,7 @@ void konsolePart::makeGUI()
// Settings Menu ---------------------------------------------------------------- // Settings Menu ----------------------------------------------------------------
if (kapp->authorizeKAction("settings")) if (kapp->authorizeKAction("settings"))
{ {
m_options = new KPopupMenu((KMainWindow*)tqparentWidget); m_options = new KPopupMenu((KMainWindow*)parentWidget);
// Scrollbar // Scrollbar
selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this, selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
@ -379,7 +379,7 @@ void konsolePart::makeGUI()
// Keyboard Options Menu --------------------------------------------------- // Keyboard Options Menu ---------------------------------------------------
if (kapp->authorizeKAction("keyboard")) if (kapp->authorizeKAction("keyboard"))
{ {
m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget); m_keytab = new KPopupMenu((KMainWindow*)parentWidget);
m_keytab->setCheckable(true); m_keytab->setCheckable(true);
connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
@ -388,7 +388,7 @@ void konsolePart::makeGUI()
// Schema Options Menu ----------------------------------------------------- // Schema Options Menu -----------------------------------------------------
if (kapp->authorizeKAction("schema")) if (kapp->authorizeKAction("schema"))
{ {
m_schema = new KPopupMenu((KMainWindow*)tqparentWidget); m_schema = new KPopupMenu((KMainWindow*)parentWidget);
m_schema->setCheckable(true); m_schema->setCheckable(true);
connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
@ -452,7 +452,7 @@ void konsolePart::makeGUI()
} }
// Popup Menu ------------------------------------------------------------------- // 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), KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
TQT_SLOT(setSelectionEnd()), actions, "selection_end"); TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu); selectionEnd->plug(m_popupMenu);
@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item)
void konsolePart::slotHistoryType() void konsolePart::slotHistoryType()
{ {
if ( ! se ) return; if ( ! se ) return;
HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget); HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget);
if (dlg.exec()) { if (dlg.exec()) {
if (dlg.isOn()) { if (dlg.isOn()) {
if (dlg.nbLines() > 0) { if (dlg.nbLines() > 0) {
@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() {
bool ok; bool ok;
TQString seps = KInputDialog::getText( i18n( "Word Connectors" ), 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 ) if ( ok )
{ {
s_word_seps = seps; s_word_seps = seps;
@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty )
void konsolePart::newSession() void konsolePart::newSession()
{ {
if ( se ) delete se; if ( se ) delete se;
se = new TESession(te, "xterm", tqparentWidget->winId()); se = new TESession(te, "xterm", parentWidget->winId());
connect( se,TQT_SIGNAL(done(TESession*)), connect( se,TQT_SIGNAL(done(TESession*)),
this,TQT_SLOT(doneSession(TESession*)) ); this,TQT_SLOT(doneSession(TESession*)) );
connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),

@ -52,7 +52,7 @@ public:
konsoleFactory(); konsoleFactory();
virtual ~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, TQObject* parent = 0, const char* name = 0,
const char* classname = "KParts::Part", const char* classname = "KParts::Part",
const TQStringList &args = TQStringList()); const TQStringList &args = TQStringList());
@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
{ {
Q_OBJECT Q_OBJECT
public: 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(); virtual ~konsolePart();
signals: signals:
@ -140,7 +140,7 @@ signals:
bool doWriteStream( const TQByteArray& ); bool doWriteStream( const TQByteArray& );
bool doCloseStream(); bool doCloseStream();
TQWidget* tqparentWidget; TQWidget* parentWidget;
TEWidget* te; TEWidget* te;
TESession* se; TESession* se;
ColorSchemaList* colors; ColorSchemaList* colors;

@ -650,7 +650,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
list->first(); list->first();
while( list->current()) 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(); list->remove();
continue; continue;

@ -549,7 +549,7 @@ void FancyPlotterSettings::editSensor()
return; return;
TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 ); 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 ) { if ( result == KColorDialog::Accepted ) {
TQPixmap newPm( 12, 12 ); TQPixmap newPm( 12, 12 );
newPm.fill( color ); newPm.fill( color );

@ -247,7 +247,7 @@ ProcessController::killProcess()
KDialogBase *dlg = new KDialogBase ( i18n ("Kill Process"), KDialogBase *dlg = new KDialogBase ( i18n ("Kill Process"),
KDialogBase::Yes | KDialogBase::Cancel, KDialogBase::Yes | KDialogBase::Cancel,
KDialogBase::Yes, KDialogBase::Cancel, this->tqparentWidget(), KDialogBase::Yes, KDialogBase::Cancel, this->parentWidget(),
"killconfirmation", "killconfirmation",
true, true, KGuiItem(i18n("Kill"))); true, true, KGuiItem(i18n("Kill")));

@ -124,7 +124,7 @@ void SensorDisplay::configureUpdateInterval()
if ( dlg.useGlobalUpdate() ) { if ( dlg.useGlobalUpdate() ) {
mUseGlobalUpdateInterval = true; mUseGlobalUpdateInterval = true;
SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() ); SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
if ( !sb ) { if ( !sb ) {
kdDebug(1215) << "dynamic cast lacks" << endl; kdDebug(1215) << "dynamic cast lacks" << endl;
setUpdateInterval( 2 ); setUpdateInterval( 2 );
@ -344,7 +344,7 @@ bool SensorDisplay::restoreSettings( TQDomElement &element )
} else { } else {
mUseGlobalUpdateInterval = true; mUseGlobalUpdateInterval = true;
SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() ); SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
if ( !sb ) { if ( !sb ) {
kdDebug(1215) << "dynamic cast lacks" << endl; kdDebug(1215) << "dynamic cast lacks" << endl;
setUpdateInterval( 2 ); setUpdateInterval( 2 );

@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines
void setKeepBelow( bool ); void setKeepBelow( bool );
Layer layer() const; Layer layer() const;
Layer belongsToLayer() const; Layer belongsToLayer() const;
void tqinvalidateLayer(); void invalidateLayer();
void setModal( bool modal ); void setModal( bool modal );
bool isModal() const; bool isModal() const;
@ -832,7 +832,7 @@ inline pid_t Client::pid() const
return info->pid(); return info->pid();
} }
inline void Client::tqinvalidateLayer() inline void Client::invalidateLayer()
{ {
in_layer = UnknownLayer; in_layer = UnknownLayer;
} }

@ -87,7 +87,7 @@ void Workspace::updateClientLayer( Client* c )
if( c->layer() == c->belongsToLayer()) if( c->layer() == c->belongsToLayer())
return; return;
StackingUpdatesBlocker blocker( this ); 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(); for( ClientList::ConstIterator it = c->transients().begin();
it != c->transients().end(); it != c->transients().end();
++it ) ++it )

@ -81,7 +81,7 @@ KFileIVI::~KFileIVI()
delete d; delete d;
} }
void KFileIVI::tqinvalidateThumb( int state, bool redraw ) void KFileIVI::invalidateThumb( int state, bool redraw )
{ {
TQIconSet::Mode mode; TQIconSet::Mode mode;
switch( state ) switch( state )

@ -88,14 +88,14 @@ public:
bool redraw=false); 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 * e.g. because the effect settings have been changed. The thumb itself
* is assumed to be still valid (use setThumbnailPixmap() instead * is assumed to be still valid (use setThumbnailPixmap() instead
* otherwise). * otherwise).
* @param state the state of the icon (enum in KIcon) * @param state the state of the icon (enum in KIcon)
* @param redraw whether to redraw the item after setting the icon * @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". * Our current thumbnail is not longer "current".

@ -56,10 +56,10 @@ KDirWatch * KNewMenu::s_pDirWatch = 0L;
class KNewMenu::KNewMenuPrivate class KNewMenu::KNewMenuPrivate
{ {
public: public:
KNewMenuPrivate() : m_tqparentWidget(0) {} KNewMenuPrivate() : m_parentWidget(0) {}
KActionCollection * m_actionCollection; KActionCollection * m_actionCollection;
TQString m_destPath; TQString m_destPath;
TQWidget *m_tqparentWidget; TQWidget *m_parentWidget;
KActionMenu *m_menuDev; KActionMenu *m_menuDev;
}; };
@ -75,13 +75,13 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) :
makeMenus(); 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 ), KActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
menuItemsVersion( 0 ) menuItemsVersion( 0 )
{ {
d = new KNewMenuPrivate; d = new KNewMenuPrivate;
d->m_actionCollection = _collec; d->m_actionCollection = _collec;
d->m_tqparentWidget = tqparentWidget; d->m_parentWidget = parentWidget;
makeMenus(); makeMenus();
} }
@ -363,7 +363,7 @@ void KNewMenu::slotNewDir()
if (popupFiles.isEmpty()) if (popupFiles.isEmpty())
return; return;
KonqOperations::newDir(d->m_tqparentWidget, popupFiles.first()); KonqOperations::newDir(d->m_parentWidget, popupFiles.first());
} }
void KNewMenu::slotNewFile() void KNewMenu::slotNewFile()
@ -396,7 +396,7 @@ void KNewMenu::slotNewFile()
{ {
m_isURLDesktopFile = true; m_isURLDesktopFile = true;
// entry.comment contains i18n("Enter link to location (URL):"). JFYI :) // 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( ... ) ); // TODO dlg.setCaption( i18n( ... ) );
if ( dlg.exec() ) if ( dlg.exec() )
{ {
@ -428,7 +428,7 @@ void KNewMenu::slotNewFile()
KURL templateURL; KURL templateURL;
templateURL.setPath( entry.templatePath ); 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. return; // done, exit.
} }
@ -447,7 +447,7 @@ void KNewMenu::slotNewFile()
text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text); text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
name = KInputDialog::getText( TQString::null, entry.comment, name = KInputDialog::getText( TQString::null, entry.comment,
text, &ok, d->m_tqparentWidget ); text, &ok, d->m_parentWidget );
if ( !ok ) if ( !ok )
return; return;
} }

@ -58,7 +58,7 @@ public:
* Constructor * Constructor
*/ */
KNewMenu( KActionCollection * _collec, const char *name=0L ); 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(); virtual ~KNewMenu();
/** /**

@ -669,7 +669,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
ivi->setIcon( size, ivi->state(), true, false ); ivi->setIcon( size, ivi->state(), true, false );
} }
else else
ivi->tqinvalidateThumb( ivi->state(), true ); ivi->invalidateThumb( ivi->state(), true );
} }
// Restore viewport update to previous state // Restore viewport update to previous state

@ -185,7 +185,7 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
return; return;
} }
if ( askDeleteConfirmation( selectedURLs, method, confirmation, tqparentWidget() ) ) if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) )
{ {
//m_srcURLs = selectedURLs; //m_srcURLs = selectedURLs;
KIO::Job *job; KIO::Job *job;
@ -525,7 +525,7 @@ void KonqOperations::doFileCopy()
} }
m_method = TRASH; m_method = TRASH;
if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, tqparentWidget() ) ) if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) )
action = TQDropEvent::Move; action = TQDropEvent::Move;
else else
{ {
@ -815,7 +815,7 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job )
slotStart(); slotStart();
} }
TQWidget* KonqOperations::tqparentWidget() const TQWidget* KonqOperations::parentWidget() const
{ {
return static_cast<TQWidget *>( parent() ); return static_cast<TQWidget *>( parent() );
} }

@ -173,7 +173,7 @@ protected:
void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; } void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; }
private: private:
TQWidget* tqparentWidget() const; TQWidget* parentWidget() const;
protected slots: protected slots:

@ -96,12 +96,12 @@ public:
class KonqPopupMenu::KonqPopupMenuPrivate class KonqPopupMenu::KonqPopupMenuPrivate
{ {
public: public:
KonqPopupMenuPrivate() : m_tqparentWidget( 0 ), KonqPopupMenuPrivate() : m_parentWidget( 0 ),
m_itemFlags( KParts::BrowserExtension::DefaultPopupItems ) m_itemFlags( KParts::BrowserExtension::DefaultPopupItems )
{ {
} }
TQString m_urlTitle; TQString m_urlTitle;
TQWidget *m_tqparentWidget; TQWidget *m_parentWidget;
KParts::BrowserExtension::PopupFlags m_itemFlags; KParts::BrowserExtension::PopupFlags m_itemFlags;
}; };
@ -200,30 +200,30 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
KURL viewURL, KURL viewURL,
KActionCollection & actions, KActionCollection & actions,
KNewMenu * newMenu, KNewMenu * newMenu,
TQWidget * tqparentWidget, TQWidget * parentWidget,
bool showProperties ) bool showProperties )
: TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 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<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{ {
KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow; 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, KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
const KURL& viewURL, const KURL& viewURL,
KActionCollection & actions, KActionCollection & actions,
KNewMenu * newMenu, KNewMenu * newMenu,
TQWidget * tqparentWidget, TQWidget * parentWidget,
KonqPopupFlags kpf, KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags flags) KParts::BrowserExtension::PopupFlags flags)
: TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 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<TQWidget *>( 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 = new KonqPopupMenuPrivate;
d->m_tqparentWidget = tqparentWidget; d->m_parentWidget = parentWidget;
d->m_itemFlags = flags; d->m_itemFlags = flags;
setup(kpf); setup(kpf);
} }
@ -1035,7 +1035,7 @@ void KonqPopupMenu::slotPopupNewDir()
if (m_lstPopupURLs.empty()) if (m_lstPopupURLs.empty())
return; return;
KonqOperations::newDir(d->m_tqparentWidget, m_lstPopupURLs.first()); KonqOperations::newDir(d->m_parentWidget, m_lstPopupURLs.first());
} }
void KonqPopupMenu::slotPopupEmptyTrashBin() void KonqPopupMenu::slotPopupEmptyTrashBin()
@ -1116,10 +1116,10 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
if (item->entry().count() == 0) // this item wasn't listed by a slave if (item->entry().count() == 0) // this item wasn't listed by a slave
{ {
// KPropertiesDialog will use stat to get more info on the file // 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 KAction *KonqPopupMenu::action( const TQDomElement &element ) const

@ -69,7 +69,7 @@ public:
// WARNING: bitfield. Next item is 8 // WARNING: bitfield. Next item is 8
/** /**
* @deprecated lacks tqparentWidget pointer, and * @deprecated lacks parentWidget pointer, and
* uses bool instead of KonqPopupFlags enum, * uses bool instead of KonqPopupFlags enum,
* might do strange things with the 'new window' action. * might do strange things with the 'new window' action.
*/ */
@ -89,7 +89,7 @@ public:
KURL viewURL, KURL viewURL,
KActionCollection & actions, KActionCollection & actions,
KNewMenu * newMenu, KNewMenu * newMenu,
TQWidget * tqparentWidget, TQWidget * parentWidget,
bool showPropertiesAndFileType = true ) KDE_DEPRECATED; 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 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 actions list of actions the caller wants to see in the menu
* @param newMenu "New" menu, shared with the File menu, in konqueror * @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. * the popup if the widget is destroyed before the popup.
* @param kpf flags from the KonqPopupFlags enum, set by the calling application * @param kpf flags from the KonqPopupFlags enum, set by the calling application
* @param f flags from the BrowserExtension enum, set by the calling part * @param f flags from the BrowserExtension enum, set by the calling part
@ -117,7 +117,7 @@ public:
const KURL& viewURL, const KURL& viewURL,
KActionCollection & actions, KActionCollection & actions,
KNewMenu * newMenu, KNewMenu * newMenu,
TQWidget * tqparentWidget, TQWidget * parentWidget,
KonqPopupFlags kpf, KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/); KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/);
@ -177,7 +177,7 @@ protected:
KActionCollection m_ownActions; KActionCollection m_ownActions;
private: 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 setup(KonqPopupFlags kpf);
void addPlugins( ); void addPlugins( );
int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin); int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin);

@ -171,13 +171,13 @@ PluginFactory::~PluginFactory()
s_instance = 0; 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, TQObject *parent, const char *name,
const char *classname, const TQStringList &args) const char *classname, const TQStringList &args)
{ {
Q_UNUSED(classname) Q_UNUSED(classname)
kdDebug(1432) << "PluginFactory::create" << endl; 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; 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) const char *name, const TQStringList &args)
: KParts::ReadOnlyPart(parent, name), _widget(0), _args(args), : KParts::ReadOnlyPart(parent, name), _widget(0), _args(args),
_destructed(0L) _destructed(0L)
@ -226,7 +226,7 @@ PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObjec
_callback = new NSPluginCallback(this); _callback = new NSPluginCallback(this);
// create a canvas to insert our widget // create a canvas to insert our widget
_canvas = new PluginCanvasWidget( tqparentWidget, widgetName ); _canvas = new PluginCanvasWidget( parentWidget, widgetName );
//_canvas->setFocusPolicy( TQWidget::ClickFocus ); //_canvas->setFocusPolicy( TQWidget::ClickFocus );
_canvas->setFocusPolicy( TQ_WheelFocus ); _canvas->setFocusPolicy( TQ_WheelFocus );
_canvas->setBackgroundMode( TQWidget::NoBackground ); _canvas->setBackgroundMode( TQWidget::NoBackground );

@ -67,7 +67,7 @@ public:
PluginFactory(); PluginFactory();
virtual ~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, TQObject *parent = 0, const char *name = 0,
const char *classname = "KParts::Part", const char *classname = "KParts::Part",
const TQStringList &args = TQStringList()); const TQStringList &args = TQStringList());
@ -102,7 +102,7 @@ class PluginPart: public KParts::ReadOnlyPart
{ {
Q_OBJECT Q_OBJECT
public: public:
PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
const char *name, const TQStringList &args = TQStringList()); const char *name, const TQStringList &args = TQStringList());
virtual ~PluginPart(); virtual ~PluginPart();

@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs {
NPN_PostURLNotifyUPP posturlnotify; NPN_PostURLNotifyUPP posturlnotify;
NPN_GetValueUPP getvalue; NPN_GetValueUPP getvalue;
NPN_SetValueUPP setvalue; NPN_SetValueUPP setvalue;
NPN_InvalidateRectUPP tqinvalidaterect; NPN_InvalidateRectUPP invalidaterect;
NPN_InvalidateRegionUPP tqinvalidateregion; NPN_InvalidateRegionUPP invalidateregion;
NPN_ForceRedrawUPP forceredraw; NPN_ForceRedrawUPP forceredraw;
NPN_GetStringIdentifierUPP getstringidentifier; NPN_GetStringIdentifierUPP getstringidentifier;
NPN_GetStringIdentifiersUPP getstringidentifiers; NPN_GetStringIdentifiersUPP getstringidentifiers;

@ -1454,8 +1454,8 @@ int NSPluginClass::initialize()
_nsFuncs.posturlnotify = g_NPN_PostURLNotify; _nsFuncs.posturlnotify = g_NPN_PostURLNotify;
_nsFuncs.getvalue = g_NPN_GetValue; _nsFuncs.getvalue = g_NPN_GetValue;
_nsFuncs.setvalue = g_NPN_SetValue; _nsFuncs.setvalue = g_NPN_SetValue;
_nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect; _nsFuncs.invalidaterect = g_NPN_InvalidateRect;
_nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion; _nsFuncs.invalidateregion = g_NPN_InvalidateRegion;
_nsFuncs.forceredraw = g_NPN_ForceRedraw; _nsFuncs.forceredraw = g_NPN_ForceRedraw;
// initialize plugin // initialize plugin

@ -544,7 +544,7 @@ static
void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect) void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect)
{ {
DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect); DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect);
gNetscapeFuncs.tqinvalidaterect( instance, invalidRect ); gNetscapeFuncs.invalidaterect( instance, invalidRect );
DEB(ef, "<- NPN_InvalidateRect\n"); DEB(ef, "<- NPN_InvalidateRect\n");
} }
@ -552,7 +552,7 @@ static
void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion) void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
{ {
DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion); DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion);
gNetscapeFuncs.tqinvalidateregion( instance, invalidRegion ); gNetscapeFuncs.invalidateregion( instance, invalidRegion );
DEB(ef, "<- NPN_InvalidateRegion\n"); 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->posturlnotify = 0x%x\n", nsTable->posturlnotify);
DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue); DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue);
DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue); DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue);
DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", nsTable->tqinvalidaterect); DEB(ef, "nsTable->invalidaterect = 0x%x\n", nsTable->invalidaterect);
DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", nsTable->tqinvalidateregion); DEB(ef, "nsTable->invalidateregion = 0x%x\n", nsTable->invalidateregion);
DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw); DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw);
DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size); DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);
@ -659,8 +659,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify; gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify;
gExtNetscapeFuncs.getvalue = MyNPN_GetValue; gExtNetscapeFuncs.getvalue = MyNPN_GetValue;
gExtNetscapeFuncs.setvalue = MyNPN_SetValue; gExtNetscapeFuncs.setvalue = MyNPN_SetValue;
gExtNetscapeFuncs.tqinvalidaterect = MyNPN_InvalidateRect; gExtNetscapeFuncs.invalidaterect = MyNPN_InvalidateRect;
gExtNetscapeFuncs.tqinvalidateregion = MyNPN_InvalidateRegion; gExtNetscapeFuncs.invalidateregion = MyNPN_InvalidateRegion;
gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw; gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw;
gPluginFuncs.size = sizeof( gPluginFuncs ); 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->posturlnotify = 0x%x\n", gExtNetscapeFuncs.posturlnotify);
DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue); DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue);
DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue); DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue);
DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", gExtNetscapeFuncs.tqinvalidaterect); DEB(ef, "nsTable->invalidaterect = 0x%x\n", gExtNetscapeFuncs.invalidaterect);
DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", gExtNetscapeFuncs.tqinvalidateregion); DEB(ef, "nsTable->invalidateregion = 0x%x\n", gExtNetscapeFuncs.invalidateregion);
DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw); DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw);
DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size); DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);

Loading…
Cancel
Save