Browse Source

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/kdelibs@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
1dcbbe821d
100 changed files with 327 additions and 327 deletions
  1. +2
    -2
      KDE3PORTING.html
  2. +1
    -1
      interfaces/kmediaplayer/player.h
  3. +1
    -1
      interfaces/ktexteditor/editor.h
  4. +3
    -3
      interfaces/ktexteditor/editorchooser.cpp
  5. +1
    -1
      interfaces/ktexteditor/editorchooser.h
  6. +2
    -2
      interfaces/ktexteditor/ktexteditor.cpp
  7. +4
    -4
      kate/part/katebuffer.cpp
  8. +1
    -1
      kate/part/katebuffer.h
  9. +3
    -3
      kate/part/katedocument.cpp
  10. +1
    -1
      kate/part/katedocument.h
  11. +5
    -5
      kate/part/katefactory.cpp
  12. +2
    -2
      kate/part/katefactory.h
  13. +2
    -2
      kate/part/katehighlight.h
  14. +4
    -4
      kate/part/kateschema.cpp
  15. +2
    -2
      kate/part/kateschema.h
  16. +2
    -2
      kate/part/kateviewhelpers.cpp
  17. +1
    -1
      kate/part/test_regression.cpp
  18. +2
    -2
      kcert/kcertpart.cc
  19. +1
    -1
      kcert/kcertpart.h
  20. +5
    -5
      kdecore/kgenericfactory.h
  21. +14
    -14
      kdecore/kgenericfactory.tcc
  22. +1
    -1
      kdecore/kmultipledrag.h
  23. +1
    -1
      kdecore/ktempdir.cpp
  24. +1
    -1
      kdecore/kwin.cpp
  25. +4
    -4
      kdecore/malloc/malloc.c
  26. +2
    -2
      kdecore/svgicons/ksvgiconengine.cpp
  27. +7
    -7
      kdefx/kstyle.cpp
  28. +1
    -1
      kdeprint/cups/imagepreview.cpp
  29. +17
    -17
      kdeprint/kprintaction.cpp
  30. +7
    -7
      kdeprint/kprintaction.h
  31. +2
    -2
      kdeprint/kprintdialog.cpp
  32. +4
    -4
      kdeprint/management/kxmlcommanddlg.cpp
  33. +1
    -1
      kdeprint/management/networkscanner.cpp
  34. +3
    -3
      kdeprint/messagewindow.cpp
  35. +2
    -2
      kdeui/kaboutdialog.cpp
  36. +1
    -1
      kdeui/kaction.cpp
  37. +1
    -1
      kdeui/kactionclasses.cpp
  38. +1
    -1
      kdeui/kcommand.h
  39. +3
    -3
      kdeui/kdialogbase.cpp
  40. +24
    -24
      kdeui/kdockwidget.cpp
  41. +7
    -7
      kdeui/kdockwidget_private.cpp
  42. +2
    -2
      kdeui/kfontdialog.cpp
  43. +1
    -1
      kdeui/kfontrequester.cpp
  44. +1
    -1
      kdeui/khelpmenu.cpp
  45. +7
    -7
      kdeui/kjanuswidget.cpp
  46. +2
    -2
      kdeui/kjanuswidget.h
  47. +2
    -2
      kdeui/kmainwindow.cpp
  48. +17
    -17
      kdeui/kmenubar.cpp
  49. +1
    -1
      kdeui/kpanelapplet.cpp
  50. +1
    -1
      kdeui/kpanelapplet.h
  51. +1
    -1
      kdeui/kpanelextension.cpp
  52. +1
    -1
      kdeui/kpanelextension.h
  53. +1
    -1
      kdeui/kpopupmenu.cpp
  54. +10
    -10
      kdeui/ksystemtray.cpp
  55. +2
    -2
      kdeui/ksystemtray.h
  56. +1
    -1
      kdeui/ktabbar.cpp
  57. +2
    -2
      kdeui/kurllabel.cpp
  58. +3
    -3
      kdeui/kwhatsthismanager.cpp
  59. +1
    -1
      kdeui/kxmlguibuilder.cpp
  60. +1
    -1
      kdeui/kxmlguiclient.cpp
  61. +1
    -1
      kdeui/qxembed.cpp
  62. +1
    -1
      khtml/java/kjavaappletserver.cpp
  63. +2
    -2
      khtml/khtml_factory.cpp
  64. +1
    -1
      khtml/khtml_factory.h
  65. +5
    -5
      khtml/khtml_part.cpp
  66. +3
    -3
      khtml/khtml_part.h
  67. +4
    -4
      khtml/khtmlimage.cpp
  68. +2
    -2
      khtml/khtmlimage.h
  69. +6
    -6
      khtml/khtmlview.cpp
  70. +2
    -2
      khtml/kmultipart/kmultipart.cpp
  71. +1
    -1
      khtml/kmultipart/kmultipart.h
  72. +1
    -1
      khtml/rendering/bidi.cpp
  73. +1
    -1
      khtml/rendering/render_canvas.h
  74. +2
    -2
      khtml/rendering/render_object.cpp
  75. +2
    -2
      khtml/rendering/render_object.h
  76. +1
    -1
      khtml/rendering/render_replaced.cpp
  77. +2
    -2
      kio/bookmarks/kbookmark.cc
  78. +1
    -1
      kio/bookmarks/kbookmarkmanager.cc
  79. +1
    -1
      kio/kfile/kfilepreview.cpp
  80. +1
    -1
      kio/kfile/knotifydialog.cpp
  81. +1
    -1
      kio/kfile/kurlbar.cpp
  82. +1
    -1
      kio/kfile/kurlrequester.cpp
  83. +2
    -2
      kio/kio/job.cpp
  84. +3
    -3
      kio/kio/jobclasses.h
  85. +1
    -1
      kio/kio/kacl.cpp
  86. +1
    -1
      kio/kio/kfileitem.cpp
  87. +3
    -3
      kio/misc/kwalletd/kwalletd.cpp
  88. +1
    -1
      kio/misc/kwalletd/kwalletd.h
  89. +1
    -1
      kioslave/http/http.h
  90. +4
    -4
      kmdi/kmdi/dockcontainer.cpp
  91. +14
    -14
      kmdi/kmdi/mainwindow.cpp
  92. +1
    -1
      kmdi/kmdi/mainwindow.h
  93. +2
    -2
      kmdi/kmdi/toolviewaccessor.cpp
  94. +2
    -2
      kmdi/kmdichildfrm.cpp
  95. +1
    -1
      kmdi/kmdichildfrmcaption.cpp
  96. +4
    -4
      kmdi/kmdichildview.cpp
  97. +3
    -3
      kmdi/kmdichildview.h
  98. +3
    -3
      kmdi/kmdidockcontainer.cpp
  99. +32
    -32
      kmdi/kmdimainfrm.cpp
  100. +1
    -1
      kmdi/kmdimainfrm.h

+ 2
- 2
KDE3PORTING.html View File

@@ -652,7 +652,7 @@ notification about a change in tqalignment.
<H4>KPanelApplet</H4>

<p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
Instead you should reimplement positionChange() and tqalignmentChange() to be
Instead you should reimplement positionChange() and alignmentChange() to be
notified of changes in the position and tqalignment of the panel on which your applet
resides. In addition, the popupDirection() method and the Direction enum are
deprecated. Instead you should use the position() method and Position enum. Applets that use
@@ -661,7 +661,7 @@ a future version.

<H4>KPanelExtension</H4>

<p>There is a new method tqalignmentChange() that your extension should reimplement if
<p>There is a new method alignmentChange() that your extension should reimplement if
it needs to know about changes in tqalignment.

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>


+ 1
- 1
interfaces/kmediaplayer/player.h View File

@@ -56,7 +56,7 @@ public:
/** This constructor is what to use when a GUI is required, as in the
* case of a KMediaPlayer/Player.
*/
Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name);
Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name);

virtual ~Player(void);



+ 1
- 1
interfaces/ktexteditor/editor.h View File

@@ -58,7 +58,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
unsigned int myEditorNumber;
};

KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );

}



+ 3
- 3
interfaces/ktexteditor/editorchooser.cpp View File

@@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
return 0;
}

KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName,
KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName,
const char* name,const TQString& postfix,bool fallBackToKatePart){

KTextEditor::Editor *tmpEd=0;
@@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObje
KService::Ptr serv=KService::serviceByDesktopName(editor);
if (serv)
{
tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name);
tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name);
if (tmpEd) return tmpEd;
}
if (fallBackToKatePart)
return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name);
return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name);

return 0;
}


+ 1
- 1
interfaces/ktexteditor/editorchooser.h View File

@@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget
void writeAppSetting(const TQString& postfix=TQString::null);

static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true);
static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
private:
class PrivateEditorChooser *d;
};


+ 2
- 2
interfaces/ktexteditor/ktexteditor.cpp View File

@@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const
return myEditorNumber;
}

Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name )
Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name )
{
return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name );
return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name );
}

Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name )


+ 4
- 4
kate/part/katebuffer.cpp View File

@@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w)
m_tabWidth = w;

if (m_highlight && m_highlight->foldingIndentationSensitive())
tqinvalidateHighlighting();
invalidateHighlighting();
}
}

@@ -881,7 +881,7 @@ void KateBuffer::setHighlight(uint hlMode)
m_highlight = h;

if (tqinvalidate)
tqinvalidateHighlighting();
invalidateHighlighting();

// inform the document that the hl was really changed
// needed to update attributes and more ;)
@@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode)
}
}

void KateBuffer::tqinvalidateHighlighting()
void KateBuffer::invalidateHighlighting()
{
m_lineHighlightedMax = 0;
m_lineHighlighted = 0;
@@ -977,7 +977,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
{
if (KateHlManager::self()->resetDynamicCtxs())
{
kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl;
kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl;

// avoid recursive invalidation
KateHlManager::self()->setForceNoDCReset(true);


+ 1
- 1
kate/part/katebuffer.h View File

@@ -591,7 +591,7 @@ class KateBuffer : public TQObject
/**
* Invalidate highlighting of whole buffer.
*/
void tqinvalidateHighlighting();
void invalidateHighlighting();

KateCodeFoldingTree *foldingTree () { return &m_regionTree; };



+ 3
- 3
kate/part/katedocument.cpp View File

@@ -91,7 +91,7 @@ class KatePartPluginItem
// KateDocument Constructor
//
KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
bool bReadOnly, TQWidget *tqparentWidget,
bool bReadOnly, TQWidget *parentWidget,
const char *widgetName, TQObject *parent, const char *name)
: Kate::Document(parent, name),
m_plugins (KateFactory::self()->plugins().count()),
@@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
// if single view mode, like in the konqui embedding, create a default view ;)
if ( m_bSingleViewMode )
{
KTextEditor::View *view = createView( tqparentWidget, widgetName );
KTextEditor::View *view = createView( parentWidget, widgetName );
insertChildClient( view );
view->show();
setWidget( view );
@@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate)
m_views.tqat(z)->renderer()->updateAttributes ();

if (needInvalidate)
m_buffer->tqinvalidateHighlighting();
m_buffer->invalidateHighlighting();

tagAll ();
}


+ 1
- 1
kate/part/katedocument.h View File

@@ -91,7 +91,7 @@ class KateDocument : public Kate::Document,

public:
KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false,
TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0);
TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0);
~KateDocument ();

bool closeURL();


+ 5
- 5
kate/part/katefactory.cpp View File

@@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory
public:
/**
* reimplemented create object method
* @param tqparentWidget parent widget
* @param parentWidget parent widget
* @param widgetName widget name
* @param parent TQObject parent
* @param name object name
@@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory
* @param args additional arguments
* @return constructed part object
*/
KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
{
return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args);
return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args);
}
};

@@ -206,14 +206,14 @@ KateFactory *KateFactory::self ()
return s_self;
}

KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & )
KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & )
{
TQCString classname( _classname );
bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" );
bool bWantBrowserView = ( classname == "Browser/View" );
bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" ));

KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name);
KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name);
part->setReadWrite( !bWantReadOnly );

return part;


+ 2
- 2
kate/part/katefactory.h View File

@@ -71,7 +71,7 @@ class KateFactory

/**
* reimplemented create object method
* @param tqparentWidget parent widget
* @param parentWidget parent widget
* @param widgetName widget name
* @param parent TQObject parent
* @param name object name
@@ -79,7 +79,7 @@ class KateFactory
* @param args additional arguments
* @return constructed part object
*/
KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const char *classname,
const TQStringList &args );



+ 2
- 2
kate/part/katehighlight.h View File

@@ -213,7 +213,7 @@ class KateHighlighting

inline bool noHighlighting () const { return noHl; };

// be carefull: all documents hl should be tqinvalidated after calling this method!
// be carefull: all documents hl should be invalidated after calling this method!
void dropDynamicContexts();

TQString indentation () { return m_indentation; }
@@ -377,7 +377,7 @@ class KateHlManager : public TQObject
uint countDynamicCtxs() { return dynamicCtxsCount; };
void setForceNoDCReset(bool b) { forceNoDCReset = b; };

// be carefull: all documents hl should be tqinvalidated after having successfully called this method!
// be carefull: all documents hl should be invalidated after having successfully called this method!
bool resetDynamicCtxs();

signals:


+ 4
- 4
kate/part/kateschema.cpp View File

@@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
blay->addStretch();

// connect signal changed(); changed is emitted by a ColorButton change!
connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) );
connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) );

// TQWhatsThis help
TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>"));
@@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
m_fontchooser->enableColumn(KFontChooser::StyleList, false);
grid->addWidget( m_fontchooser, 0, 0);

connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
m_schema = -1;
}

@@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co
m_defaultStyles = new KateStyleListView( this, false );
grid->addWidget( m_defaultStyles, 0, 0);

connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));

TQWhatsThis::add( m_defaultStyles, i18n(
"This list displays the default styles for the current schema and "
@@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
"to edit from the popup menu.<p>You can unset the Background and Selected "
"Background colors from the context menu when appropriate.") );

connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
}

KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab()


+ 2
- 2
kate/part/kateschema.h View File

@@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget
void schemaChanged( int newSchema );

signals:
void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged)
void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)

protected slots:
void slotMarkerColorChanged(const TQColor&);
@@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget
void schemaChanged( int newSchema );

signals:
void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged)
void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)

private:
class KFontChooser *m_fontchooser;


+ 2
- 2
kate/part/kateviewhelpers.cpp View File

@@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public TQWhatsThis
Kate::Command *cmd = KateCmd::self()->queryCommand( name );
if ( cmd )
{
if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) )
if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) )
return beg + name + mid + s + end;
else
return beg + name + mid + i18n("No help for '%1'").arg( name ) + end;
@@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )

void KateCmdLine::hideMe () // unless i have focus ;)
{
if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) {
if ( isVisibleTo(parentWidget()) && ! hasFocus() ) {
m_view->toggleCmdLine ();
}
}


+ 1
- 1
kate/part/test_regression.cpp View File

@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
/*bBrowserView*/false,
/*bReadOnly*/false,
/*tqparentWidget*/toplevel,
/*parentWidget*/toplevel,
/*widgetName*/"testkate");
part->readConfig(&cfg);



+ 2
- 2
kcert/kcertpart.cc View File

@@ -127,7 +127,7 @@ class KCertPartPrivate {
};


KCertPart::KCertPart(TQWidget *tqparentWidget, const char *widgetName,
KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const TQStringList & /*args*/ )
: KParts::ReadWritePart(parent, name) {
@@ -149,7 +149,7 @@ _silentImport = false;
d = new KCertPartPrivate;
d->browserExtension = new KParts::BrowserExtension(this);

_frame = new TQFrame(tqparentWidget, widgetName);
_frame = new TQFrame(parentWidget, widgetName);
setWidget(_frame);

_baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(),


+ 1
- 1
kcert/kcertpart.h View File

@@ -68,7 +68,7 @@ class KPKCS12Item : public KListViewItem {
class KCertPart : public KParts::ReadWritePart {
Q_OBJECT
public:
KCertPart(TQWidget *tqparentWidget, const char *widgetName,
KCertPart(TQWidget *parentWidget, const char *widgetName,
TQObject *parent = 0L, const char *name = 0L,
const TQStringList &args = TQStringList() );
virtual ~KCertPart();


+ 5
- 5
kdecore/kgenericfactory.h View File

@@ -133,7 +133,7 @@ KInstance *KGenericFactoryBase<T>::instance()
* const TQStringList &args);</code>
* <li>If the class is derived from KParts::Part then it needs to have
* a constructor like:
* <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
* <code>MyPart( TQWidget *parentWidget, const char *widgetName,
* TQObject *parent, const char *name,
* const TQStringList &args );</code>
* </ul>
@@ -216,7 +216,7 @@ protected:
* const TQStringList &args);</code>
* <li>If the class is derived from KParts::Part then it needs to have
* a constructor like:
* <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
* <code>MyPart( TQWidget *parentWidget, const char *widgetName,
* TQObject *parent, const char *name,
* const TQStringList &args );</code>
* </ul>
@@ -253,7 +253,7 @@ protected:
* {
* Q_ OBJECT
* public:
* MyDialogComponent( TQWidget *tqparentWidget, const char *name,
* MyDialogComponent( TQWidget *parentWidget, const char *name,
* const TQStringList &args );
* ...
* };
@@ -311,7 +311,7 @@ protected:
* const TQStringList &args);</code>
* <li>If the class is derived from KParts::Part then it needs to have
* a constructor like:
* <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
* <code>MyPart( TQWidget *parentWidget, const char *widgetName,
* TQObject *parent, const char *name,
* const TQStringList &args );</code>
* </ul>
@@ -348,7 +348,7 @@ protected:
* {
* Q_ OBJECT
* public:
* MyDialogComponent( TQWidget *tqparentWidget, const char *name,
* MyDialogComponent( TQWidget *parentWidget, const char *name,
* const TQStringList &args );
* ...
* };


+ 14
- 14
kdecore/kgenericfactory.tcc View File

@@ -121,7 +121,7 @@ namespace KDEPrivate
typename If< TQWidgetInheritanceTest< Product >::Result,
TQWidget, TQObject >::Result >::Result BaseType;
static inline Product *create( TQWidget *tqparentWidget, const char *widgetName,
static inline Product *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *className, const TQStringList &args )
{
@@ -129,7 +129,7 @@ namespace KDEPrivate
while ( tqmetaObject )
{
if ( !qstrcmp( className, tqmetaObject->className() ) )
return create( tqparentWidget, widgetName,
return create( parentWidget, widgetName,
parent, name, args, Type2Type<BaseType>() );
tqmetaObject = tqmetaObject->tqsuperClass();
}
@@ -139,14 +139,14 @@ namespace KDEPrivate
typedef typename If< TQWidgetInheritanceTest<ParentType>::Result,
ParentType, TQWidget >::Result WidgetParentType;

static inline Product *create( TQWidget *tqparentWidget, const char *widgetName,
static inline Product *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const TQStringList &args, Type2Type<KParts::Part> )
{
return new Product( tqparentWidget, widgetName, parent, name, args );
return new Product( parentWidget, widgetName, parent, name, args );
}

static inline Product *create( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/,
static inline Product *create( TQWidget* /*parentWidget*/, const char* /*widgetName*/,
TQObject *parent, const char *name,
const TQStringList &args, Type2Type<TQWidget> )
{
@@ -157,7 +157,7 @@ namespace KDEPrivate
return new Product( p, name, args );
}

static inline Product *create( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/,
static inline Product *create( TQWidget* /*parentWidget*/, const char* /*widgetName*/,
TQObject *parent, const char *name,
const TQStringList &args, Type2Type<TQObject> )
{
@@ -175,12 +175,12 @@ namespace KDEPrivate
class MultiFactory
{
public:
inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName,
inline static TQObject *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *className,
const TQStringList &args )
{
return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( tqparentWidget, widgetName,
return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName,
parent, name, className,
args )));
}
@@ -215,19 +215,19 @@ namespace KDEPrivate
class MultiFactory< KTypeList<Product, ProductListTail>, TQObject >
{
public:
inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName,
inline static TQObject *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *className,
const TQStringList &args )
{
// try with the head of the typelist first. the head is always
// a concrete type.
TQObject *object = MultiFactory<Product>::create( tqparentWidget, widgetName,
TQObject *object = MultiFactory<Product>::create( parentWidget, widgetName,
parent, name, className,
args );

if ( !object )
object = MultiFactory<ProductListTail>::create( tqparentWidget, widgetName,
object = MultiFactory<ProductListTail>::create( parentWidget, widgetName,
parent, name, className,
args );

@@ -241,7 +241,7 @@ namespace KDEPrivate
KTypeList<ParentType, ParentTypeListTail> >
{
public:
inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName,
inline static TQObject *create( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *className,
const TQStringList &args )
@@ -249,7 +249,7 @@ namespace KDEPrivate
// try with the head of the typelist first. the head is always
// a concrete type.
TQObject *object = MultiFactory<Product, ParentType>
::create( tqparentWidget, widgetName,
::create( parentWidget, widgetName,
parent, name, className, args );

// if that failed continue by advancing the typelist, calling this
@@ -257,7 +257,7 @@ namespace KDEPrivate
// at the end we reach the nulltype specialization.
if ( !object )
object = MultiFactory<ProductListTail, ParentTypeListTail>
::create( tqparentWidget, widgetName,
::create( parentWidget, widgetName,
parent, name, className, args );

return object;


+ 1
- 1
kdecore/kmultipledrag.h View File

@@ -40,7 +40,7 @@ class KMultipleDragPrivate;
* Sample code for this:
*
* \code
* KMultipleDrag *drag = new KMultipleDrag( tqparentWidget );
* KMultipleDrag *drag = new KMultipleDrag( parentWidget );
* drag->addDragObject( new TQImageDrag( someQImage, 0 ) );
* drag->addDragObject( new KURLDrag( someKURL, 0 ) );
* drag->drag();


+ 1
- 1
kdecore/ktempdir.cpp View File

@@ -177,7 +177,7 @@ rmtree(const TQCString& name)
*
* Potential problems:
* - opendir/readdir/closedir is not re-entrant
* - unlink and rmdir tqinvalidates a opendir/readdir/closedir
* - unlink and rmdir invalidates a opendir/readdir/closedir
* - limited number of file descriptors for opendir/readdir/closedir
*/
if ( ::closedir( dp ) )


+ 1
- 1
kdecore/kwin.cpp View File

@@ -311,7 +311,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow )
Grmbl. See TQDialog::show(). That should get fixed in Qt somehow.
*/
if( tqqt_cast< TQDialog* >( subwindow ) != NULL
&& subwindow->tqparentWidget() == NULL
&& subwindow->parentWidget() == NULL
&& kapp->mainWidget() != NULL )
{
kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget(),"


+ 4
- 4
kdecore/malloc/malloc.c View File

@@ -393,7 +393,7 @@ extern "C" {
defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the
expense of not being able to handle more than 2^32 of malloced
space. If this limitation is acceptable, you are encouraged to set
this unless you are on a platform requiring 16byte tqalignments. In
this unless you are on a platform requiring 16byte alignments. In
this case the tqalignment requirements turn out to negate any
potential advantages of decreasing size_t word size.

@@ -421,7 +421,7 @@ extern "C" {
/*
MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks.
It must be a power of two at least 2 * SIZE_SZ, even on machines
for which smaller tqalignments would suffice. It may be defined as
for which smaller alignments would suffice. It may be defined as
larger than this though. Note however that code and data structures
are optimized for the case of 8-byte tqalignment.
*/
@@ -1938,7 +1938,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

Note that the `foot' of the current chunk is actually represented
as the prev_size of the NEXT chunk. This makes it easier to
deal with tqalignments etc but can be very confusing when trying
deal with alignments etc but can be very confusing when trying
to extend or adapt this code.

The two exceptions to all this are
@@ -3454,7 +3454,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
double fencepost at old_top to prevent consolidation with space
we don't own. These fenceposts are artificial chunks that are
marked as inuse and are in any case too small to use. We need
two to make sizes and tqalignments work out.
two to make sizes and alignments work out.
*/
if (old_size != 0) {


+ 2
- 2
kdecore/svgicons/ksvgiconengine.cpp View File

@@ -225,8 +225,8 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n
TQPtrList<TQDomNamedNodeMap> applyList;
applyList.setAutoDelete(true);

TQDomNode tqshape = node.tqparentNode();
for(; !tqshape.isNull() ; tqshape = tqshape.tqparentNode())
TQDomNode tqshape = node.parentNode();
for(; !tqshape.isNull() ; tqshape = tqshape.parentNode())
applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes()));

// Apply parent attributes


+ 7
- 7
kdefx/kstyle.cpp View File

@@ -364,7 +364,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
else
pix.resize( w-2, h-2 );

TQString title = wid->tqparentWidget()->caption();
TQString title = wid->parentWidget()->caption();
TQPainter p2;
p2.begin(&pix);
p2.fillRect(pix.rect(), cg.brush(TQColorGroup::Highlight));
@@ -569,7 +569,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,

if (p && p->device()->devType() == TQInternal::Widget) {
widget = static_cast<TQWidget*>(p->device());
parent = widget->tqparentWidget();
parent = widget->parentWidget();
} else
return; // Don't paint on non-widgets

@@ -986,7 +986,7 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
TQWidget* parent = 0;
// Check that we are not a normal toolbar or a hidden dockwidget,
// in which case we need to adjust the height for font size
if (widget && (parent = widget->tqparentWidget() )
if (widget && (parent = widget->parentWidget() )
&& !parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING)
&& !parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)
&& widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
@@ -1200,10 +1200,10 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter p2;
p2.begin(&pix);

if ( slider->tqparentWidget() &&
slider->tqparentWidget()->backgroundPixmap() &&
!slider->tqparentWidget()->backgroundPixmap()->isNull() ) {
TQPixmap pixmap = *(slider->tqparentWidget()->backgroundPixmap());
if ( slider->parentWidget() &&
slider->parentWidget()->backgroundPixmap() &&
!slider->parentWidget()->backgroundPixmap()->isNull() ) {
TQPixmap pixmap = *(slider->parentWidget()->backgroundPixmap());
p2.drawTiledPixmap(r, pixmap, slider->pos());
} else
pix.fill(cg.background());


+ 1
- 1
kdeprint/cups/imagepreview.cpp View File

@@ -59,7 +59,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){
int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;

QPixmap buffer(width(), height());
buffer.fill(tqparentWidget(), 0, 0);
buffer.fill(parentWidget(), 0, 0);
QPainter p(&buffer);
p.drawImage(x,y,tmpImage);
p.end();


+ 17
- 17
kdeprint/kprintaction.cpp View File

@@ -31,33 +31,33 @@ public:
KPrintActionPrivate()
{
type = All;
tqparentWidget = 0;
parentWidget = 0;
}

PrinterType type;
QStringList printers;
TQWidget *tqparentWidget;
TQWidget *parentWidget;
};

KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name)
KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
: KActionMenu(text, parent, name)
{
d = new KPrintActionPrivate();
initialize(type, tqparentWidget);
initialize(type, parentWidget);
}

KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name)
KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
: KActionMenu(text, icon, parent, name)
{
d = new KPrintActionPrivate();
initialize(type, tqparentWidget);
initialize(type, parentWidget);
}

KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name)
KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
: KActionMenu(text, icon, parent, name)
{
d = new KPrintActionPrivate();
initialize(type, tqparentWidget);
initialize(type, parentWidget);
}

KPrintAction::~KPrintAction()
@@ -65,13 +65,13 @@ KPrintAction::~KPrintAction()
delete d;
}

void KPrintAction::initialize(PrinterType type, TQWidget *tqparentWidget)
void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget)
{
connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));

d->type = type;
d->tqparentWidget = tqparentWidget;
d->parentWidget = parentWidget;
}

void KPrintAction::slotAboutToShow()
@@ -105,26 +105,26 @@ void KPrintAction::slotActivated(int ID)
{
KPrinter printer(false);
KMPrinter *mprt = KMManager::self()->findPrinter(d->printers[ID]);
if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget))
if (mprt && mprt->autoConfigure(&printer, d->parentWidget))
{
// emit the signal
emit print(&printer);
}
}

KPrintAction* KPrintAction::exportAll(TQWidget *tqparentWidget, TQObject *parent, const char *name)
KPrintAction* KPrintAction::exportAll(TQWidget *parentWidget, TQObject *parent, const char *name)
{
return new KPrintAction(i18n("&Export..."), All, tqparentWidget, parent, (name ? name : "export_all"));
return new KPrintAction(i18n("&Export..."), All, parentWidget, parent, (name ? name : "export_all"));
}

KPrintAction* KPrintAction::exportRegular(TQWidget *tqparentWidget, TQObject *parent, const char *name)
KPrintAction* KPrintAction::exportRegular(TQWidget *parentWidget, TQObject *parent, const char *name)
{
return new KPrintAction(i18n("&Export..."), Regular, tqparentWidget, parent, (name ? name : "export_regular"));
return new KPrintAction(i18n("&Export..."), Regular, parentWidget, parent, (name ? name : "export_regular"));
}

KPrintAction* KPrintAction::exportSpecial(TQWidget *tqparentWidget, TQObject *parent, const char *name)
KPrintAction* KPrintAction::exportSpecial(TQWidget *parentWidget, TQObject *parent, const char *name)
{
return new KPrintAction(i18n("&Export..."), Specials, tqparentWidget, parent, (name ? name : "export_special"));
return new KPrintAction(i18n("&Export..."), Specials, parentWidget, parent, (name ? name : "export_special"));
}

#include "kprintaction.moc"

+ 7
- 7
kdeprint/kprintaction.h View File

@@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KPrintAction : public KActionMenu
public:
enum PrinterType { All, Regular, Specials };

KPrintAction(const TQString& text, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
KPrintAction(const TQString& text, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
virtual ~KPrintAction();

static KPrintAction* exportAll(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
static KPrintAction* exportRegular(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
static KPrintAction* exportSpecial(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
static KPrintAction* exportAll(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
static KPrintAction* exportRegular(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
static KPrintAction* exportSpecial(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);

signals:
void print(KPrinter*);
@@ -47,7 +47,7 @@ protected slots:
void slotActivated(int);

protected:
void initialize(PrinterType type, TQWidget *tqparentWidget);
void initialize(PrinterType type, TQWidget *parentWidget);

private:
class KPrintActionPrivate;


+ 2
- 2
kdeprint/kprintdialog.cpp View File

@@ -546,7 +546,7 @@ void KPrintDialog::initialize(KPrinter *printer)
TQPtrList<KMPrinter> *plist = KMFactory::self()->manager()->printerList();
if (!KMManager::self()->errorMsg().isEmpty())
{
KMessageBox::error(tqparentWidget(),
KMessageBox::error(parentWidget(),
"<qt><nobr>"+
i18n("An error occurred while retrieving the printer list:")
+"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>");
@@ -934,7 +934,7 @@ void KPrintDialog::slotUpdatePossible( bool flag )
{
MessageWindow::remove( this );
if ( !flag )
KMessageBox::error(tqparentWidget(),
KMessageBox::error(parentWidget(),
"<qt><nobr>"+
i18n("An error occurred while retrieving the printer list:")
+"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>");


+ 4
- 4
kdeprint/management/kxmlcommanddlg.cpp View File

@@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown()

void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd)
{
m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
m_inputfile->parentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
m_outputfile->parentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
m_view->setEnabled(cmd.tqfind("%filterargs") != -1);
m_name->tqparentWidget()->setEnabled(m_view->isEnabled());
m_name->parentWidget()->setEnabled(m_view->isEnabled());
slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0));
m_view->setOpen(m_view->firstChild(), m_view->isEnabled());
}
@@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime()

void KXmlCommandDlg::slotEditCommand()
{
KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget());
KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget());
}

void KXmlCommandDlg::slotAddReq()


+ 1
- 1
kdeprint/management/networkscanner.cpp View File

@@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked()
if ( !d->scanning )
{
if ( d->localPrefix() == d->prefixaddress ||
KMessageBox::warningContinueCancel( this->tqparentWidget(),
KMessageBox::warningContinueCancel( this->parentWidget(),
i18n( "You are about to scan a subnet (%1.*) that does not "
"correspond to the current subnet of this computer (%2.*). Do you want "
"to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ),


+ 3
- 3
kdeprint/messagewindow.cpp View File

@@ -55,13 +55,13 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent,

MessageWindow::~MessageWindow()
{
m_windows.remove( tqparentWidget() );
m_windows.remove( parentWidget() );
}

void MessageWindow::slotTimer()
{
TQSize psz = tqparentWidget()->size(), sz = tqsizeHint();
move( tqparentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
TQSize psz = parentWidget()->size(), sz = tqsizeHint();
move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
if ( !isVisible() )
{
show();


+ 2
- 2
kdeui/kaboutdialog.cpp View File

@@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
f.setBold( true );
mVersionLabel->setFont(f);
mAuthorLabel->setFont(f);
mVersionLabel->tqparentWidget()->layout()->activate();
mVersionLabel->parentWidget()->layout()->activate();
}

update();
@@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName,
mAuthorLabel->hide();
}

mIconLabel->tqparentWidget()->layout()->activate();
mIconLabel->parentWidget()->layout()->activate();
}




+ 1
- 1
kdeui/kaction.cpp View File

@@ -813,7 +813,7 @@ void KAction::plugMainWindowAccel( TQWidget *w )
// Note: tqtopLevelWidget() stops too early, we can't use it.
TQWidget * tl = w;
TQWidget * n;
while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
tl = n;

KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow


+ 1
- 1
kdeui/kactionclasses.cpp View File

@@ -2024,7 +2024,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index )
// Note: tqtopLevelWidget() stops too early, we can't use it.
TQWidget * tl = w;
TQWidget * n;
while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
tl = n;

KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow


+ 1
- 1
kdeui/kcommand.h View File

@@ -180,7 +180,7 @@ public:

/**
* Erases all the undo/redo history.
* Use this when reloading the data, for instance, since this tqinvalidates
* Use this when reloading the data, for instance, since this invalidates
* all the commands.
*/
void clear();


+ 3
- 3
kdeui/kdialogbase.cpp View File

@@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget)
{
delete d->detailsWidget;
d->detailsWidget = detailsWidget;
if (d->detailsWidget->tqparentWidget() != this)
if (d->detailsWidget->parentWidget() != this)
d->detailsWidget->reparent(this, TQPoint(0,0));
d->detailsWidget->hide();
if( mIsActivated )
@@ -1748,7 +1748,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
const TQString& groupName ) const
{
int w, h;
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);

w = tqsizeHint().width();
@@ -1771,7 +1771,7 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global )
void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName,
bool global ) const
{
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);

KConfigGroupSaver cs(&config, groupName);


+ 24
- 24
kdeui/kdockwidget.cpp View File

@@ -323,7 +323,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )

delete drag;
drag = nd;
if (drag->tqparentWidget()!=this) {
if (drag->parentWidget()!=this) {
drag->reparent(this,TQPoint(0,0));
}

@@ -351,7 +351,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
if (!btn) return;

if (btn->tqparentWidget()!=this) {
if (btn->parentWidget()!=this) {
btn->reparent(this,TQPoint(0,0));
}
btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
@@ -382,7 +382,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
}

void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
if (btn->tqparentWidget()==this) {
if (btn->parentWidget()==this) {
if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn);
delete btn;
}
@@ -858,7 +858,7 @@ void KDockWidget::show()
void KDockWidget::setDockWindowType (NET::WindowType windowType)
{
d->windowType = windowType;
applyToWidget( tqparentWidget(), TQPoint(0,0) );
applyToWidget( parentWidget(), TQPoint(0,0) );
}

#endif
@@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable
{
d->_parent = parent;
d->transient = transientEnabled;
applyToWidget( tqparentWidget(), TQPoint(0,0) );
applyToWidget( parentWidget(), TQPoint(0,0) );
}

TQWidget *KDockWidget::transientTo() {
@@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event )
emit manager->change();
break;
case TQEvent::CaptionChange:
if ( tqparentWidget() ){
if ( parentWidget() ){
if ( parent()->inherits("KDockSplitter") ){
((KDockSplitter*)(parent()))->updateName();
}
@@ -1091,7 +1091,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
}

// create a new dockwidget that will contain the target and this
TQWidget* parentDock = target->tqparentWidget();
TQWidget* parentDock = target->parentWidget();
KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock );
newDock->currentDockPos = target->currentDockPos;

@@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
KDockTabGroup* KDockWidget::parentDockTabGroup() const
{
if ( !parent() ) return 0L;
TQWidget* candidate = tqparentWidget()->tqparentWidget();
TQWidget* candidate = parentWidget()->parentWidget();
if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate;
return 0L;
}
@@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const
TQWidget *KDockWidget::parentDockContainer() const
{
if (!parent()) return 0L;
TQWidget* candidate = tqparentWidget()->tqparentWidget();
TQWidget* candidate = parentWidget()->parentWidget();
if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate;
return 0L;
}
@@ -1295,7 +1295,7 @@ void KDockWidget::undock()
manager->d->dragRect = TQRect ();
manager->drawDragRectangle ();

TQWidget* parentW = tqparentWidget();
TQWidget* parentW = parentWidget();
if ( !parentW ){
hide();
if (!d->blockHasUndockedSignal)
@@ -1337,7 +1337,7 @@ void KDockWidget::undock()
KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent();
delete parentTab; // KDockTabGroup

TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget();
TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
if ( !parentOfDockWidget ){
if ( isV ) lastTab->show();
} else {
@@ -1396,16 +1396,16 @@ void KDockWidget::undock()
d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent();

KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this );
KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget();
KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget();
setFormerBrotherDockWidget(secondWidget);
applyToWidget( 0L );
group->hide();

if ( !group->tqparentWidget() ){
if ( !group->parentWidget() ){
secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
secondWidget->resize( group->width(), group->height() );
} else {
TQWidget* obj = group->tqparentWidget();
TQWidget* obj = group->parentWidget();
secondWidget->applyToWidget( obj );
if ( obj->inherits("KDockSplitter") ){
KDockSplitter* parentOfGroup = (KDockSplitter*)obj;
@@ -1494,13 +1494,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
listOfCaption.remove( listOfCaption.length()-1, 1 );
listOfName.remove( listOfName.length()-1, 1 );

tab->tqparentWidget()->setName( listOfName.utf8() );
tab->tqparentWidget()->setCaption( listOfCaption );
tab->parentWidget()->setName( listOfName.utf8() );
tab->parentWidget()->setCaption( listOfCaption );

tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
if ( tab->tqparentWidget()->parent() )
if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") )
((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName();
tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
if ( tab->parentWidget()->parent() )
if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
}

bool KDockWidget::mayBeHide() const
@@ -1545,11 +1545,11 @@ void KDockWidget::makeDockVisible()
}
if ( isVisible() ) return;

TQWidget* p = tqparentWidget();
TQWidget* p = parentWidget();
while ( p ){
if ( !p->isVisible() )
p->show();
p = p->tqparentWidget();
p = p->parentWidget();
}
if( !parent() ) // is undocked
dockBack();
@@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w )
|| ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) {
w->prevSideDockPosBeforeDrag = w->currentDockPos;

if ( w->tqparentWidget()->inherits("KDockSplitter") ){
KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget());
if ( w->parentWidget()->inherits("KDockSplitter") ){
KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget());
w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent();
}
}


+ 7
- 7
kdeui/kdockwidget_private.cpp View File

@@ -585,15 +585,15 @@ void KDockSplitter::updateName()
if ( !initialised ) return;

TQString new_name = TQString( child0->name() ) + "," + child1->name();
tqparentWidget()->setName( new_name.latin1() );
tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
tqparentWidget()->tqrepaint( false );
parentWidget()->setName( new_name.latin1() );
parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
parentWidget()->tqrepaint( false );

((KDockWidget*)tqparentWidget())->firstName = child0->name();
((KDockWidget*)tqparentWidget())->lastName = child1->name();
((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation;
((KDockWidget*)parentWidget())->firstName = child0->name();
((KDockWidget*)parentWidget())->lastName = child1->name();
((KDockWidget*)parentWidget())->splitterOrientation = m_orientation;

TQWidget* p = tqparentWidget()->tqparentWidget();
TQWidget* p = parentWidget()->parentWidget();
if ( p && p->inherits("KDockSplitter" ) )
((KDockSplitter*)p)->updateName();
}


+ 2
- 2
kdeui/kfontdialog.cpp View File

@@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show)
{
if( show )
{
xlfdEdit->tqparentWidget()->show();
xlfdEdit->parentWidget()->show();
}
else
{
xlfdEdit->tqparentWidget()->hide();
xlfdEdit->parentWidget()->hide();
}
}



+ 1
- 1
kdeui/kfontrequester.cpp View File

@@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title )

void KFontRequester::buttonClicked()
{
int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() );
int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() );

if ( result == KDialog::Accepted )
{


+ 1
- 1
kdeui/khelpmenu.cpp View File

@@ -307,7 +307,7 @@ void KHelpMenu::contextHelpActivated()
TQWhatsThis::enterWhatsThisMode();
TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true );
while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") )
w = w->tqparentWidget();
w = w->parentWidget();
#ifdef Q_WS_X11
if ( w && w->inherits("QXEmbed") )
(( QXEmbed*) w )->enterWhatsThisMode();


+ 7
- 7
kdeui/kjanuswidget.cpp View File

@@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items,
TQString itemName = items.last();
IconListItem *item = new IconListItem( mIconList, pixmap, itemName );
mIconListToPageStack.insert(item, page);
mIconList->tqinvalidateHeight();
mIconList->tqinvalidateWidth();
mIconList->invalidateHeight();
mIconList->invalidateWidth();

if (mIconList->isVisible())
mIconList->updateWidth();
@@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const
//
if( widget->isA(TQFRAME_OBJECT_NAME_STRING) )
{
return d->mPageToInt[widget->tqparentWidget()];
return d->mPageToInt[widget->parentWidget()];
}
else
{
@@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged()
TQFont listFont( mIconList->font() );
listFont.setBold( true );
mIconList->setFont( listFont );
mIconList->tqinvalidateHeight();
mIconList->tqinvalidateWidth();
mIconList->invalidateHeight();
mIconList->invalidateWidth();
}
}

@@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth()
}


void KJanusWidget::IconListBox::tqinvalidateHeight()
void KJanusWidget::IconListBox::invalidateHeight()
{
mHeightValid = false;
}


void KJanusWidget::IconListBox::tqinvalidateWidth()
void KJanusWidget::IconListBox::invalidateWidth()
{
mWidthValid = false;
}


+ 2
- 2
kdeui/kjanuswidget.h View File

@@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public TQWidget
IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 );
void updateMinimumHeight();
void updateWidth();
void tqinvalidateHeight();
void tqinvalidateWidth();
void invalidateHeight();
void invalidateWidth();
void setShowAll( bool showAll );

protected:


+ 2
- 2
kdeui/kmainwindow.cpp View File

@@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force )

void KMainWindow::saveWindowSize( KConfig * config ) const
{
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
int w, h;
#if defined Q_WS_X11
@@ -937,7 +937,7 @@ void KMainWindow::restoreWindowSize( KConfig * config )
parseGeometry(true);
} else {
// restore the size
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
if ( d->defaultWindowSize.isNull() ) // only once
d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values


+ 17
- 17
kdeui/kmenubar.cpp View File

@@ -167,8 +167,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
top_level = true;

d->wasTopLevel = top_level;
if( tqparentWidget()
&& tqparentWidget()->tqtopLevelWidget()->isFullScreen())
if( parentWidget()
&& parentWidget()->tqtopLevelWidget()->isFullScreen())
top_level = false;

if ( isTopLevelMenu() == top_level )
@@ -189,19 +189,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
d->margin = margin();
d->fallback_mode = false;
bool wasShown = !isHidden();
reparent( tqparentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false );
reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false );
#ifdef Q_WS_X11
KWin::setType( winId(), NET::TopMenu );
if( tqparentWidget())
XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId());
if( parentWidget())
XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
#endif
TQMenuBar::setFrameStyle( NoFrame );
TQMenuBar::setLineWidth( 0 );
TQMenuBar::setMargin( 0 );
updateFallbackSize();
d->min_size = TQSize( 0, 0 );
if( tqparentWidget() && !tqparentWidget()->isTopLevel())
setShown( tqparentWidget()->isVisible());
if( parentWidget() && !parentWidget()->isTopLevel())
setShown( parentWidget()->isVisible());
else if ( wasShown )
show();
} else
@@ -217,8 +217,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
setMinimumSize( 0, 0 );
setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
updateMenuBarSize();
if ( tqparentWidget() )
reparent( tqparentWidget(), TQPoint(0,0), !isHidden());
if ( parentWidget() )
reparent( parentWidget(), TQPoint(0,0), !isHidden());
}
}

@@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
{
if ( d->topLevel )
{
if ( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget()) )
if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()) )
{
if( ev->type() == TQEvent::Resize )
return false; // ignore resizing of parent, TQMenuBar would try to adjust size
@@ -257,21 +257,21 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
// will update the state properly
setTopLevelMenuInternal( d->topLevel );
}
if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()) && ev->type() == TQEvent::Reparent )
if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent )
{
#ifdef Q_WS_X11
XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId());
XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible());
setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible());
}
if( tqparentWidget() && !tqparentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()))
if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()))
{ // if the parent is not toplevel, KMenuBar needs to match its visibility status
if( ev->type() == TQEvent::Show )
{
#ifdef Q_WS_X11
XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId());
XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -283,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
}
else
{
if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget()))
if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()))
{
if( ev->type() == TQEvent::WindowStateChange
&& !tqparentWidget()->tqtopLevelWidget()->isFullScreen() )
&& !parentWidget()->tqtopLevelWidget()->isFullScreen() )
setTopLevelMenuInternal( d->wasTopLevel );
}
}


+ 1
- 1
kdeui/kpanelapplet.cpp View File

@@ -82,7 +82,7 @@ void KPanelApplet::tqsetAlignment( Alignment a )
{
if( _tqalignment == a ) return;
_tqalignment = a;
tqalignmentChange( a );
alignmentChange( a );
}

// FIXME: Remove implementation for KDE 4


+ 1
- 1
kdeui/kpanelapplet.h View File

@@ -324,7 +324,7 @@ protected:
* Reimplement this change handler in order to adjust the look of your
* applet.
**/
virtual void tqalignmentChange( Alignment /*a*/ ) {}
virtual void alignmentChange( Alignment /*a*/ ) {}

/**
* Use this method to set the custom menu for this applet so that it can be shown


+ 1
- 1
kdeui/kpanelextension.cpp View File

@@ -75,7 +75,7 @@ void KPanelExtension::tqsetAlignment( Alignment a )
{
if( _tqalignment == a ) return;
_tqalignment = a;
tqalignmentChange( a );
alignmentChange( a );
}

void KPanelExtension::setSize( Size size, int customSize )


+ 1
- 1
kdeui/kpanelextension.h View File

@@ -309,7 +309,7 @@ protected:
* Reimplement this change handler in order to adjust the look of your
* applet.
**/
virtual void tqalignmentChange( Alignment ) {}
virtual void alignmentChange( Alignment ) {}

/**
* Use this method to set the custom menu for this extensions so that it can be shown


+ 1
- 1
kdeui/kpopupmenu.cpp View File

@@ -353,7 +353,7 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e)
// therefore the lastHitIndex is valid
i = d->lastHitIndex;
}
} else if (key == Key_Backspace && tqparentMenu) {
} else if (key == Key_Backspace && parentMenu) {
// backspace with no chars in the buffer... go back a menu.
hide();
resetKeyboardVars();


+ 10
- 10
kdeui/ksystemtray.cpp View File

@@ -77,13 +77,13 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
move( -1000, -1000 );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection);

if (tqparentWidget())
if (parentWidget())
{
new KAction(i18n("Minimize"), KShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ),
d->actionCollection, "minimizeRestore");
#ifdef Q_WS_X11
KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId());
KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId());
d->on_all_desktops = info.onAllDesktops();
#else
d->on_all_desktops = false;
@@ -152,9 +152,9 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e )
case Qt::MidButton:
// fall through
case Qt::RightButton:
if ( tqparentWidget() ) {
if ( parentWidget() ) {
KAction* action = d->actionCollection->action("minimizeRestore");
if ( tqparentWidget()->isVisible() )
if ( parentWidget()->isVisible() )
action->setText( i18n("&Minimize") );
else
action->setText( i18n("&Restore") );
@@ -182,8 +182,8 @@ void KSystemTray::contextMenuAboutToShow( KPopupMenu* )
// entry is "minimize", otherwise it's "restore"
void KSystemTray::minimizeRestoreAction()
{
if ( tqparentWidget() ) {
bool restore = !( tqparentWidget()->isVisible() );
if ( parentWidget() ) {
bool restore = !( parentWidget()->isVisible() );
minimizeRestore( restore );
}
}
@@ -207,9 +207,9 @@ void KSystemTray::maybeQuit()
// KDE4: stop closing the parent widget? it results in complex application code
// instead make applications connect to the quitSelected() signal

if (tqparentWidget())
if (parentWidget())
{
tqparentWidget()->close();
parentWidget()->close();
}
else
{
@@ -237,7 +237,7 @@ void KSystemTray::setInactive()
// (just like taskbar); otherwise hide it
void KSystemTray::activateOrHide()
{
TQWidget *pw = tqparentWidget();
TQWidget *pw = parentWidget();

if ( !pw )
return;
@@ -283,7 +283,7 @@ void KSystemTray::activateOrHide()

void KSystemTray::minimizeRestore( bool restore )
{
TQWidget* pw = tqparentWidget();
TQWidget* pw = parentWidget();
if( !pw )
return;
#ifdef Q_WS_X11


+ 2
- 2
kdeui/ksystemtray.h View File

@@ -163,7 +163,7 @@ protected:

/**
Reimplemented to provide the standard show/raise behavior
for the tqparentWidget() and the context menu.
for the parentWidget() and the context menu.

Feel free to reimplement this if you need something special.
*/
@@ -171,7 +171,7 @@ protected:

/**
Reimplemented to provide the standard show/raise behavior
for the tqparentWidget() and the context menu.
for the parentWidget() and the context menu.

Feel free to reimplement this if you need something special.
*/


+ 1
- 1
kdeui/ktabbar.cpp View File

@@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *parent, const char *name )
mActivateDragSwitchTabTimer = new TQTimer( this );
connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) );

connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange()));
connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange()));
}

KTabBar::~KTabBar()


+ 2
- 2
kdeui/kurllabel.cpp View File

@@ -353,8 +353,8 @@ bool KURLLabel::event (TQEvent *e)
{
if (e && e->type() == TQEvent::ParentPaletteChange)
{
// use tqparentWidget() unless you are a toplevel widget, then try qAapp
TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette();
// use parentWidget() unless you are a toplevel widget, then try qAapp
TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground());
setPalette(p);


+ 3
- 3
kdeui/kwhatsthismanager.cpp View File

@@ -52,8 +52,8 @@ TQString KWhatsThisUndefined::text (const TQPoint &)
" describe the widget, you are welcome to <a href=\"submit"
"-whatsthis\">send us your own \"What's This?\" help</a> for it.");
TQString parent;
if (m_widget -> tqparentWidget ())
parent = TQWhatsThis::textFor (m_widget -> tqparentWidget ());
if (m_widget -> parentWidget ())
parent = TQWhatsThis::textFor (m_widget -> parentWidget ());
if (parent != txt)
if (! parent . isEmpty ())
return parent;
@@ -68,7 +68,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href)
body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n");
TQString dsc = TQString ("current --> ") + m_widget -> name ();
dsc . append (TQString (" (") + m_widget -> className () + ")\n");
for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) {
for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> parentWidget ()) {
dsc . append (w -> name ());
dsc . append (TQString (" (") + w -> className () + ")\n");
}


+ 1
- 1
kdeui/kxmlguibuilder.cpp View File

@@ -146,7 +146,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
// otherwise its shortcuts appear.
TQWidget* p = parent;
while ( p && !::tqqt_cast<KMainWindow *>( p ) )
p = p->tqparentWidget();
p = p->parentWidget();

TQCString name = element.attribute( d->attrName ).utf8();



+ 1
- 1
kdeui/kxmlguiclient.cpp View File

@@ -269,7 +269,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
// tag, in any event and just replace the old with the new
if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon)
{
base.tqparentNode().tqreplaceChild(additive, base);
base.parentNode().tqreplaceChild(additive, base);
return true;
}



+ 1
- 1
kdeui/qxembed.cpp View File

@@ -839,7 +839,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
{
TQWidget* pos = this;
while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget()))
pos = pos->tqparentWidget();
pos = pos->parentWidget();
if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) {
// L1390: Send fake configure notify events whenever the
// global position of the client changes. See L2900.


+ 1
- 1
khtml/java/kjavaappletserver.cpp View File

@@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog()
void PermissionDialog::clicked()
{
m_button = TQT_TQOBJECT_CONST(sender())->name();
static_cast<const TQWidget*>(sender())->tqparentWidget()->close();
static_cast<const TQWidget*>(sender())->parentWidget()->close();
}

#include "kjavaappletserver.moc"

+ 2
- 2
khtml/khtml_factory.cpp View File

@@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory()
deref();
}

KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & )
KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & )
{
KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI;
if ( strcmp( className, "Browser/View" ) == 0 )
prof = KHTMLPart::BrowserViewGUI;

return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof );
return new KHTMLPart( parentWidget, widgetName, parent, name, prof );
}

void KHTMLFactory::ref()


+ 1
- 1
khtml/khtml_factory.h View File

@@ -45,7 +45,7 @@ public:
KHTMLFactory( bool clone = false );
virtual ~KHTMLFactory();

virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args );
virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args );

static void registerPart( KHTMLPart *part );
static void deregisterPart( KHTMLPart *part );


+ 5
- 5
khtml/khtml_part.cpp View File

@@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name )
return it;
}

KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof )
KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof )
: KParts::ReadOnlyPart( parent, name )
{
d = 0;
@@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject
setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
// TODO KDE4 - don't load plugins yet
//setInstance( KHTMLFactory::instance(), false );
init( new KHTMLView( this, tqparentWidget, widgetname ), prof );
init( new KHTMLView( this, parentWidget, widgetname ), prof );
}

KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof )
@@ -4643,7 +4643,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
}
}

KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName,
KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQString &mimetype,
TQString &serviceName, TQStringList &serviceTypes,
const TQStringList &params )
@@ -4679,9 +4679,9 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha
className = "Browser/View";

if ( factory->inherits( "KParts::Factory" ) )
res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params ));
res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params ));
else
res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(tqparentWidget), widgetName, className ));
res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className ));

if ( res ) {
serviceTypes = service->serviceTypes();


+ 3
- 3
khtml/khtml_part.h View File

@@ -243,10 +243,10 @@ public:
* re