TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d5688771d8)
pull/271/head
Michele Calgaro 11 months ago
parent af8caeadf3
commit 2a3a62bb99
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
102 changed files with 404 additions and 407 deletions
Show Stats Download Patch File Download Diff File

8
arts/kde/kvideowidget.cpp
Unescape View File

@ -102,16 +102,16 @@ void KVideoWidget::init(void)
// Setup actions // Setup actions
new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen", new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen",
CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()), CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" ); actionCollection(), "fullscreen_mode" );
new TDERadioAction( i18n("&Half Size"), ALT+Key_0, new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()), this, TQT_SLOT(halfSizeActivated()),
actionCollection(), "half_size" ); actionCollection(), "half_size" );
new TDERadioAction( i18n("&Normal Size"), ALT+Key_1, new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()), this, TQT_SLOT(normalSizeActivated()),
actionCollection(), "normal_size" ); actionCollection(), "normal_size" );
new TDERadioAction( i18n("&Double Size"), ALT+Key_2, new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()), this, TQT_SLOT(doubleSizeActivated()),
actionCollection(), "double_size" ); actionCollection(), "double_size" );
((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );

4
dcop/dcopobject.cpp
Unescape View File

@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj)
while (currentObj != 0L) { while (currentObj != 0L) {
ident.prepend( currentObj->name() ); ident.prepend( currentObj->name() );
ident.prepend("/"); ident.prepend("/");
currentObj = TQT_TQOBJECT(currentObj->parent()); currentObj = currentObj->parent();
} }
if ( ident[0] == '/' ) if ( ident[0] == '/' )
ident = ident.mid(1); ident = ident.mid(1);
@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj )
{ {
identity.prepend( currentObj->name() ); identity.prepend( currentObj->name() );
identity.prepend("/"); identity.prepend("/");
currentObj = TQT_TQOBJECT(currentObj->parent()); currentObj = currentObj->parent();
} }
if ( identity[0] == '/' ) if ( identity[0] == '/' )
identity = identity.mid(1); identity = identity.mid(1);

2
interfaces/khexedit/byteseditinterface.h
Unescape View File

@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
{ {
return KParts::ComponentFactory::createInstanceFromQuery<TQWidget> return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name ); ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
} }
} }

4
interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
Unescape View File

@ -25,7 +25,7 @@ protected:
{ {
Q_UNUSED(className); Q_UNUSED(className);
Q_UNUSED(args); Q_UNUSED(args);
return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name )); return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name );
} }
}; };
@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
public: public:
KFileAudioPreviewPrivate( TQWidget *parent ) KFileAudioPreviewPrivate( TQWidget *parent )
{ {
player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) ); player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), parent );
} }
~KFileAudioPreviewPrivate() ~KFileAudioPreviewPrivate()

1
kate/data/isocpp.xml
Unescape View File

@ -204,7 +204,6 @@
<item> TQ_UNUSED </item> <item> TQ_UNUSED </item>
<item> TQT_SIGNAL </item> <item> TQT_SIGNAL </item>
<item> TQT_SLOT </item> <item> TQT_SLOT </item>
<item> TQT_TQOBJECT </item>
<item> connect </item> <item> connect </item>
<item> disconnect </item> <item> disconnect </item>
<item> emit </item> <item> emit </item>

1
kate/data/objectivec.xml
Unescape View File

@ -127,7 +127,6 @@
<item> TQ_UNUSED </item> <item> TQ_UNUSED </item>
<item> TQT_SIGNAL </item> <item> TQT_SIGNAL </item>
<item> TQT_SLOT </item> <item> TQT_SLOT </item>
<item> TQT_TQOBJECT </item>
<item> connect </item> <item> connect </item>
<item> disconnect </item> <item> disconnect </item>
<item> emit </item> <item> emit </item>

1
kate/data/objectivecpp.xml
Unescape View File

@ -172,7 +172,6 @@
<item> TQ_UNUSED </item> <item> TQ_UNUSED </item>
<item> TQT_SIGNAL </item> <item> TQT_SIGNAL </item>
<item> TQT_SLOT </item> <item> TQT_SLOT </item>
<item> TQT_TQOBJECT </item>
<item> connect </item> <item> connect </item>
<item> disconnect </item> <item> disconnect </item>
<item> emit </item> <item> emit </item>

190
kate/part/kateview.cpp
Unescape View File

@ -187,21 +187,21 @@ KateView::~KateView()
void KateView::setupConnections() void KateView::setupConnections()
{ {
connect( m_doc, TQT_SIGNAL(undoChanged()), connect( m_doc, TQT_SIGNAL(undoChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotNewUndo()) ); this, TQT_SLOT(slotNewUndo()) );
connect( m_doc, TQT_SIGNAL(hlChanged()), connect( m_doc, TQT_SIGNAL(hlChanged()),
TQT_TQOBJECT(this), TQT_SLOT(slotHlChanged()) ); this, TQT_SLOT(slotHlChanged()) );
connect( m_doc, TQT_SIGNAL(canceled(const TQString&)), connect( m_doc, TQT_SIGNAL(canceled(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled(const TQString&)) ); this, TQT_SLOT(slotSaveCanceled(const TQString&)) );
connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
TQT_TQOBJECT(this), TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); this, TQT_SIGNAL(dropEventPass(TQDropEvent*)) );
connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg()));
connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg()));
connect(m_doc, TQT_SIGNAL(undoChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg())); connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg()));
if ( m_doc->browserView() ) if ( m_doc->browserView() )
{ {
connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)), connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
TQT_TQOBJECT(this), TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); this, TQT_SLOT(slotDropEventPass(TQDropEvent*)) );
} }
} }
@ -212,21 +212,21 @@ void KateView::setupActions()
m_toggleWriteLock = 0; m_toggleWriteLock = 0;
m_cut = a=KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), ac); m_cut = a=KStdAction::cut(this, TQT_SLOT(cut()), ac);
a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard")); a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard"));
m_paste = a=KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), ac); m_paste = a=KStdAction::pasteText(this, TQT_SLOT(paste()), ac);
a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents")); a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents"));
m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); m_copy = a=KStdAction::copy(this, TQT_SLOT(copy()), ac);
a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQT_SLOT(copyHTML()), ac, "edit_copy_html");
a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
if (!m_doc->readOnly()) if (!m_doc->readOnly())
{ {
a=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), ac); a=KStdAction::save(this, TQT_SLOT(save()), ac);
a->setWhatsThis(i18n("Save the current document")); a->setWhatsThis(i18n("Save the current document"));
a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac); a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac);
@ -235,60 +235,60 @@ void KateView::setupActions()
a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
a->setWhatsThis(i18n("Revert the most recent undo operation")); a->setWhatsThis(i18n("Revert the most recent undo operation"));
(new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
i18n("Use this command to wrap all lines of the current document which are longer than the width of the" i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
" current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated" " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
" when the view is resized.")); " when the view is resized."));
// setup Tools menu // setup Tools menu
a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent");
a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent");
a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>" a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); a=new TDEAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align");
a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQT_SLOT(comment()),
ac, "tools_comment"); ac, "tools_comment");
a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting.")); "The characters for single/multiple line comments are defined within the language's highlighting."));
a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQT_SLOT(uncomment()),
ac, "tools_uncomment"); ac, "tools_uncomment");
a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting.")); "The characters for single/multiple line comments are defined within the language's highlighting."));
a = m_toggleWriteLock = new TDEToggleAction( a = m_toggleWriteLock = new TDEToggleAction(
i18n("&Read Only Mode"), 0, 0, i18n("&Read Only Mode"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ), this, TQT_SLOT( toggleWriteLock() ),
ac, "tools_toggle_write_lock" ); ac, "tools_toggle_write_lock" );
a->setWhatsThis( i18n("Lock/unlock the document for writing") ); a->setWhatsThis( i18n("Lock/unlock the document for writing") );
a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, TQT_TQOBJECT(this), a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this,
TQT_SLOT(uppercase()), ac, "tools_uppercase" ); TQT_SLOT(uppercase()), ac, "tools_uppercase" );
a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
"right of the cursor if no text is selected.") ); "right of the cursor if no text is selected.") );
a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, TQT_TQOBJECT(this), a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this,
TQT_SLOT(lowercase()), ac, "tools_lowercase" ); TQT_SLOT(lowercase()), ac, "tools_lowercase" );
a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
"right of the cursor if no text is selected.") ); "right of the cursor if no text is selected.") );
a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, TQT_TQOBJECT(this), a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this,
TQT_SLOT(capitalize()), ac, "tools_capitalize" ); TQT_SLOT(capitalize()), ac, "tools_capitalize" );
a->setWhatsThis( i18n("Capitalize the selection, or the word under the " a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
"cursor if no text is selected.") ); "cursor if no text is selected.") );
a = new TDEAction( i18n("Delete Line"), 0, TQT_TQOBJECT(this), a = new TDEAction( i18n("Delete Line"), 0, this,
TQT_SLOT( killLine() ), ac, "tools_delete_line"); TQT_SLOT( killLine() ), ac, "tools_delete_line");
a->setWhatsThis(i18n("Use this to delete the current line.")); a->setWhatsThis(i18n("Use this to delete the current line."));
a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, TQT_TQOBJECT(this), a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this,
TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
a->setWhatsThis(i18n("Use this to join lines together.")); a->setWhatsThis(i18n("Use this to join lines together."));
} }
@ -303,13 +303,13 @@ void KateView::setupActions()
a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
a->setWhatsThis(i18n("Print the current document.")); a->setWhatsThis(i18n("Print the current document."));
a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQT_SLOT(reloadFile()), ac, "file_reload");
a->setWhatsThis(i18n("Reload the current document from disk.")); a->setWhatsThis(i18n("Reload the current document from disk."));
a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac); a=KStdAction::saveAs(this, TQT_SLOT(saveAs()), ac);
a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice.")); a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice."));
a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac); a=KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), ac);
a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
@ -329,45 +329,45 @@ void KateView::setupActions()
new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
// html export // html export
a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQT_SLOT(exportAsHTML()), ac, "file_export_html");
a->setWhatsThis(i18n("This command allows you to export the current document" a->setWhatsThis(i18n("This command allows you to export the current document"
" with all highlighting information into a HTML document.")); " with all highlighting information into a HTML document."));
m_selectAll = a=KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac); m_selectAll = a=KStdAction::selectAll(this, TQT_SLOT(selectAll()), ac);
a->setWhatsThis(i18n("Select the entire text of the current document.")); a->setWhatsThis(i18n("Select the entire text of the current document."));
m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac); m_deSelect = a=KStdAction::deselect(this, TQT_SLOT(clearSelection()), ac);
a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
a->setWhatsThis(i18n("This increases the display font size.")); a->setWhatsThis(i18n("This increases the display font size."));
a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
a->setWhatsThis(i18n("This decreases the display font size.")); a->setWhatsThis(i18n("This decreases the display font size."));
a= m_toggleBlockSelection = new TDEToggleAction( a= m_toggleBlockSelection = new TDEToggleAction(
i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()), this, TQT_SLOT(toggleBlockSelectionMode()),
ac, "set_verticalSelect"); ac, "set_verticalSelect");
a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
a= m_toggleInsert = new TDEToggleAction( a= m_toggleInsert = new TDEToggleAction(
i18n("Overwr&ite Mode"), Key_Insert, i18n("Overwr&ite Mode"), Key_Insert,
TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()), this, TQT_SLOT(toggleInsert()),
ac, "set_insert" ); ac, "set_insert" );
a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
TDEToggleAction *toggleAction; TDEToggleAction *toggleAction;
a= m_toggleDynWrap = toggleAction = new TDEToggleAction( a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
i18n("&Dynamic Word Wrap"), Key_F10, i18n("&Dynamic Word Wrap"), Key_F10,
TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()), this, TQT_SLOT(toggleDynWordWrap()),
ac, "view_dynamic_word_wrap" ); ac, "view_dynamic_word_wrap" );
a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int))); connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDynWrapIndicators(int)));
TQStringList list2; TQStringList list2;
list2.append(i18n("&Off")); list2.append(i18n("&Off"));
list2.append(i18n("Follow &Line Numbers")); list2.append(i18n("Follow &Line Numbers"));
@ -376,14 +376,14 @@ void KateView::setupActions()
a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
i18n("Show Folding &Markers"), Key_F9, i18n("Show Folding &Markers"), Key_F9,
TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()), this, TQT_SLOT(toggleFoldingMarkers()),
ac, "view_folding_markers" ); ac, "view_folding_markers" );
a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
toggleAction->setCheckedState(i18n("Hide Folding &Markers")); toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
a= m_toggleIconBar = toggleAction = new TDEToggleAction( a= m_toggleIconBar = toggleAction = new TDEToggleAction(
i18n("Show &Icon Border"), Key_F6, i18n("Show &Icon Border"), Key_F6,
TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()), this, TQT_SLOT(toggleIconBorder()),
ac, "view_border"); ac, "view_border");
a=toggleAction; a=toggleAction;
a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance.")); a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
@ -391,21 +391,21 @@ void KateView::setupActions()
a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
i18n("Show &Line Numbers"), Key_F11, i18n("Show &Line Numbers"), Key_F11,
TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()), this, TQT_SLOT(toggleLineNumbersOn()),
ac, "view_line_numbers" ); ac, "view_line_numbers" );
a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
toggleAction->setCheckedState(i18n("Hide &Line Numbers")); toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
i18n("Show Scroll&bar Marks"), 0, i18n("Show Scroll&bar Marks"), 0,
TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()), this, TQT_SLOT(toggleScrollBarMarks()),
ac, "view_scrollbar_marks"); ac, "view_scrollbar_marks");
a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks.")); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
a = toggleAction = m_toggleWWMarker = new TDEToggleAction( a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
i18n("Show Static &Word Wrap Marker"), 0, i18n("Show Static &Word Wrap Marker"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ), this, TQT_SLOT( toggleWWMarker() ),
ac, "view_word_wrap_marker" ); ac, "view_word_wrap_marker" );
a->setWhatsThis( i18n( a->setWhatsThis( i18n(
"Show/hide the Word Wrap Marker, a vertical line drawn at the word " "Show/hide the Word Wrap Marker, a vertical line drawn at the word "
@ -414,7 +414,7 @@ void KateView::setupActions()
a= m_switchCmdLine = new TDEAction( a= m_switchCmdLine = new TDEAction(
i18n("Switch to Command Line"), Key_F7, i18n("Switch to Command Line"), Key_F7,
TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()), this, TQT_SLOT(switchToCmdLine()),
ac, "switch_to_cmd_line" ); ac, "switch_to_cmd_line" );
a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
@ -426,10 +426,10 @@ void KateView::setupActions()
list.append("&Macintosh"); list.append("&Macintosh");
m_setEndOfLine->setItems(list); m_setEndOfLine->setItems(list);
m_setEndOfLine->setCurrentItem (m_doc->config()->eol()); m_setEndOfLine->setCurrentItem (m_doc->config()->eol());
connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setEol(int))); connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEol(int)));
// encoding menu // encoding menu
new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), TQT_TQOBJECT(ac), "set_encoding"); new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding");
m_search->createActions( ac ); m_search->createActions( ac );
m_spell->createActions( ac ); m_spell->createActions( ac );
@ -437,144 +437,144 @@ void KateView::setupActions()
slotSelectionChanged (); slotSelectionChanged ();
connect (this, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged())); connect (this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
} }
void KateView::setupEditActions() void KateView::setupEditActions()
{ {
m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); m_editActions = new TDEActionCollection( m_viewInternal, this, "edit_actions" );
TDEActionCollection* ac = m_editActions; TDEActionCollection* ac = m_editActions;
new TDEAction( new TDEAction(
i18n("Move Word Left"), CTRL + Key_Left, i18n("Move Word Left"), CTRL + Key_Left,
TQT_TQOBJECT(this),TQT_SLOT(wordLeft()), this,TQT_SLOT(wordLeft()),
ac, "word_left" ); ac, "word_left" );
new TDEAction( new TDEAction(
i18n("Select Character Left"), SHIFT + Key_Left, i18n("Select Character Left"), SHIFT + Key_Left,
TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()), this,TQT_SLOT(shiftCursorLeft()),
ac, "select_char_left" ); ac, "select_char_left" );
new TDEAction( new TDEAction(
i18n("Select Word Left"), SHIFT + CTRL + Key_Left, i18n("Select Word Left"), SHIFT + CTRL + Key_Left,
TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()), this, TQT_SLOT(shiftWordLeft()),
ac, "select_word_left" ); ac, "select_word_left" );
new TDEAction( new TDEAction(
i18n("Move Word Right"), CTRL + Key_Right, i18n("Move Word Right"), CTRL + Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(wordRight()), this, TQT_SLOT(wordRight()),
ac, "word_right" ); ac, "word_right" );
new TDEAction( new TDEAction(
i18n("Select Character Right"), SHIFT + Key_Right, i18n("Select Character Right"), SHIFT + Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()), this, TQT_SLOT(shiftCursorRight()),
ac, "select_char_right" ); ac, "select_char_right" );
new TDEAction( new TDEAction(
i18n("Select Word Right"), SHIFT + CTRL + Key_Right, i18n("Select Word Right"), SHIFT + CTRL + Key_Right,
TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()), this,TQT_SLOT(shiftWordRight()),
ac, "select_word_right" ); ac, "select_word_right" );
new TDEAction( new TDEAction(
i18n("Move to Beginning of Line"), Key_Home, i18n("Move to Beginning of Line"), Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(home()), this, TQT_SLOT(home()),
ac, "beginning_of_line" ); ac, "beginning_of_line" );
new TDEAction( new TDEAction(
i18n("Move to Beginning of Document"), TDEStdAccel::home(), i18n("Move to Beginning of Document"), TDEStdAccel::home(),
TQT_TQOBJECT(this), TQT_SLOT(top()), this, TQT_SLOT(top()),
ac, "beginning_of_document" ); ac, "beginning_of_document" );
new TDEAction( new TDEAction(
i18n("Select to Beginning of Line"), SHIFT + Key_Home, i18n("Select to Beginning of Line"), SHIFT + Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(shiftHome()), this, TQT_SLOT(shiftHome()),
ac, "select_beginning_of_line" ); ac, "select_beginning_of_line" );
new TDEAction( new TDEAction(
i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(shiftTop()), this, TQT_SLOT(shiftTop()),
ac, "select_beginning_of_document" ); ac, "select_beginning_of_document" );
new TDEAction( new TDEAction(
i18n("Move to End of Line"), Key_End, i18n("Move to End of Line"), Key_End,
TQT_TQOBJECT(this), TQT_SLOT(end()), this, TQT_SLOT(end()),
ac, "end_of_line" ); ac, "end_of_line" );
new TDEAction( new TDEAction(
i18n("Move to End of Document"), TDEStdAccel::end(), i18n("Move to End of Document"), TDEStdAccel::end(),
TQT_TQOBJECT(this), TQT_SLOT(bottom()), this, TQT_SLOT(bottom()),
ac, "end_of_document" ); ac, "end_of_document" );
new TDEAction( new TDEAction(
i18n("Select to End of Line"), SHIFT + Key_End, i18n("Select to End of Line"), SHIFT + Key_End,
TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()), this, TQT_SLOT(shiftEnd()),
ac, "select_end_of_line" ); ac, "select_end_of_line" );
new TDEAction( new TDEAction(
i18n("Select to End of Document"), SHIFT + CTRL + Key_End, i18n("Select to End of Document"), SHIFT + CTRL + Key_End,
TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()), this, TQT_SLOT(shiftBottom()),
ac, "select_end_of_document" ); ac, "select_end_of_document" );
new TDEAction( new TDEAction(
i18n("Select to Previous Line"), SHIFT + Key_Up, i18n("Select to Previous Line"), SHIFT + Key_Up,
TQT_TQOBJECT(this), TQT_SLOT(shiftUp()), this, TQT_SLOT(shiftUp()),
ac, "select_line_up" ); ac, "select_line_up" );
new TDEAction( new TDEAction(
i18n("Scroll Line Up"),"", CTRL + Key_Up, i18n("Scroll Line Up"),"", CTRL + Key_Up,
TQT_TQOBJECT(this), TQT_SLOT(scrollUp()), this, TQT_SLOT(scrollUp()),
ac, "scroll_line_up" ); ac, "scroll_line_up" );
new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQT_SLOT(down()),
ac, "move_line_down"); ac, "move_line_down");
new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQT_SLOT(up()),
ac, "move_line_up"); ac, "move_line_up");
new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), new TDEAction(i18n("Move Character Right"), Key_Right, this,
TQT_SLOT(cursorRight()), ac, "move_cursor_right"); TQT_SLOT(cursorRight()), ac, "move_cursor_right");
new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), new TDEAction(i18n("Move Character Left"), Key_Left, this, TQT_SLOT(cursorLeft()),
ac, "move_cusor_left"); ac, "move_cusor_left");
new TDEAction( new TDEAction(
i18n("Select to Next Line"), SHIFT + Key_Down, i18n("Select to Next Line"), SHIFT + Key_Down,
TQT_TQOBJECT(this), TQT_SLOT(shiftDown()), this, TQT_SLOT(shiftDown()),
ac, "select_line_down" ); ac, "select_line_down" );
new TDEAction( new TDEAction(
i18n("Scroll Line Down"), CTRL + Key_Down, i18n("Scroll Line Down"), CTRL + Key_Down,
TQT_TQOBJECT(this), TQT_SLOT(scrollDown()), this, TQT_SLOT(scrollDown()),
ac, "scroll_line_down" ); ac, "scroll_line_down" );
new TDEAction( new TDEAction(
i18n("Scroll Page Up"), TDEStdAccel::prior(), i18n("Scroll Page Up"), TDEStdAccel::prior(),
TQT_TQOBJECT(this), TQT_SLOT(pageUp()), this, TQT_SLOT(pageUp()),
ac, "scroll_page_up" ); ac, "scroll_page_up" );
new TDEAction( new TDEAction(
i18n("Select Page Up"), SHIFT + Key_PageUp, i18n("Select Page Up"), SHIFT + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()), this, TQT_SLOT(shiftPageUp()),
ac, "select_page_up" ); ac, "select_page_up" );
new TDEAction( new TDEAction(
i18n("Move to Top of View"), CTRL + Key_PageUp, i18n("Move to Top of View"), CTRL + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(topOfView()), this, TQT_SLOT(topOfView()),
ac, "move_top_of_view" ); ac, "move_top_of_view" );
new TDEAction( new TDEAction(
i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()), this, TQT_SLOT(shiftTopOfView()),
ac, "select_top_of_view" ); ac, "select_top_of_view" );
new TDEAction( new TDEAction(
i18n("Scroll Page Down"), TDEStdAccel::next(), i18n("Scroll Page Down"), TDEStdAccel::next(),
TQT_TQOBJECT(this), TQT_SLOT(pageDown()), this, TQT_SLOT(pageDown()),
ac, "scroll_page_down" ); ac, "scroll_page_down" );
new TDEAction( new TDEAction(
i18n("Select Page Down"), SHIFT + Key_PageDown, i18n("Select Page Down"), SHIFT + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()), this, TQT_SLOT(shiftPageDown()),
ac, "select_page_down" ); ac, "select_page_down" );
new TDEAction( new TDEAction(
i18n("Move to Bottom of View"), CTRL + Key_PageDown, i18n("Move to Bottom of View"), CTRL + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()), this, TQT_SLOT(bottomOfView()),
ac, "move_bottom_of_view" ); ac, "move_bottom_of_view" );
new TDEAction( new TDEAction(
i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()), this, TQT_SLOT(shiftBottomOfView()),
ac, "select_bottom_of_view" ); ac, "select_bottom_of_view" );
new TDEAction( new TDEAction(
i18n("Move to Matching Bracket"), CTRL + Key_6, i18n("Move to Matching Bracket"), CTRL + Key_6,
TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()), this, TQT_SLOT(toMatchingBracket()),
ac, "to_matching_bracket" ); ac, "to_matching_bracket" );
new TDEAction( new TDEAction(
i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6,
TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()), this, TQT_SLOT(shiftToMatchingBracket()),
ac, "select_matching_bracket" ); ac, "select_matching_bracket" );
// anders: shortcuts doing any changes should not be created in browserextension // anders: shortcuts doing any changes should not be created in browserextension
@ -582,30 +582,30 @@ void KateView::setupEditActions()
{ {
new TDEAction( new TDEAction(
i18n("Transpose Characters"), CTRL + Key_T, i18n("Transpose Characters"), CTRL + Key_T,
TQT_TQOBJECT(this), TQT_SLOT(transpose()), this, TQT_SLOT(transpose()),
ac, "transpose_char" ); ac, "transpose_char" );
new TDEAction( new TDEAction(
i18n("Delete Line"), CTRL + Key_K, i18n("Delete Line"), CTRL + Key_K,
TQT_TQOBJECT(this), TQT_SLOT(killLine()), this, TQT_SLOT(killLine()),
ac, "delete_line" ); ac, "delete_line" );
new TDEAction( new TDEAction(
i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(),
TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()), this, TQT_SLOT(deleteWordLeft()),
ac, "delete_word_left" ); ac, "delete_word_left" );
new TDEAction( new TDEAction(
i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(),
TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()), this, TQT_SLOT(deleteWordRight()),
ac, "delete_word_right" ); ac, "delete_word_right" );
new TDEAction(i18n("Delete Next Character"), Key_Delete, new TDEAction(i18n("Delete Next Character"), Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(keyDelete()), this, TQT_SLOT(keyDelete()),
ac, "delete_next_character"); ac, "delete_next_character");
TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
TQT_TQOBJECT(this), TQT_SLOT(backspace()), this, TQT_SLOT(backspace()),
ac, "backspace"); ac, "backspace");
TDEShortcut cut = a->shortcut(); TDEShortcut cut = a->shortcut();
cut.append( KKey( SHIFT + Key_Backspace ) ); cut.append( KKey( SHIFT + Key_Backspace ) );
@ -613,9 +613,9 @@ void KateView::setupEditActions()
} }
connect( this, TQT_SIGNAL(gotFocus(Kate::View*)), connect( this, TQT_SIGNAL(gotFocus(Kate::View*)),
TQT_TQOBJECT(this), TQT_SLOT(slotGotFocus()) ); this, TQT_SLOT(slotGotFocus()) );
connect( this, TQT_SIGNAL(lostFocus(Kate::View*)), connect( this, TQT_SIGNAL(lostFocus(Kate::View*)),
TQT_TQOBJECT(this), TQT_SLOT(slotLostFocus()) ); this, TQT_SLOT(slotLostFocus()) );
m_editActions->readShortcutSettings( "Katepart Shortcuts" ); m_editActions->readShortcutSettings( "Katepart Shortcuts" );
@ -633,14 +633,14 @@ void KateView::setupCodeFolding()
new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); this,TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); this,TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); this,TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
#ifdef DEBUGACCELS #ifdef DEBUGACCELS
TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this)); TDEAccel* debugAccels = new TDEAccel(this,this);
debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
debugAccels->setEnabled(true); debugAccels->setEnabled(true);
@ -670,15 +670,15 @@ void KateView::setupCodeCompletion()
{ {
m_codeCompletion = new KateCodeCompletion(this); m_codeCompletion = new KateCodeCompletion(this);
connect( m_codeCompletion, TQT_SIGNAL(completionAborted()), connect( m_codeCompletion, TQT_SIGNAL(completionAborted()),
TQT_TQOBJECT(this), TQT_SIGNAL(completionAborted())); this, TQT_SIGNAL(completionAborted()));
connect( m_codeCompletion, TQT_SIGNAL(completionDone()), connect( m_codeCompletion, TQT_SIGNAL(completionDone()),
TQT_TQOBJECT(this), TQT_SIGNAL(completionDone())); this, TQT_SIGNAL(completionDone()));
connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()), connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()),
TQT_TQOBJECT(this), TQT_SIGNAL(argHintHidden())); this, TQT_SIGNAL(argHintHidden()));
connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)),
TQT_TQOBJECT(this), TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); this, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)));
connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)),
TQT_TQOBJECT(this), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); this, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)));
} }
void KateView::slotGotFocus() void KateView::slotGotFocus()

2
kate/part/kateviewinternal.cpp
Unescape View File

@ -57,7 +57,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
, editIsRunning (false) , editIsRunning (false)
, m_view (view) , m_view (view)
, m_doc (doc) , m_doc (doc)
, cursor (doc, true, 0, 0, TQT_TQOBJECT(this)) , cursor (doc, true, 0, 0, this)
, possibleTripleClick (false) , possibleTripleClick (false)
, m_dummy (0) , m_dummy (0)
, m_startPos(doc, true, 0,0) , m_startPos(doc, true, 0,0)

2
libtdescreensaver/tdescreensaver.cpp
Unescape View File

@ -50,7 +50,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
XSync(tqt_xdisplay(), false); XSync(tqt_xdisplay(), false);
d = new KScreenSaverPrivate; d = new KScreenSaverPrivate;
d->owner = TQT_TQWIDGET(find( id )); d->owner = find( id );
if ( d->owner ) if ( d->owner )
installEventFilter( this ); installEventFilter( this );

4
tdeabc/resourceselectdialog.cpp
Unescape View File

@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
KButtonBox *buttonBox = new KButtonBox( this ); KButtonBox *buttonBox = new KButtonBox( this );
buttonBox->addStretch(); buttonBox->addStretch();
buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
buttonBox->layout(); buttonBox->layout();
mainLayout->addWidget( buttonBox ); mainLayout->addWidget( buttonBox );

2
tdecore/kcheckaccelerators.cpp
Unescape View File

@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on)
void KCheckAccelerators::checkAccelerators( bool automatic ) void KCheckAccelerators::checkAccelerators( bool automatic )
{ {
TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow()); TQWidget* actWin = tqApp->activeWindow();
if ( !actWin ) if ( !actWin )
return; return;

2
tdecore/kclipboard.cpp
Unescape View File

@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false;
TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() TDEClipboardSynchronizer * TDEClipboardSynchronizer::self()
{ {
if ( !s_self ) if ( !s_self )
s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" );
return s_self; return s_self;
} }

2
tdecore/kextsock.cpp
Unescape View File

@ -1228,7 +1228,7 @@ int KExtendedSocket::startAsyncConnect()
// here we have d->status >= lookupDone and <= connecting // here we have d->status >= lookupDone and <= connecting
// we can do our connection // we can do our connection
d->status = connecting; d->status = connecting;
TQGuardedPtr<TQObject> p = TQT_TQOBJECT(this); TQGuardedPtr<TQObject> p = this;
connectionEvent(); connectionEvent();
if (!p) if (!p)
return -1; // We have been deleted. return -1; // We have been deleted.

4
tdecore/kgenericfactory.h
Unescape View File

@ -190,8 +190,8 @@ protected:
const char *className, const TQStringList &args ) const char *className, const TQStringList &args )
{ {
KGenericFactoryBase<Product>::initializeMessageCatalogue(); KGenericFactoryBase<Product>::initializeMessageCatalogue();
return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType> return (KDEPrivate::ConcreteFactory<Product, ParentType>
::create( 0, 0, parent, name, className, args ))); ::create( 0, 0, parent, name, className, args ));
} }
}; };

4
tdecore/kmanagerselection.cpp
Unescape View File

@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate
TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P ) TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P )
: owner( owner_P ) : owner( owner_P )
{ {
kapp->installX11EventFilter( TQT_TQWIDGET(this) ); kapp->installX11EventFilter( this );
} }
bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P ) bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P )
@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate
TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P ) TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P )
: watcher( watcher_P ) : watcher( watcher_P )
{ {
kapp->installX11EventFilter( TQT_TQWIDGET(this) ); kapp->installX11EventFilter( this );
} }
bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P ) bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P )

2
tdecore/knotifyclient.cpp
Unescape View File

@ -97,7 +97,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure! int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure!
// knotify daemon needs toplevel window // knotify daemon needs toplevel window
TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId )); TQWidget* widget = TQWidget::find( (WId)winId );
if( widget ) if( widget )
winId = (int)widget->topLevelWidget()->winId(); winId = (int)widget->topLevelWidget()->winId();

4
tdecore/network/kresolver.cpp
Unescape View File

@ -591,7 +591,7 @@ KResolverResults
KResolver::resolve(const TQString& host, const TQString& service, int flags, KResolver::resolve(const TQString& host, const TQString& service, int flags,
int families) int families)
{ {
KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver"); KResolver qres(host, service, tqApp, "synchronous KResolver");
qres.setFlags(flags); qres.setFlags(flags);
qres.setFamily(families); qres.setFamily(families);
qres.start(); qres.start();
@ -603,7 +603,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot,
const TQString& host, const TQString& service, const TQString& host, const TQString& service,
int flags, int families) int flags, int families)
{ {
KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver"); KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver");
TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot); TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot);
qres->setFlags(flags); qres->setFlags(flags);
qres->setFamily(families); qres->setFamily(families);

2
tdecore/tdeaccel.cpp
Unescape View File

@ -111,7 +111,7 @@ TDEAccelEventHandler::TDEAccelEventHandler()
{ {
# ifdef Q_WS_X11 # ifdef Q_WS_X11
if ( kapp ) if ( kapp )
kapp->installX11EventFilter( TQT_TQWIDGET(this) ); kapp->installX11EventFilter( this );
# endif # endif
} }

4
tdecore/tdeaccelmanager.cpp
Unescape View File

@ -265,7 +265,7 @@ void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item
TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); TQObjectList *childList = widget->queryList("TQWidget", 0, false, false);
for ( TQObject *it = childList->first(); it; it = childList->next() ) for ( TQObject *it = childList->first(); it; it = childList->next() )
{ {
TQWidget *w = TQT_TQWIDGET(it); TQWidget *w = static_cast<TQWidget*>(it);
if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) ) if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
continue; continue;
@ -846,7 +846,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
{ {
if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) { if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) ); TDEAcceleratorManager::manage( tqApp->activeWindow() );
watched->removeEventFilter( this ); watched->removeEventFilter( this );
} }
return false; return false;

8
tdecore/tdeapplication.cpp
Unescape View File

@ -626,7 +626,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
} }
if( t == TQEvent::Show && receiver->isWidgetType()) if( t == TQEvent::Show && receiver->isWidgetType())
{ {
TQWidget* w = TQT_TQWIDGET( receiver ); TQWidget* w = static_cast<TQWidget*>( receiver );
#if defined Q_WS_X11 #if defined Q_WS_X11
if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader? if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader?
TDEStartupInfo::setWindowStartupId( w->winId(), startupId()); TDEStartupInfo::setWindowStartupId( w->winId(), startupId());
@ -1099,7 +1099,7 @@ void TDEApplication::init(bool GUIenabled)
TQMimeSourceFactory::addFactory( oldDefaultFactory ); TQMimeSourceFactory::addFactory( oldDefaultFactory );
} }
d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) ); d->checkAccelerators = new KCheckAccelerators( this );
} }
#ifdef Q_WS_MACX #ifdef Q_WS_MACX
@ -1132,7 +1132,7 @@ void TDEApplication::init(bool GUIenabled)
// save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage, // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage,
// which makes it impossible to use the -reverse cmdline switch with KDE apps // which makes it impossible to use the -reverse cmdline switch with KDE apps
bool rtl = reverseLayout(); bool rtl = reverseLayout();
installTranslator(new KDETranslator(TQT_TQOBJECT(this))); installTranslator(new KDETranslator(this));
setReverseLayout( rtl ); setReverseLayout( rtl );
if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in " if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in "
"left-to-right languages (as english) or to 'RTL' in right-to-left " "left-to-right languages (as english) or to 'RTL' in right-to-left "
@ -2307,7 +2307,7 @@ void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigne
void TDEApplication::invokeEditSlot( const char *slot ) void TDEApplication::invokeEditSlot( const char *slot )
{ {
TQObject *object = TQT_TQOBJECT(focusWidget()); TQObject *object = focusWidget();
if( !object ) if( !object )
return; return;

12
tdehtml/ecma/kjs_debugwin.cpp
Unescape View File

@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
// Venkman use F12, KDevelop F10 // Venkman use F12, KDevelop F10
TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12))); TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12)));
scNext.append(KKeySequence(KKey(TQt::Key_F10))); scNext.append(KKeySequence(KKey(TQt::Key_F10)));
m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()), m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQT_SLOT(slotNext()),
m_actionCollection,"next"); m_actionCollection,"next");
m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()), m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQT_SLOT(slotStep()),
m_actionCollection,"step"); m_actionCollection,"step");
// Venkman use F5, Kdevelop F9 // Venkman use F5, Kdevelop F9
TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5))); TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
scCont.append(KKeySequence(KKey(TQt::Key_F9))); scCont.append(KKeySequence(KKey(TQt::Key_F9)));
m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()), m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()),
m_actionCollection,"cont"); m_actionCollection,"cont");
m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()), m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQT_SLOT(slotStop()),
m_actionCollection,"stop"); m_actionCollection,"stop");
m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()), m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext"); m_actionCollection,"breaknext");
@ -677,7 +677,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::Close: case TQEvent::Close:
case TQEvent::Quit: case TQEvent::Quit:
while (o->parent()) while (o->parent())
o = TQT_TQOBJECT(o->parent()); o = o->parent();
if (o == this) if (o == this)
return TQWidget::eventFilter(o,e); return TQWidget::eventFilter(o,e);
else else

4
tdehtml/java/kjavaappletserver.cpp
Unescape View File

@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
KSSLCertChain chain; KSSLCertChain chain;
chain.setChain( certs ); chain.setChain( certs );
if ( chain.isValid() ) if ( chain.isValid() )
answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] ); answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] );
} }
} }
sl.push_front( TQString(answer) ); sl.push_front( TQString(answer) );
@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent )
{} {}
TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) {
TQGuardedPtr<TQDialog> dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog"); TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog");
dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
dialog->setModal( true ); dialog->setModal( true );

2
tdehtml/java/kjavaappletviewer.cpp
Unescape View File

@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
KJavaAppletViewer::~KJavaAppletViewer () { KJavaAppletViewer::~KJavaAppletViewer () {
m_view = 0L; m_view = 0L;
serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl); serverMaintainer->releaseContext (parent(), baseurl);
if (m_statusbar_icon) { if (m_statusbar_icon) {
m_statusbar->removeStatusBarItem (m_statusbar_icon); m_statusbar->removeStatusBarItem (m_statusbar_icon);
delete m_statusbar_icon; delete m_statusbar_icon;

2
tdehtml/java/kjavaappletwidget.cpp
Unescape View File

@ -46,7 +46,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
m_applet = new KJavaApplet( this ); m_applet = new KJavaApplet( this );
d = new KJavaAppletWidgetPrivate; d = new KJavaAppletWidgetPrivate;
m_kwm = new KWinModule( TQT_TQOBJECT(this) ); m_kwm = new KWinModule( this );
d->tmplabel = new TQLabel( this ); d->tmplabel = new TQLabel( this );
d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );

10
tdehtml/rendering/render_form.cpp
Unescape View File

@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
{ {
setMouseTracking(true); setMouseTracking(true);
TDEActionCollection *ac = new TDEActionCollection(this); TDEActionCollection *ac = new TDEActionCollection(this);
m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac ); m_spellAction = KStdAction::spelling( this, TQT_SLOT( slotCheckSpelling() ), ac );
} }
LineEditWidget::~LineEditWidget() LineEditWidget::~LineEditWidget()
@ -328,7 +328,7 @@ void LineEditWidget::slotCheckSpelling()
} }
delete m_spell; delete m_spell;
m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) ); connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) );
connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
setMouseTracking(true); setMouseTracking(true);
TDEActionCollection *ac = new TDEActionCollection(this); TDEActionCollection *ac = new TDEActionCollection(this);
m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac ); m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac );
m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac ); m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac );
m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac ); m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac );
} }

2
tdehtml/tdehtml_part.cpp
Unescape View File

@ -4684,7 +4684,7 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha
if ( factory->inherits( "KParts::Factory" ) ) if ( factory->inherits( "KParts::Factory" ) )
res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params ));
else else
res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className )); res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className ));
if ( res ) { if ( res ) {
serviceTypes = service->serviceTypes(); serviceTypes = service->serviceTypes();

16
tdehtml/tdehtmlview.cpp
Unescape View File

@ -499,7 +499,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
// initialize QScrollView // initialize QScrollView
enableClipper(true); enableClipper(true);
// hack to get unclipped painting on the viewport. // hack to get unclipped painting on the viewport.
static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped); static_cast<TDEHTMLView *>(viewport())->setWFlags(WPaintUnclipped);
setResizePolicy(Manual); setResizePolicy(Manual);
viewport()->setMouseTracking(true); viewport()->setMouseTracking(true);
@ -579,7 +579,7 @@ void TDEHTMLView::clear()
if ( d->cursor_icon_widget ) if ( d->cursor_icon_widget )
d->cursor_icon_widget->hide(); d->cursor_icon_widget->hide();
d->reset(); d->reset();
TQT_TQOBJECT(this)->killTimers(); this->killTimers();
emit cleared(); emit cleared();
TQScrollView::setHScrollBarMode(d->hmode); TQScrollView::setHScrollBarMode(d->hmode);
@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs()
} }
else else
{ {
kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl; kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl;
TQT_TQWIDGET(dlg)->hide(); static_cast<TQWidget*>(dlg)->hide();
} }
} }
delete dlgs; delete dlgs;
@ -1899,9 +1899,9 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
// we need to install an event filter on all children of the viewport to // we need to install an event filter on all children of the viewport to
// be able to get correct stacking of children within the document. // be able to get correct stacking of children within the document.
if(e->type() == TQEvent::ChildInserted) { if(e->type() == TQEvent::ChildInserted) {
TQObject *c = TQT_TQOBJECT(static_cast<TQChildEvent*>(e)->child()); TQObject *c = static_cast<TQChildEvent*>(e)->child();
if (c->isWidgetType()) { if (c->isWidgetType()) {
TQWidget *w = TQT_TQWIDGET(c); TQWidget *w = static_cast<TQWidget*>(c);
// don't install the event filter on toplevels // don't install the event filter on toplevels
if (w->parentWidget(true) == view) { if (w->parentWidget(true) == view) {
if (!strcmp(w->name(), "__tdehtml")) { if (!strcmp(w->name(), "__tdehtml")) {
@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
} }
} }
} else if (o->isWidgetType()) { } else if (o->isWidgetType()) {
TQWidget *v = TQT_TQWIDGET(o); TQWidget *v = static_cast<TQWidget*>(o);
TQWidget *c = v; TQWidget *c = v;
while (v && v != view) { while (v && v != view) {
c = v; c = v;
@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
if (v && !strcmp(c->name(), "__tdehtml")) { if (v && !strcmp(c->name(), "__tdehtml")) {
bool block = false; bool block = false;
TQWidget *w = TQT_TQWIDGET(o); TQWidget *w = static_cast<TQWidget*>(o);
switch(e->type()) { switch(e->type()) {
case TQEvent::Paint: case TQEvent::Paint:
if (!allowWidgetPaintEvents) { if (!allowWidgetPaintEvents) {

6
tdeio/misc/uiserver.cpp
Unescape View File

@ -98,7 +98,7 @@ class UIServerSystemTray:public KSystemTray
pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
setPixmap(loadIcon("document-save")); setPixmap(loadIcon("document-save"));
//actionCollection()->action("file_quit")->setEnabled(true); //actionCollection()->action("file_quit")->setEnabled(true);
KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection());
} }
}; };
@ -595,10 +595,10 @@ UIServer::UIServer()
// setup toolbar // setup toolbar
toolBar()->insertButton("edit-delete", TOOL_CANCEL, toolBar()->insertButton("edit-delete", TOOL_CANCEL,
TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SIGNAL(clicked()), this,
TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
toolBar()->insertButton("configure", TOOL_CONFIGURE, toolBar()->insertButton("configure", TOOL_CONFIGURE,
TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SIGNAL(clicked()), this,
TQT_SLOT(slotConfigure()), true, i18n("Settings...")); TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
toolBar()->setBarPos( TDEToolBar::Left ); toolBar()->setBarPos( TDEToolBar::Left );

8
tdeio/tdefile/kcustommenueditor.cpp
Unescape View File

@ -95,10 +95,10 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
m_listView->setFullWidth(true); m_listView->setFullWidth(true);
m_listView->setSorting(-1); m_listView->setSorting(-1);
KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical); KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical);
buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem()));
d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem()));
d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp()));
d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown())); d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown()));
buttonBox->layout(); buttonBox->layout();
connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) );
refreshButton(); refreshButton();

6
tdeio/tdefile/kdirselectdialog.cpp
Unescape View File

@ -122,11 +122,11 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
TQT_SLOT( slotComboTextChanged( const TQString& ) )); TQT_SLOT( slotComboTextChanged( const TQString& ) ));
m_contextMenu = new TQPopupMenu( this ); m_contextMenu = new TQPopupMenu( this );
TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQT_SLOT( slotMkdir() ), this);
newFolder->plug(m_contextMenu); newFolder->plug(m_contextMenu);
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this,
TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this)); TQT_SLOT( slotShowHiddenFoldersToggled() ), this);
m_showHiddenFolders->plug(m_contextMenu); m_showHiddenFolders->plug(m_contextMenu);
d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass );

2
tdeio/tdefile/kpreviewprops.cpp
Unescape View File

@ -79,7 +79,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items )
void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget ) void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget )
{ {
if ( TQT_TQOBJECT(widget) != TQT_TQOBJECT(preview->parent()) ) if ( widget != preview->parent() )
return; return;
disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) );

2
tdeio/tdefile/kpropertiesdialog.cpp
Unescape View File

@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages()
{ {
KPropsDlgPlugin *plugin = KParts::ComponentFactory KPropsDlgPlugin *plugin = KParts::ComponentFactory
::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(), ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(),
TQT_TQOBJECT(this), this,
(*it)->name().latin1() ); (*it)->name().latin1() );
if ( !plugin ) if ( !plugin )
continue; continue;

8
tdeio/tdefile/kurlrequester.cpp
Unescape View File

@ -112,9 +112,9 @@ public:
void connectSignals( TQObject *receiver ) { void connectSignals( TQObject *receiver ) {
TQObject *sender; TQObject *sender;
if ( combo ) if ( combo )
sender = TQT_TQOBJECT(combo); sender = combo;
else else
sender = TQT_TQOBJECT(edit); sender = edit;
connect( sender, TQT_SIGNAL( textChanged( const TQString& )), connect( sender, TQT_SIGNAL( textChanged( const TQString& )),
receiver, TQT_SIGNAL( textChanged( const TQString& ))); receiver, TQT_SIGNAL( textChanged( const TQString& )));
@ -220,14 +220,14 @@ void KURLRequester::init()
widget->installEventFilter( this ); widget->installEventFilter( this );
setFocusProxy( widget ); setFocusProxy( widget );
d->connectSignals( TQT_TQOBJECT(this) ); d->connectSignals( this );
connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() ));
myCompletion = new KURLCompletion(); myCompletion = new KURLCompletion();
d->setCompletionObject( myCompletion ); d->setCompletionObject( myCompletion );
TDEAccel *accel = new TDEAccel( this ); TDEAccel *accel = new TDEAccel( this );
accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() )); accel->insert( TDEStdAccel::Open, this, TQT_SLOT( slotOpenDialog() ));
accel->readSettings(); accel->readSettings();
} }

28
tdeio/tdefile/tdediroperator.cpp
Unescape View File

@ -1253,25 +1253,25 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
void KDirOperator::setupActions() void KDirOperator::setupActions()
{ {
myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" ); myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" );
actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" ); upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" );
upAction->setText( i18n("Parent Folder") ); upAction->setText( i18n("Parent Folder") );
backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" ); backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" );
forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" ); forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" );
homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" ); homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" );
homeAction->setText(i18n("Home Folder")); homeAction->setText(i18n("Home Folder"));
reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" ); reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" );
actionSeparator = new TDEActionSeparator( myActionCollection, "separator" ); actionSeparator = new TDEActionSeparator( myActionCollection, "separator" );
d->viewActionSeparator = new TDEActionSeparator( myActionCollection, d->viewActionSeparator = new TDEActionSeparator( myActionCollection,
"viewActionSeparator" ); "viewActionSeparator" );
mkdirAction = new TDEAction( i18n("New Folder..."), 0, mkdirAction = new TDEAction( i18n("New Folder..."), 0,
TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this,
TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") );
reloadAction->setText( i18n("Reload") ); reloadAction->setText( i18n("Reload") );
@ -1281,16 +1281,16 @@ void KDirOperator::setupActions()
// the sort menu actions // the sort menu actions
sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
byNameAction = new TDERadioAction( i18n("By Name"), 0, byNameAction = new TDERadioAction( i18n("By Name"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ), this, TQT_SLOT( slotSortByName() ),
myActionCollection, "by name" ); myActionCollection, "by name" );
byDateAction = new TDERadioAction( i18n("By Date"), 0, byDateAction = new TDERadioAction( i18n("By Date"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ), this, TQT_SLOT( slotSortByDate() ),
myActionCollection, "by date" ); myActionCollection, "by date" );
bySizeAction = new TDERadioAction( i18n("By Size"), 0, bySizeAction = new TDERadioAction( i18n("By Size"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ), this, TQT_SLOT( slotSortBySize() ),
myActionCollection, "by size" ); myActionCollection, "by size" );
reverseAction = new TDEToggleAction( i18n("Reverse"), 0, reverseAction = new TDEToggleAction( i18n("Reverse"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ), this, TQT_SLOT( slotSortReversed() ),
myActionCollection, "reversed" ); myActionCollection, "reversed" );
TQString sortGroup = TQString::fromLatin1("sort"); TQString sortGroup = TQString::fromLatin1("sort");
@ -1325,7 +1325,7 @@ void KDirOperator::setupActions()
myActionCollection, "show hidden" ); myActionCollection, "show hidden" );
// showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") );
separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(), separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(),
TQT_TQOBJECT(this), this,
TQT_SLOT(slotSeparateDirs()), TQT_SLOT(slotSeparateDirs()),
myActionCollection, "separate dirs" ); myActionCollection, "separate dirs" );
TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"), TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"),
@ -1348,7 +1348,7 @@ void KDirOperator::setupActions()
connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( slotToggleHidden( bool ) )); TQT_SLOT( slotToggleHidden( bool ) ));
new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this), new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this,
TQT_SLOT(slotProperties()), myActionCollection, "properties" ); TQT_SLOT(slotProperties()), myActionCollection, "properties" );
} }

6
tdeio/tdefile/tdefiledialog.cpp
Unescape View File

@ -937,7 +937,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( toggleBookmarks( bool )) ); TQT_SLOT( toggleBookmarks( bool )) );
TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" ); TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" );
menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
"Various options can be accessed from this menu including: <ul>" "Various options can be accessed from this menu including: <ul>"
"<li>how files are sorted in the list</li>" "<li>how files are sorted in the list</li>"
@ -1336,7 +1336,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir,
const TQString& filter, const TQString& filter,
WId parent_id, const TQString& caption) WId parent_id, const TQString& caption)
{ {
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KFileDialog dlg(startDir, filter, parent, "filedialog", true); KFileDialog dlg(startDir, filter, parent, "filedialog", true);
#ifdef Q_WS_X11 #ifdef Q_WS_X11
if( parent == NULL && parent_id != 0 ) if( parent == NULL && parent_id != 0 )
@ -1618,7 +1618,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
const TQString& caption) const TQString& caption)
{ {
bool specialDir = dir.at(0) == ':'; bool specialDir = dir.at(0) == ':';
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
#ifdef Q_WS_X11 #ifdef Q_WS_X11
if( parent == NULL && parent_id != 0 ) if( parent == NULL && parent_id != 0 )

8
tdeio/tdefile/tdefileiconview.cpp
Unescape View File

@ -59,12 +59,12 @@ public:
noArrangement = false; noArrangement = false;
ignoreMaximumSize = false; ignoreMaximumSize = false;
smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent), smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent,
TQT_SLOT( slotSmallColumns() ), TQT_SLOT( slotSmallColumns() ),
parent->actionCollection(), parent->actionCollection(),
"small columns" ); "small columns" );
largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent), largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent,
TQT_SLOT( slotLargeRows() ), TQT_SLOT( slotLargeRows() ),
parent->actionCollection(), parent->actionCollection(),
"large rows" ); "large rows" );
@ -75,9 +75,9 @@ public:
previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0, previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0,
parent->actionCollection(), parent->actionCollection(),
"show previews" ); "show previews" );
zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ), zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ),
parent->actionCollection(), "zoomIn" ); parent->actionCollection(), "zoomIn" );
zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ), zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ),
parent->actionCollection(), "zoomOut" ); parent->actionCollection(), "zoomOut" );
previews->setGroup("previews"); previews->setGroup("previews");

2
tdeio/tdefile/tdefilemetapreview.cpp
Unescape View File

@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent )
return 0L; return 0L;
} }
return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" )); return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "tdefileaudiopreview" ));
} }
void KFileMetaPreview::virtual_hook( int, void* ) {} void KFileMetaPreview::virtual_hook( int, void* ) {}

8
tdeio/tdeio/kscan.cpp
Unescape View File

@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name,
TQStringList args; TQStringList args;
args << TQString::number( (int)modal ); args << TQString::number( (int)modal );
TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args ); TQObject *res = factory->create( parent, name, "KScanDialog", args );
return dynamic_cast<KScanDialog *>( res ); return dynamic_cast<KScanDialog *>( res );
} }
@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name,
TQStringList args; TQStringList args;
args << TQString::number( (int)modal ); args << TQString::number( (int)modal );
TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args ); TQObject *res = factory->create( parent, name, "KOCRDialog", args );
return dynamic_cast<KOCRDialog *>( res ); return dynamic_cast<KOCRDialog *>( res );
} }
@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name,
if ( args.count() == 1 ) if ( args.count() == 1 )
modal = (bool)args[ 0 ].toInt(); modal = (bool)args[ 0 ].toInt();
return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); return createDialog( static_cast<TQWidget*>( parent ), name, modal );
} }
@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name,
if ( args.count() == 1 ) if ( args.count() == 1 )
modal = (bool)args[ 0 ].toInt(); modal = (bool)args[ 0 ].toInt();
return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); return createDialog( static_cast<TQWidget*>( parent ), name, modal );
} }
void KScanDialog::virtual_hook( int id, void* data ) void KScanDialog::virtual_hook( int id, void* data )

2
tdeio/tdeio/kservice.cpp
Unescape View File

@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent)
DCOPClient *client = kapp->dcopClient(); DCOPClient *client = kapp->dcopClient();
int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", int result = client->callAsync("kded", "tdebuildsycoca", "recreate()",
data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished())); data, &dlg, TQT_SLOT(slotFinished()));
if (result) if (result)
{ {

4
tdeio/tdeio/renamedlg.cpp
Unescape View File

@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
lib->unload(); lib->unload();
continue; continue;
} }
TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() ); TQObject *obj = factory->create( this, (*it)->name().latin1() );
if(!obj) { if(!obj) {
lib->unload(); lib->unload();
continue; continue;
} }
RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj)); RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(static_cast<TQWidget*>(obj));
if(!plugin ){ if(!plugin ){
delete obj; delete obj;
continue; continue;

4
tdeio/tdeio/scheduler.cpp
Unescape View File

@ -865,7 +865,7 @@ Scheduler::_registerWindow(TQWidget *wid)
if (!wid) if (!wid)
return; return;
TQObject *obj = TQT_TQOBJECT(wid); TQObject *obj = wid;
if (!m_windowList.contains(obj)) if (!m_windowList.contains(obj))
{ {
// We must store the window Id because by the time // We must store the window Id because by the time
@ -873,7 +873,7 @@ Scheduler::_registerWindow(TQWidget *wid)
// access TQWidget::winId() (already destructed) // access TQWidget::winId() (already destructed)
WId windowId = wid->winId(); WId windowId = wid->winId();
m_windowList.insert(obj, windowId); m_windowList.insert(obj, windowId);
connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)), connect(wid, TQT_SIGNAL(destroyed(TQObject *)),
this, TQT_SLOT(slotUnregisterWindow(TQObject*))); this, TQT_SLOT(slotUnregisterWindow(TQObject*)));
TQByteArray params; TQByteArray params;
TQDataStream stream(params, IO_WriteOnly); TQDataStream stream(params, IO_WriteOnly);

2
tdeio/tdeio/tdefilemetainfo.cpp
Unescape View File

@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
return 0; return 0;
KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin> KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin>
( service, TQT_TQOBJECT(this), mimeType.local8Bit() ); ( service, this, mimeType.local8Bit() );
if (!plugin) if (!plugin)
kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl; kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl;

2
tdemdi/tdemdi/dockcontainer.cpp
Unescape View File

@ -261,7 +261,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
break; break;
} }
m_dockManager=w->dockManager(); m_dockManager=w->dockManager();
m_dragPanel=TQT_TQOBJECT(hdr->dragPanel()); m_dragPanel=hdr->dragPanel();
if (m_dragPanel) m_movingState=WaitingForMoveStart; if (m_dragPanel) m_movingState=WaitingForMoveStart;
delete m_startEvent; delete m_startEvent;
m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event)); m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event));

4
tdemdi/tdemdi/guiclient.cpp
Unescape View File

@ -88,9 +88,9 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
actionCollection(),"tdemdi_activate_bottom")); actionCollection(),"tdemdi_activate_bottom"));
m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator")); m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator"));
m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()), m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()),
actionCollection(),"tdemdi_prev_toolview")); actionCollection(),"tdemdi_prev_toolview"));
m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()), m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()),
actionCollection(),"tdemdi_next_toolview")); actionCollection(),"tdemdi_next_toolview"));
actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );

6
tdemdi/tdemdi/mainwindow.cpp
Unescape View File

@ -153,7 +153,7 @@ void MainWindow::setupToolViews ()
KDockWidget *w=mainDock; KDockWidget *w=mainDock;
if (mainDock->parentDockTabGroup()) { if (mainDock->parentDockTabGroup()) {
w=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
} }
TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> leftReparentWidgets;
@ -162,7 +162,7 @@ void MainWindow::setupToolViews ()
TQPtrList<KDockWidget> topReparentWidgets; TQPtrList<KDockWidget> topReparentWidgets;
if (mainDock->parentDockTabGroup()) { if (mainDock->parentDockTabGroup()) {
mainDock=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
} }
findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft);
@ -380,7 +380,7 @@ void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWid
KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw); KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw);
if (widget) { if (widget) {
if (widget->parentDockTabGroup()) { if (widget->parentDockTabGroup()) {
widget=static_cast<KDockWidget*>(TQT_TQWIDGET(widget->parentDockTabGroup()->parent())); widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent());
} }
if (widget) { if (widget) {

4
tdemdi/tdemdi/tabwidget.cpp
Unescape View File

@ -89,7 +89,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child()); TQObject* pLostChild = ((TQChildEvent*)e)->child();
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
TQObjectList *list = pLostChild->queryList( "TQWidget" ); TQObjectList *list = pLostChild->queryList( "TQWidget" );
list->insert(0, pLostChild); // add the lost child to the list too, just to save code list->insert(0, pLostChild); // add the lost child to the list too, just to save code
@ -108,7 +108,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we // if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children // install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system). // (as we did when we were added to the MDI system).
TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child()); TQObject* pNewChild = ((TQChildEvent*)e)->child();
if ((pNewChild != 0L) && (pNewChild->isWidgetType())) if ((pNewChild != 0L) && (pNewChild->isWidgetType()))
{ {
TQWidget* pNewWidget = (TQWidget*)pNewChild; TQWidget* pNewWidget = (TQWidget*)pNewChild;

8
tdemdi/tdemdichildfrm.cpp
Unescape View File

@ -1095,7 +1095,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
break; break;
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
{ {
if ( !hasParent( TQT_TQOBJECT(m_pClient), obj ) ) if ( !hasParent( m_pClient, obj ) )
{ {
bool bIsSecondClick = false; bool bIsSecondClick = false;
if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() )
@ -1154,7 +1154,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); TQObject* pLostChild = ( ( TQChildEvent* ) e )->child();
if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ )
{ {
TQObjectList* list = pLostChild->queryList(); TQObjectList* list = pLostChild->queryList();
@ -1176,10 +1176,10 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child we install ourself as event filter for the new // if we got a new child we install ourself as event filter for the new
// child and its children (as we did when we got our client). // child and its children (as we did when we got our client).
// XXX see linkChildren() and focus policy stuff // XXX see linkChildren() and focus policy stuff
TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) ) if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) )
{ {
TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild ); TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild );
TQObjectList *list = pNewWidget->queryList( "TQWidget" ); TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets TQObjectListIt it( *list ); // iterate over all new child widgets

4
tdemdi/tdemdichildview.cpp
Unescape View File

@ -566,7 +566,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
{ {
TQObjectList * list = pLostChild->queryList( "TQWidget" ); TQObjectList * list = pLostChild->queryList( "TQWidget" );
@ -596,7 +596,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we // if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children // install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system). // (as we did when we were added to the MDI system).
TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
{ {
TQWidget * pNewWidget = ( TQWidget* ) pNewChild; TQWidget * pNewWidget = ( TQWidget* ) pNewChild;

2
tdemdi/tdemdidockcontainer.cpp
Unescape View File

@ -280,7 +280,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
} }
m_dockManager = w->dockManager(); m_dockManager = w->dockManager();
m_dragPanel = TQT_TQOBJECT(hdr->dragPanel()); m_dragPanel = hdr->dragPanel();
if ( m_dragPanel ) if ( m_dragPanel )
m_movingState = WaitingForMoveStart; m_movingState = WaitingForMoveStart;

4
tdemdi/tdemdiguiclient.cpp
Unescape View File

@ -161,9 +161,9 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
actionCollection(), "tdemdi_activate_bottom" ) ); actionCollection(), "tdemdi_activate_bottom" ) );
m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ), m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ),
actionCollection(), "tdemdi_prev_toolview" ) ); actionCollection(), "tdemdi_prev_toolview" ) );
m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ), m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ),
actionCollection(), "tdemdi_next_toolview" ) ); actionCollection(), "tdemdi_next_toolview" ) );
actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );

12
tdemdi/tdemdimainfrm.cpp
Unescape View File

@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" ); m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(), d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(),
TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
// the MDI view taskbar // the MDI view taskbar
createTaskBar(); createTaskBar();
@ -1291,7 +1291,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
KDockWidget* dockWindow = 0L; /* pDockW */ KDockWidget* dockWindow = 0L; /* pDockW */
KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */ KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */
KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
TQWidget* pW = TQT_TQWIDGET( ( *it ) ); TQWidget* pW = static_cast<TQWidget*>( ( *it ) );
// find the oldest ancestor of the current dockwidget that can be undocked // find the oldest ancestor of the current dockwidget that can be undocked
while ( !pW->isTopLevel() ) while ( !pW->isTopLevel() )
@ -1899,7 +1899,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
if ( widget && widget->parentDockTabGroup() ) if ( widget && widget->parentDockTabGroup() )
{ {
widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() );
if ( widget ) if ( widget )
{ {
@ -1931,7 +1931,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
KDockWidget *mainDock = getMainDockWidget(); KDockWidget *mainDock = getMainDockWidget();
KDockWidget *w = mainDock; KDockWidget *w = mainDock;
if ( mainDock->parentDockTabGroup() ) if ( mainDock->parentDockTabGroup() )
w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> leftReparentWidgets;
TQPtrList<KDockWidget> rightReparentWidgets; TQPtrList<KDockWidget> rightReparentWidgets;
@ -1939,7 +1939,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
TQPtrList<KDockWidget> topReparentWidgets; TQPtrList<KDockWidget> topReparentWidgets;
if ( mainDock->parentDockTabGroup() ) if ( mainDock->parentDockTabGroup() )
mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
@ -2137,7 +2137,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
KDockWidget * mainDock = getMainDockWidget(); KDockWidget * mainDock = getMainDockWidget();
if ( mainDock->parentDockTabGroup() ) if ( mainDock->parentDockTabGroup() )
{ {
mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
} }
if ( widgetNames.count() > 0 ) if ( widgetNames.count() > 0 )

6
tdenewstuff/provider.cpp
Unescape View File

@ -389,7 +389,7 @@ void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data )
void ProviderLoader::slotJobResult( TDEIO::Job *job ) void ProviderLoader::slotJobResult( TDEIO::Job *job )
{ {
if ( job->error() ) { if ( job->error() ) {
job->showErrorDialog( TQT_TQWIDGET(parent()) ); job->showErrorDialog( static_cast<TQWidget*>(parent()) );
emit error(); emit error();
return; return;
} }
@ -399,7 +399,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
TQDomDocument doc; TQDomDocument doc;
if ( !doc.setContent( mJobData ) ) { if ( !doc.setContent( mJobData ) ) {
KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") ); KMessageBox::error( static_cast<TQWidget*>(parent()), i18n("Error parsing providers list.") );
emit error(); emit error();
return; return;
} }
@ -417,7 +417,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
TQDomElement p = n.toElement(); TQDomElement p = n.toElement();
if ( p.tagName() == "provider" ) { if ( p.tagName() == "provider" ) {
Provider* prov = new Provider( p, mContentType, TQT_TQWIDGET(parent()) ); Provider* prov = new Provider( p, mContentType, static_cast<TQWidget*>(parent()) );
mProviders.append( prov ); mProviders.append( prov );
connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) ); connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) );
} }

4
tdeparts/dockmainwindow.cpp
Unescape View File

@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f )
: KDockMainWindow( parent, name, f ) : KDockMainWindow( parent, name, f )
{ {
d = new DockMainWindowPrivate(); d = new DockMainWindowPrivate();
PartBase::setPartObject( TQT_TQOBJECT(this) ); PartBase::setPartObject( this );
} }
DockMainWindow::~DockMainWindow() DockMainWindow::~DockMainWindow()
@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part )
if ( !d->m_bShellGUIActivated ) if ( !d->m_bShellGUIActivated )
{ {
loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); loadPlugins( this, this, TDEGlobal::instance() );
createShellGUI(); createShellGUI();
d->m_bShellGUIActivated = true; d->m_bShellGUIActivated = true;
} }

2
tdeparts/factory.cpp
Unescape View File

@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha
TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args ) TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args )
{ {
assert( !parent || parent->isWidgetType() ); assert( !parent || parent->isWidgetType() );
return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args ); return createPart( static_cast<TQWidget*>( parent ), name, parent, name, classname, args );
} }
#include "factory.moc" #include "factory.moc"

2
tdeparts/historyprovider.cpp
Unescape View File

@ -40,7 +40,7 @@ public:
HistoryProvider * HistoryProvider::self() HistoryProvider * HistoryProvider::self()
{ {
if ( !s_self ) if ( !s_self )
s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" ); s_self = new HistoryProvider( kapp, "history provider" );
return s_self; return s_self;
} }

8
tdeparts/mainwindow.cpp
Unescape View File

@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f )
: TDEMainWindow( parent, name, f ) : TDEMainWindow( parent, name, f )
{ {
d = new MainWindowPrivate(); d = new MainWindowPrivate();
PartBase::setPartObject( TQT_TQOBJECT(this) ); PartBase::setPartObject( this );
} }
MainWindow::MainWindow( const char *name, WFlags f ) MainWindow::MainWindow( const char *name, WFlags f )
: TDEMainWindow( 0L, name, f ) : TDEMainWindow( 0L, name, f )
{ {
d = new MainWindowPrivate(); d = new MainWindowPrivate();
PartBase::setPartObject( TQT_TQOBJECT(this) ); PartBase::setPartObject( this );
} }
MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f ) MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f )
: TDEMainWindow( cflags, parent, name, f ) : TDEMainWindow( cflags, parent, name, f )
{ {
d = new MainWindowPrivate(); d = new MainWindowPrivate();
PartBase::setPartObject( TQT_TQOBJECT(this) ); PartBase::setPartObject( this );
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part )
if ( !d->m_bShellGUIActivated ) if ( !d->m_bShellGUIActivated )
{ {
loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); loadPlugins( this, this, TDEGlobal::instance() );
createShellGUI(); createShellGUI();
d->m_bShellGUIActivated = true; d->m_bShellGUIActivated = true;
} }

4
tdeparts/partmanager.cpp
Unescape View File

@ -183,7 +183,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
if ( !obj->isWidgetType() ) if ( !obj->isWidgetType() )
return false; return false;
TQWidget *w = TQT_TQWIDGET( obj ); TQWidget *w = static_cast<TQWidget*>( obj );
if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) )
@ -419,7 +419,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
//tree recursively (Simon) //tree recursively (Simon)
if ( part && !d->m_bAllowNestedParts ) if ( part && !d->m_bAllowNestedParts )
{ {
TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory! TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory!
if ( parentPart && parentPart->inherits( "KParts::Part" ) ) if ( parentPart && parentPart->inherits( "KParts::Part" ) )
{ {
KParts::Part *parPart = static_cast<KParts::Part *>( parentPart ); KParts::Part *parPart = static_cast<KParts::Part *>( parentPart );

2
tdeprint/cups/kmcupsconfigwidget.cpp
Unescape View File

@ -41,7 +41,7 @@ public:
}; };
PortValidator::PortValidator(TQWidget *parent, const char *name) PortValidator::PortValidator(TQWidget *parent, const char *name)
: TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name) : TQIntValidator(1, 65535, parent, name)
{ {
} }

2
tdeprint/cups/kmwipp.cpp
Unescape View File

@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name)
m_ID = KMWizard::IPP; m_ID = KMWizard::IPP;
m_title = i18n("Remote IPP server"); m_title = i18n("Remote IPP server");
m_nextpage = KMWizard::IPPSelect; m_nextpage = KMWizard::IPPSelect;
lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) ); lineEdit( 1 )->setValidator( new TQIntValidator( this ) );
setInfo(i18n("<p>Enter the information concerning the remote IPP server " setInfo(i18n("<p>Enter the information concerning the remote IPP server "
"owning the targeted printer. This wizard will poll the server " "owning the targeted printer. This wizard will poll the server "

2
tdeprint/kmuimanager.cpp
Unescape View File

@ -144,7 +144,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg)
// retrieve the KPrinter object // retrieve the KPrinter object
KPrinter *prt(0); KPrinter *prt(0);
if (dlg->parent() && dlg->parent()->isA("KPrintDialog")) if (dlg->parent() && dlg->parent()->isA("KPrintDialog"))
prt = static_cast<KPrintDialog*>(TQT_TQWIDGET(dlg->parent()))->printer(); prt = static_cast<KPrintDialog*>(dlg->parent())->printer();
// add margin page // add margin page
if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog ) if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog )

6
tdeprint/kprintdialog.cpp
Unescape View File

@ -489,7 +489,7 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages)
else else
{ {
// more than one page. // more than one page.
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
if (!tabs) if (!tabs)
{ {
// TQTabWidget doesn't exist. Create it and reparent all // TQTabWidget doesn't exist. Create it and reparent all
@ -822,7 +822,7 @@ void KPrintDialog::slotWizard()
void KPrintDialog::reload() void KPrintDialog::reload()
{ {
// remove printer dependent pages (usually from plugin) // remove printer dependent pages (usually from plugin)
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
for (uint i=0; i<d->m_pages.count(); i++) for (uint i=0; i<d->m_pages.count(); i++)
if (d->m_pages.at(i)->onlyRealPrinters()) if (d->m_pages.at(i)->onlyRealPrinters())
{ {
@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag )
if ( d->m_pages.count() > 1 ) if ( d->m_pages.count() > 1 )
{ {
TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
tabs->setTabEnabled( d->m_pages.at( index ), flag ); tabs->setTabEnabled( d->m_pages.at( index ), flag );
} }
else else

10
tdeprint/kprintpreview.cpp
Unescape View File

@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
// create main view and actions // create main view and actions
setMainWidget(d->mainwidget_); setMainWidget(d->mainwidget_);
if (previewOnly) if (previewOnly)
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); KStdAction::close(this, TQT_SLOT(reject()), d->actions_, "close_print");
else else
{ {
new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQT_SLOT(accept()), d->actions_, "continue_print");
new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQT_SLOT(reject()), d->actions_, "stop_print");
} }
} }
@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview()
void KPrintPreview::initView(KLibFactory *factory) void KPrintPreview::initView(KLibFactory *factory)
{ {
// load the component // load the component
d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart"); d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart");
// populate the toolbar // populate the toolbar
if (d->previewonly_) if (d->previewonly_)
@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
conf->setGroup("General"); conf->setGroup("General");
KLibFactory *factory(0); KLibFactory *factory(0);
bool externalPreview = conf->readBoolEntry("ExternalPreview", false); bool externalPreview = conf->readBoolEntry("ExternalPreview", false);
TQWidget *parentW = TQT_TQWIDGET(TQWidget::find(parentId)); TQWidget *parentW = TQWidget::find(parentId);
TQString exe; TQString exe;
if (!externalPreview && isPS && (factory = componentFactory()) != 0) if (!externalPreview && isPS && (factory = componentFactory()) != 0)
{ {

16
tdeprint/management/kmjobviewer.cpp
Unescape View File

@ -261,10 +261,10 @@ void KMJobViewer::init()
void KMJobViewer::initActions() void KMJobViewer::initActions()
{ {
// job actions // job actions
TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQT_SLOT(slotHold()),actionCollection(),"job_hold");
TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQT_SLOT(slotResume()),actionCollection(),"job_resume");
TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move");
mact->setDelayed(false); mact->setDelayed(false);
connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
@ -324,12 +324,12 @@ void KMJobViewer::initActions()
} }
else else
{// stand-alone application {// stand-alone application
KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection()); KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection());
KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection()); KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
// refresh action // refresh action
new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); new TDEAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
// create status bar // create status bar
KStatusBar *statusbar = statusBar(); KStatusBar *statusbar = statusBar();

36
tdeprint/management/kmmainview.cpp
Unescape View File

@ -183,23 +183,23 @@ void KMMainView::initActions()
TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
stateAct->setDelayed(false); stateAct->setDelayed(false);
stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
stateAct->setDelayed(false); stateAct->setDelayed(false);
stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); new TDEAction(i18n("&Remove"),"edittrash",0,this,TQT_SLOT(slotRemove()),m_actions,"printer_remove");
new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); new TDEAction(i18n("&Configure..."),"configure",0,this,TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQT_SLOT(slotAdd()),m_actions,"printer_add");
new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQT_SLOT(slotTest()),m_actions,"printer_test");
new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQT_SLOT(slotInit()),m_actions,"view_refresh");
TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
iconlst.clear(); iconlst.clear();
@ -208,9 +208,9 @@ void KMMainView::initActions()
dact->setCurrentItem(0); dact->setCurrentItem(0);
connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
tact->setCheckedState(i18n("Hide &Toolbar")); tact->setCheckedState(i18n("Hide &Toolbar"));
@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID)
{ {
TQStringList args; TQStringList args;
args << m_current->device() << m_current->printerName(); args << m_current->device() << m_current->printerName();
KDialogBase *dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args))); KDialogBase *dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args));
if (dlg) if (dlg)
dlg->exec(); dlg->exec();
delete dlg; delete dlg;

2
tdeprint/management/networkscanner.cpp
Unescape View File

@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name )
d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this );
d->timer = new TQTimer( this ); d->timer = new TQTimer( this );
#ifdef USE_QSOCKET #ifdef USE_QSOCKET
d->socket = new TQSocket( TQT_TQOBJECT(this) ); d->socket = new TQSocket( this );
#else #else
d->socket = new KExtendedSocket(); d->socket = new KExtendedSocket();
#endif #endif

2
tdeprint/rlpr/kmproxywidget.cpp
Unescape View File

@ -37,7 +37,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
m_useproxy->setCursor(KCursor::handCursor()); m_useproxy->setCursor(KCursor::handCursor());
m_proxyhost = new TQLineEdit(this); m_proxyhost = new TQLineEdit(this);
m_proxyport = new TQLineEdit(this); m_proxyport = new TQLineEdit(this);
m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport))); m_proxyport->setValidator(new TQIntValidator(m_proxyport));
m_hostlabel->setBuddy(m_proxyhost); m_hostlabel->setBuddy(m_proxyhost);
m_portlabel->setBuddy(m_proxyport); m_portlabel->setBuddy(m_proxyport);

4
tdeprint/tools/escputil/escpwidget.cpp
Unescape View File

@ -42,14 +42,14 @@ protected:
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList()) TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
{ {
Q_UNUSED(className); Q_UNUSED(className);
KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); KDialogBase *dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
EscpWidget *w = new EscpWidget(dlg); EscpWidget *w = new EscpWidget(dlg);
if (args.count() > 0) if (args.count() > 0)
w->setDevice(args[0]); w->setDevice(args[0]);
if (args.count() > 1) if (args.count() > 1)
w->setPrinterName(args[1]); w->setPrinterName(args[1]);
dlg->setMainWidget(w); dlg->setMainWidget(w);
return TQT_TQOBJECT(dlg); return dlg;
} }
}; };

2
tderandr/ktimerdialog.cpp
Unescape View File

@ -98,7 +98,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget )
if ( widget->parentWidget() != mainWidget ) { if ( widget->parentWidget() != mainWidget ) {
widget->reparent( newWidget, 0, TQPoint(0,0) ); widget->reparent( newWidget, 0, TQPoint(0,0) );
} else { } else {
newWidget->insertChild( TQT_TQOBJECT(widget) ); newWidget->insertChild( widget );
} }
timerWidget->reparent( newWidget, 0, TQPoint(0, 0) ); timerWidget->reparent( newWidget, 0, TQPoint(0, 0) );

8
tderesources/configpage.cpp
Unescape View File

@ -123,12 +123,12 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
groupBoxLayout->addWidget( mListView, 1, 0 ); groupBoxLayout->addWidget( mListView, 1, 0 );
connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) ); connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) );
KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical ); KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical );
mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) ); mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT(slotAdd()) );
mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) ); mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT(slotRemove()) );
mRemoveButton->setEnabled( false ); mRemoveButton->setEnabled( false );
mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT(slotEdit()) ); mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT(slotEdit()) );
mEditButton->setEnabled( false ); mEditButton->setEnabled( false );
mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) ); mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQT_SLOT(slotStandard()) );
mStandardButton->setEnabled( false ); mStandardButton->setEnabled( false );
buttonBox->layout(); buttonBox->layout();

4
tderesources/selectdialog.cpp
Unescape View File

@ -57,8 +57,8 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
KButtonBox *buttonBox = new KButtonBox( this ); KButtonBox *buttonBox = new KButtonBox( this );
buttonBox->addStretch(); buttonBox->addStretch();
buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
buttonBox->layout(); buttonBox->layout();
mainLayout->addWidget( buttonBox ); mainLayout->addWidget( buttonBox );

24
tdespell2/ui/dialog.cpp
Unescape View File

@ -69,7 +69,7 @@ Dialog::Dialog( BackgroundChecker *checker,
initGui(); initGui();
initConnections(); initConnections();
setMainWidget( TQT_TQWIDGET(d->ui) ); setMainWidget( static_cast<TQWidget*>(d->ui) );
} }
Dialog::~Dialog() Dialog::~Dialog()
@ -79,27 +79,27 @@ Dialog::~Dialog()
void Dialog::initConnections() void Dialog::initConnections()
{ {
connect( TQT_TQOBJECT(d->ui->m_addBtn), TQT_SIGNAL(clicked()), connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()),
TQT_SLOT(slotAddWord()) ); TQT_SLOT(slotAddWord()) );
connect( TQT_TQOBJECT(d->ui->m_replaceBtn), TQT_SIGNAL(clicked()), connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()),
TQT_SLOT(slotReplaceWord()) ); TQT_SLOT(slotReplaceWord()) );
connect( TQT_TQOBJECT(d->ui->m_replaceAllBtn), TQT_SIGNAL(clicked()), connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()),
TQT_SLOT(slotReplaceAll()) ); TQT_SLOT(slotReplaceAll()) );
connect( TQT_TQOBJECT(d->ui->m_skipBtn), TQT_SIGNAL(clicked()), connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()),
TQT_SLOT(slotSkip()) ); TQT_SLOT(slotSkip()) );
connect( TQT_TQOBJECT(d->ui->m_skipAllBtn), TQT_SIGNAL(clicked()), connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()),
TQT_SLOT(slotSkipAll()) ); TQT_SLOT(slotSkipAll()) );
connect( TQT_TQOBJECT(d->ui->m_suggestBtn), TQT_SIGNAL(clicked()), connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()),
TQT_SLOT(slotSuggest()) ); TQT_SLOT(slotSuggest()) );
connect( TQT_TQOBJECT(d->ui->m_language), TQT_SIGNAL(activated(const TQString&)), connect( d->ui->m_language, TQT_SIGNAL(activated(const TQString&)),
TQT_SLOT(slotChangeLanguage(const TQString&)) ); TQT_SLOT(slotChangeLanguage(const TQString&)) );
connect( TQT_TQOBJECT(d->ui->m_suggestions), TQT_SIGNAL(selectionChanged(TQListViewItem*)), connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)),
TQT_SIGNAL(misspelling(const TQString&, int)) ); TQT_SIGNAL(misspelling(const TQString&, int)) );
connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)),
TQT_SLOT(slotMisspelling(const TQString&, int)) ); TQT_SLOT(slotMisspelling(const TQString&, int)) );
connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(done()), connect( d->checker, TQT_SIGNAL(done()),
TQT_SLOT(slotDone()) ); TQT_SLOT(slotDone()) );
connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),
TQT_SLOT( slotReplaceWord() ) ); TQT_SLOT( slotReplaceWord() ) );

2
tdestyles/asteroid/asteroid.cpp
Unescape View File

@ -107,7 +107,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to?
bool isProtectedObject = false; bool isProtectedObject = false;
TQObject *curparent = TQT_TQOBJECT(w); TQObject *curparent = w;
while (curparent) { while (curparent) {
if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem") if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem")
|| curparent->inherits("KJanusWidget") || curparent->inherits("KJanusWidget")

8
tdestyles/highcolor/highcolor.cpp
Unescape View File

@ -2032,14 +2032,14 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
// Find the top-level toolbar of this widget, since it may be nested in other // Find the top-level toolbar of this widget, since it may be nested in other
// widgets that are on the toolbar. // widgets that are on the toolbar.
TQWidget *widget = TQT_TQWIDGET(object); TQWidget *widget = static_cast<TQWidget*>(object);
TQWidget *parent = TQT_TQWIDGET(object->parent()); TQWidget *parent = static_cast<TQWidget*>(object->parent());
int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); int x_offset = ceData.rect.x(), y_offset = ceData.rect.y();
while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) )
{ {
x_offset += parent->x(); x_offset += parent->x();
y_offset += parent->y(); y_offset += parent->y();
parent = TQT_TQWIDGET(parent->parent()); parent = static_cast<TQWidget*>(parent->parent());
} }
TQRect r = ceData.rect; TQRect r = ceData.rect;
@ -2067,7 +2067,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
if ( event->type() == TQEvent::Paint ) { if ( event->type() == TQEvent::Paint ) {
TQWidget *widget = TQT_TQWIDGET(object); TQWidget *widget = static_cast<TQWidget*>(object);
TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect; TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect;
TQPainter p( widget ); TQPainter p( widget );
renderGradient(&p, wr, toolbar->colorGroup().button(), renderGradient(&p, wr, toolbar->colorGroup().button(),

26
tdestyles/keramik/keramik.cpp
Unescape View File

@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
void KeramikStyle::progressBarDestroyed(TQObject* obj) void KeramikStyle::progressBarDestroyed(TQObject* obj)
{ {
progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj))); progAnimWidgets.remove(static_cast<TQProgressBar*>(obj));
} }
@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr
// Find the top-level toolbar of this widget, since it may be nested in other // Find the top-level toolbar of this widget, since it may be nested in other
// widgets that are on the toolbar. // widgets that are on the toolbar.
TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL; TQWidget *parent = (widget)?widget->parentWidget():NULL;
int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); int x_offset = ceData.rect.x(), y_offset = ceData.rect.y();
while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) )
{ {
x_offset += parent->x(); x_offset += parent->x();
y_offset += parent->y(); y_offset += parent->y();
parent = TQT_TQWIDGET(parent->parent()); parent = static_cast<TQWidget*>(parent->parent());
} }
TQRect pr = ceData.parentWidgetData.rect; TQRect pr = ceData.parentWidgetData.rect;
@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
if (kickerMode) if (kickerMode)
{ {
if (p->device() && p->device()->devType() == TQInternal::Widget && if (p->device() && p->device()->devType() == TQInternal::Widget &&
TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame" ) TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" )
{ {
int x2 = x + r.width() - 1; int x2 = x + r.width() - 1;
int y2 = y + r.height() - 1; int y2 = y + r.height() - 1;
@ -1284,7 +1284,7 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQToolBar* parent = 0; TQToolBar* parent = 0;
if (widget && widget->parent() && widget->parent()->inherits("TQToolBar")) if (widget && widget->parent() && widget->parent()->inherits("TQToolBar"))
parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent())); parent = static_cast<TQToolBar*>(widget->parent());
renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal)); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal));
if (flags & Style_Horizontal) { if (flags & Style_Horizontal) {
@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( ComplexControl control,
{ {
// This assumes floating toolbars can't have extenders, // This assumes floating toolbars can't have extenders,
//(so if we're on an extender, we're not floating) //(so if we're on an extender, we're not floating)
TQWidget* parent = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent())); TQWidget* parent = static_cast<TQWidget*> (static_cast<TQWidget*>(widget->parent()));
TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent())); TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent());
TQRect tr = ceData.parentWidgetData.rect; TQRect tr = ceData.parentWidgetData.rect;
bool horiz = ceData.toolBarData.orientation == TQt::Horizontal; bool horiz = ceData.toolBarData.orientation == TQt::Horizontal;
@ -2809,7 +2809,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
recursion = true; recursion = true;
object->event( static_cast<TQPaintEvent*>( event ) ); object->event( static_cast<TQPaintEvent*>( event ) );
TQWidget* widget = TQT_TQWIDGET( object ); TQWidget* widget = static_cast<TQWidget*>( object );
TQPainter p( widget ); TQPainter p( widget );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect,
widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), widget->palette().color( TQPalette::Normal, TQColorGroup::Button ),
@ -2826,7 +2826,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
//Combo dropdowns are shaped //Combo dropdowns are shaped
case TQEvent::Resize: case TQEvent::Resize:
{ {
TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object)); TQListBox* listbox = static_cast<TQListBox*>(object);
TQResizeEvent* resize = static_cast<TQResizeEvent*>(event); TQResizeEvent* resize = static_cast<TQResizeEvent*>(event);
if (resize->size().height() < 6) if (resize->size().height() < 6)
return false; return false;
@ -2892,7 +2892,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
firstComboPopupRelease = false; firstComboPopupRelease = false;
TQMouseEvent* mev = static_cast<TQMouseEvent*>(event); TQMouseEvent* mev = static_cast<TQMouseEvent*>(event);
TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object)); TQListBox* box = static_cast<TQListBox*>(object);
TQWidget* parent = box->parentWidget(); TQWidget* parent = box->parentWidget();
if (!parent) if (!parent)
@ -2919,7 +2919,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{ {
// Draw a gradient background for custom widgets in the toolbar // Draw a gradient background for custom widgets in the toolbar
// that have specified a "tde toolbar widget" name. // that have specified a "tde toolbar widget" name.
renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object)); renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast<TQWidget*>(object));
return false; // Now draw the contents return false; // Now draw the contents
} }
@ -2931,8 +2931,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{ {
// We need to override the paint event to draw a // We need to override the paint event to draw a
// gradient on a QToolBarExtensionWidget. // gradient on a QToolBarExtensionWidget.
TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent())); TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent());
TQWidget* widget = TQT_TQWIDGET(object); TQWidget* widget = static_cast<TQWidget*>(object);
TQRect wr = widget->rect (), tr = toolbar->rect(); TQRect wr = widget->rect (), tr = toolbar->rect();
TQPainter p( widget ); TQPainter p( widget );

2
tdestyles/klegacy/klegacystyle.cpp
Unescape View File

@ -2216,7 +2216,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
key.data.shadow = KLegacy::In; key.data.shadow = KLegacy::In;
} else { } else {
key.data.state = ((btn->isEnabled()) ? key.data.state = ((btn->isEnabled()) ?
((static_cast<TQWidget *>( btn ) == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : ((btn == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) :
KLegacy::Insensitive); KLegacy::Insensitive);
key.data.shadow = ((btn->isOn() || btn->isDown()) ? key.data.shadow = ((btn->isOn() || btn->isDown()) ?
KLegacy::In : KLegacy::Out); KLegacy::In : KLegacy::Out);

4
tdestyles/kthemestyle/kthemestyle.cpp
Unescape View File

@ -486,7 +486,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize || if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize ||
event->type() == TQEvent::Show) event->type() == TQEvent::Show)
{ {
TQWidget *w = TQT_TQWIDGET(object); TQWidget *w = static_cast<TQWidget*>(object);
TQPoint pos(0, 0); TQPoint pos(0, 0);
pos = w->mapTo(w->topLevelWidget(), pos); pos = w->mapTo(w->topLevelWidget(), pos);
TQPixmap pix(uncached( Background )->size()); TQPixmap pix(uncached( Background )->size());
@ -508,7 +508,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
} }
if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel")) if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel"))
{ {
TQWidget* lb = TQT_TQWIDGET(object); TQWidget* lb = static_cast<TQWidget*>(object);
if (lb->backgroundMode() == TQt::PaletteButton) if (lb->backgroundMode() == TQt::PaletteButton)
lb->setBackgroundMode(TQt::PaletteBackground); lb->setBackgroundMode(TQt::PaletteBackground);
removeObjectEventHandler(ceData, elementFlags, source, this); removeObjectEventHandler(ceData, elementFlags, source, this);

8
tdestyles/plastik/plastik.cpp
Unescape View File

@ -316,12 +316,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj)
{ {
tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); tdehtmlWidgets.remove(static_cast<TQWidget*>(obj));
} }
void PlastikStyle::progressBarDestroyed(TQObject* obj) void PlastikStyle::progressBarDestroyed(TQObject* obj)
{ {
progAnimWidgets.remove(TQT_TQWIDGET(obj)); progAnimWidgets.remove(static_cast<TQWidget*>(obj));
} }
void PlastikStyle::renderContour(TQPainter *p, void PlastikStyle::renderContour(TQPainter *p,
@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p,
if (kickerMode && if (kickerMode &&
p->device() && p->device()->devType() == TQInternal::Widget && p->device() && p->device()->devType() == TQInternal::Widget &&
TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame") { TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame") {
// Stolen wholesale from Keramik. I don't like it, but oh well. // Stolen wholesale from Keramik. I don't like it, but oh well.
if (sunken) { if (sunken) {
const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y };
@ -3512,7 +3512,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
} }
if ( !qstrcmp(obj->name(), "tde toolbar widget") ) if ( !qstrcmp(obj->name(), "tde toolbar widget") )
{ {
TQWidget* lb = TQT_TQWIDGET(obj); TQWidget* lb = static_cast<TQWidget*>(obj);
if (lb->backgroundMode() == TQt::PaletteButton) if (lb->backgroundMode() == TQt::PaletteButton)
lb->setBackgroundMode(TQt::PaletteBackground); lb->setBackgroundMode(TQt::PaletteBackground);
removeObjectEventHandler(ceData, elementFlags, source, this); removeObjectEventHandler(ceData, elementFlags, source, this);

2
tdeui/kcharselect.cpp
Unescape View File

@ -407,7 +407,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); lUnicode->setMaximumWidth( lUnicode->sizeHint().width() );
const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" );
TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); TQValidator* const validator = new TQRegExpValidator( rx, this );
d->unicodeLine = new KLineEdit( bar ); d->unicodeLine = new KLineEdit( bar );
d->unicodeLine->setValidator(validator); d->unicodeLine->setValidator(validator);

24
tdeui/kcolordialog.cpp
Unescape View File

@ -1006,7 +1006,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label->setAlignment(AlignRight | AlignVCenter); label->setAlignment(AlignRight | AlignVCenter);
l_lbot->addWidget(label, 0, 2); l_lbot->addWidget(label, 0, 2);
d->hedit = new KColorSpinBox( 0, 359, 1, page ); d->hedit = new KColorSpinBox( 0, 359, 1, page );
d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); d->hedit->setValidator( new TQIntValidator( d->hedit ) );
l_lbot->addWidget(d->hedit, 0, 3); l_lbot->addWidget(d->hedit, 0, 3);
connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), connect( d->hedit, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotHSVChanged() ) ); TQT_SLOT( slotHSVChanged() ) );
@ -1015,7 +1015,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label->setAlignment(AlignRight | AlignVCenter); label->setAlignment(AlignRight | AlignVCenter);
l_lbot->addWidget(label, 1, 2); l_lbot->addWidget(label, 1, 2);
d->sedit = new KColorSpinBox( 0, 255, 1, page ); d->sedit = new KColorSpinBox( 0, 255, 1, page );
d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); d->sedit->setValidator( new TQIntValidator( d->sedit ) );
l_lbot->addWidget(d->sedit, 1, 3); l_lbot->addWidget(d->sedit, 1, 3);
connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), connect( d->sedit, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotHSVChanged() ) ); TQT_SLOT( slotHSVChanged() ) );
@ -1024,7 +1024,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label->setAlignment(AlignRight | AlignVCenter); label->setAlignment(AlignRight | AlignVCenter);
l_lbot->addWidget(label, 2, 2); l_lbot->addWidget(label, 2, 2);
d->vedit = new KColorSpinBox( 0, 255, 1, page ); d->vedit = new KColorSpinBox( 0, 255, 1, page );
d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); d->vedit->setValidator( new TQIntValidator( d->vedit ) );
l_lbot->addWidget(d->vedit, 2, 3); l_lbot->addWidget(d->vedit, 2, 3);
connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), connect( d->vedit, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotHSVChanged() ) ); TQT_SLOT( slotHSVChanged() ) );
@ -1036,7 +1036,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label->setAlignment(AlignRight | AlignVCenter); label->setAlignment(AlignRight | AlignVCenter);
l_lbot->addWidget(label, 0, 4); l_lbot->addWidget(label, 0, 4);
d->redit = new KColorSpinBox( 0, 255, 1, page ); d->redit = new KColorSpinBox( 0, 255, 1, page );
d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); d->redit->setValidator( new TQIntValidator( d->redit ) );
l_lbot->addWidget(d->redit, 0, 5); l_lbot->addWidget(d->redit, 0, 5);
connect( d->redit, TQT_SIGNAL( valueChanged(int) ), connect( d->redit, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotRGBChanged() ) ); TQT_SLOT( slotRGBChanged() ) );
@ -1045,7 +1045,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label->setAlignment(AlignRight | AlignVCenter); label->setAlignment(AlignRight | AlignVCenter);
l_lbot->addWidget( label, 1, 4); l_lbot->addWidget( label, 1, 4);
d->gedit = new KColorSpinBox( 0, 255,1, page ); d->gedit = new KColorSpinBox( 0, 255,1, page );
d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); d->gedit->setValidator( new TQIntValidator( d->gedit ) );
l_lbot->addWidget(d->gedit, 1, 5); l_lbot->addWidget(d->gedit, 1, 5);
connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), connect( d->gedit, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotRGBChanged() ) ); TQT_SLOT( slotRGBChanged() ) );
@ -1054,7 +1054,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label->setAlignment(AlignRight | AlignVCenter); label->setAlignment(AlignRight | AlignVCenter);
l_lbot->addWidget(label, 2, 4); l_lbot->addWidget(label, 2, 4);
d->bedit = new KColorSpinBox( 0, 255, 1, page ); d->bedit = new KColorSpinBox( 0, 255, 1, page );
d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); d->bedit->setValidator( new TQIntValidator( d->bedit ) );
l_lbot->addWidget(d->bedit, 2, 5); l_lbot->addWidget(d->bedit, 2, 5);
connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), connect( d->bedit, TQT_SIGNAL( valueChanged(int) ),
TQT_SLOT( slotRGBChanged() ) ); TQT_SLOT( slotRGBChanged() ) );
@ -1131,28 +1131,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label = new TQLabel( page ); label = new TQLabel( page );
label->setText(i18n("Name:")); label->setText(i18n("Name:"));
l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, TQt::AlignLeft); l_grid->addWidget(label, 0, 1, TQt::AlignLeft);
d->colorName = new TQLabel( page ); d->colorName = new TQLabel( page );
l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, TQt::AlignLeft); l_grid->addWidget(d->colorName, 0, 2, TQt::AlignLeft);
label = new TQLabel( page ); label = new TQLabel( page );
label->setText(i18n("HTML:")); label->setText(i18n("HTML:"));
l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, TQt::AlignLeft); l_grid->addWidget(label, 1, 1, TQt::AlignLeft);
d->htmlName = new KLineEdit( page ); d->htmlName = new KLineEdit( page );
d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits
d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size
w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD"));
d->htmlName->setFixedWidth(w); d->htmlName->setFixedWidth(w);
l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, TQt::AlignLeft); l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft);
connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ),
TQT_SLOT( slotHtmlChanged() ) ); TQT_SLOT( slotHtmlChanged() ) );
d->patch = new KColorPatch( page ); d->patch = new KColorPatch( page );
d->patch->setFixedSize(48, 48); d->patch->setFixedSize(48, 48);
l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter);
connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)),
TQT_SLOT( setColor( const TQColor&))); TQT_SLOT( setColor( const TQColor&)));
@ -1532,7 +1532,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e )
TQColor TQColor
KColorDialog::grabColor(const TQPoint &p) KColorDialog::grabColor(const TQPoint &p)
{ {
TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); TQWidget *desktop = TQApplication::desktop();
TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1); TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1);
TQImage i = pm.convertToImage(); TQImage i = pm.convertToImage();
return i.pixel(0,0); return i.pixel(0,0);

20
tdeui/kdatetbl.cpp
Unescape View File

@ -84,7 +84,7 @@ public:
KDateValidator::KDateValidator(TQWidget* parent, const char* name) KDateValidator::KDateValidator(TQWidget* parent, const char* name)
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
} }
@ -158,12 +158,12 @@ KDateTable::~KDateTable()
void KDateTable::initAccels() void KDateTable::initAccels()
{ {
TDEAccel* accel = new TDEAccel(this, "date table accel"); TDEAccel* accel = new TDEAccel(this, "date table accel");
accel->insert(TDEStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth())); accel->insert(TDEStdAccel::Next, this, TQT_SLOT(nextMonth()));
accel->insert(TDEStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth())); accel->insert(TDEStdAccel::Prior, this, TQT_SLOT(previousMonth()));
accel->insert(TDEStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth())); accel->insert(TDEStdAccel::Home, this, TQT_SLOT(beginningOfMonth()));
accel->insert(TDEStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth())); accel->insert(TDEStdAccel::End, this, TQT_SLOT(endOfMonth()));
accel->insert(TDEStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek())); accel->insert(TDEStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek()));
accel->insert(TDEStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek())); accel->insert(TDEStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek()));
accel->readSettings(); accel->readSettings();
} }
@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date )
KDateInternalWeekSelector::KDateInternalWeekSelector KDateInternalWeekSelector::KDateInternalWeekSelector
(TQWidget* parent, const char* name) (TQWidget* parent, const char* name)
: TQLineEdit(parent, name), : TQLineEdit(parent, name),
val(new TQIntValidator(TQT_TQOBJECT(this))), val(new TQIntValidator(this)),
result(0) result(0)
{ {
TQFont font; TQFont font;
@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e)
KDateInternalYearSelector::KDateInternalYearSelector KDateInternalYearSelector::KDateInternalYearSelector
(TQWidget* parent, const char* name) (TQWidget* parent, const char* name)
: TQLineEdit(parent, name), : TQLineEdit(parent, name),
val(new TQIntValidator(TQT_TQOBJECT(this))), val(new TQIntValidator(this)),
result(0) result(0)
{ {
TQFont font; TQFont font;
@ -1008,7 +1008,7 @@ TDEPopupFrame::exec(TQPoint pos)
popup(pos); popup(pos);
repaint(); repaint();
d->exec = true; d->exec = true;
const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this); const TQGuardedPtr<TQObject> that = this;
tqApp->enter_loop(); tqApp->enter_loop();
if ( !that ) if ( !that )
return TQDialog::Rejected; return TQDialog::Rejected;

22
tdeui/kdockwidget.cpp
Unescape View File

@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
#ifdef BORDERLESS_WINDOWS #ifdef BORDERLESS_WINDOWS
setCursor(TQCursor(ArrowCursor)); setCursor(TQCursor(ArrowCursor));
#endif #endif
d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); d = new KDockWidgetHeaderPrivate( this );
layout = new TQHBoxLayout( this ); layout = new TQHBoxLayout( this );
layout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
layout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
manager = dockManager; manager = dockManager;
manager->childDock->append( TQT_TQOBJECT(this) ); manager->childDock->append( this );
installEventFilter( manager ); installEventFilter( manager );
eDocking = DockFullDocking; eDocking = DockFullDocking;
@ -562,8 +562,8 @@ KDockWidget::~KDockWidget()
} }
} }
emit iMBeingClosed(); emit iMBeingClosed();
if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); if (manager->d) manager->d->containerDocks.remove(this);
manager->childDock->remove(TQT_TQOBJECT(this)); manager->childDock->remove(this);
delete pix; delete pix;
delete d; // destroy private data delete d; // destroy private data
d=0; d=0;
@ -930,7 +930,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast()); static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast());
if (neighbor==this) if (neighbor==this)
return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
else else
if (neighbor->getWidget() && (::tqt_cast<KDockTabGroup*>(neighbor->getWidget()))) if (neighbor->getWidget() && (::tqt_cast<KDockTabGroup*>(neighbor->getWidget())))
return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
@ -938,7 +938,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
return neighbor; return neighbor;
} }
else else
return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
return 0; return 0;
} }
@ -1466,7 +1466,7 @@ void KDockWidget::setWidget( TQWidget* mw )
if (dc) if (dc)
{ {
d->isContainer=true; d->isContainer=true;
manager->d->containerDocks.append(TQT_TQOBJECT(this)); manager->d->containerDocks.append(this);
} }
else else
{ {
@ -1860,8 +1860,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
} }
w = p; w = p;
} }
if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L;
if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L;
if (dynamic_cast<KDockContainer*>(w)) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L;
if (!childDockWidgetList) return 0L; if (!childDockWidgetList) return 0L;
@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget)
{ {
if (!autoCreateDock) return; if (!autoCreateDock) return;
autoCreateDock->setAutoDelete(false); autoCreateDock->setAutoDelete(false);
autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); autoCreateDock->removeRef(pDockWidget);
autoCreateDock->setAutoDelete(true); autoCreateDock->setAutoDelete(true);
} }
@ -2890,7 +2890,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName )
if ( autoCreateDock ){ if ( autoCreateDock ){
kdDebug(282)<<"Autocreating dock: "<<dockName<<endl; kdDebug(282)<<"Autocreating dock: "<<dockName<<endl;
autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); autoCreateDock->append( autoCreate );
} }
return autoCreate; return autoCreate;
} }

10
tdeui/kjanuswidget.cpp
Unescape View File

@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade
void KJanusWidget::pageGone( TQObject *obj ) void KJanusWidget::pageGone( TQObject *obj )
{ {
removePage( TQT_TQWIDGET( obj ) ); removePage( static_cast<TQWidget*>( obj ) );
} }
void KJanusWidget::slotReopen( TQListViewItem * item ) void KJanusWidget::slotReopen( TQListViewItem * item )
@ -435,14 +435,14 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items,
if( mFace == Tabbed ) if( mFace == Tabbed )
{ {
mTabControl->addTab (page, items.last()); mTabControl->addTab (page, items.last());
d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page); d->mIntToPage[d->mNextPageIndex] = page;
d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex; d->mPageToInt[page] = d->mNextPageIndex;
d->mNextPageIndex++; d->mNextPageIndex++;
} }
else if( mFace == TreeList || mFace == IconList ) else if( mFace == TreeList || mFace == IconList )
{ {
d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page); d->mIntToPage[d->mNextPageIndex] = page;
d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex; d->mPageToInt[page] = d->mNextPageIndex;
mPageStack->addWidget( page, 0 ); mPageStack->addWidget( page, 0 );
if (items.isEmpty()) { if (items.isEmpty()) {

2
tdeui/klineedit.cpp
Unescape View File

@ -1008,7 +1008,7 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev )
{ {
if( o == this ) if( o == this )
{ {
KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); KCursor::autoHideEventFilter( this, ev );
if ( ev->type() == TQEvent::AccelOverride ) if ( ev->type() == TQEvent::AccelOverride )
{ {
TQKeyEvent *e = static_cast<TQKeyEvent*>( ev ); TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );

2
tdeui/knuminput.cpp
Unescape View File

@ -901,7 +901,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator
{ {
public: public:
KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name ) KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name )
: KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { } : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { }
virtual State validate( TQString& str, int& pos ) const; virtual State validate( TQString& str, int& pos ) const;

10
tdeui/knumvalidator.cpp
Unescape View File

@ -35,7 +35,7 @@
// //
KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name )
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
_base = base; _base = base;
if (_base < 2) _base = 2; if (_base < 2) _base = 2;
@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name )
} }
KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name )
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
_base = base; _base = base;
if (_base > 36) _base = 36; if (_base > 36) _base = 36;
@ -162,7 +162,7 @@ public:
KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name )
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
d = new KFloatValidatorPrivate; d = new KFloatValidatorPrivate;
d->acceptLocalizedNumbers=false; d->acceptLocalizedNumbers=false;
@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name )
} }
KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name )
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
d = new KFloatValidatorPrivate; d = new KFloatValidatorPrivate;
d->acceptLocalizedNumbers=false; d->acceptLocalizedNumbers=false;
@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent,
} }
KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name )
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
d = new KFloatValidatorPrivate; d = new KFloatValidatorPrivate;
d->acceptLocalizedNumbers = localeAware; d->acceptLocalizedNumbers = localeAware;

8
tdeui/kpanelapplet.cpp
Unescape View File

@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch)
if (watch) if (watch)
{ {
if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) == -1) if (d->watchedForFocus.find(widget) == -1)
{ {
d->watchedForFocus.append(TQT_TQOBJECT(widget)); d->watchedForFocus.append(widget);
widget->installEventFilter(this); widget->installEventFilter(this);
} }
} }
else if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) != -1) else if (d->watchedForFocus.find(widget) != -1)
{ {
d->watchedForFocus.remove(TQT_TQOBJECT(widget)); d->watchedForFocus.remove(widget);
widget->removeEventFilter(this); widget->removeEventFilter(this);
} }
} }

8
tdeui/kpixmapregionselectorwidget.cpp
Unescape View File

@ -141,13 +141,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
popup->insertTitle(i18n("Image Operations")); popup->insertTitle(i18n("Image Operations"));
TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), 0, this, TQT_SLOT(rotateClockwise()),
TQT_TQOBJECT(popup), "rotateclockwise"); popup, "rotateclockwise");
action->plug(popup); action->plug(popup);
action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), 0, this, TQT_SLOT(rotateCounterclockwise()),
TQT_TQOBJECT(popup), "rotatecounterclockwise"); popup, "rotatecounterclockwise");
action->plug(popup); action->plug(popup);
/* /*

4
tdeui/ksystemtray.cpp
Unescape View File

@ -77,12 +77,12 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
menu = new TDEPopupMenu( this ); menu = new TDEPopupMenu( this );
menu->insertTitle( kapp->miniIcon(), kapp->caption() ); menu->insertTitle( kapp->miniIcon(), kapp->caption() );
move( -1000, -1000 ); move( -1000, -1000 );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection);
if (parentWidget()) if (parentWidget())
{ {
new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), this, TQT_SLOT( minimizeRestoreAction() ),
d->actionCollection, "minimizeRestore"); d->actionCollection, "minimizeRestore");
#ifdef Q_WS_X11 #ifdef Q_WS_X11
KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() );

2
tdeui/ktextedit.cpp
Unescape View File

@ -351,7 +351,7 @@ void KTextEdit::checkSpelling()
{ {
delete d->spell; delete d->spell;
d->spell = new KSpell( this, i18n( "Spell Checking" ), d->spell = new KSpell( this, i18n( "Spell Checking" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
connect( d->spell, TQT_SIGNAL( death() ), connect( d->spell, TQT_SIGNAL( death() ),
this, TQT_SLOT( spellCheckerFinished() ) ); this, TQT_SLOT( spellCheckerFinished() ) );

2
tdeui/kxmlguibuilder.cpp
Unescape View File

@ -205,7 +205,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
TQCString name = element.attribute( d->attrName ).utf8(); TQCString name = element.attribute( d->attrName ).utf8();
TDEToolBar *bar = static_cast<TDEToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "TDEToolBar" ))); TDEToolBar *bar = static_cast<TDEToolBar*>(d->m_widget->child( name, "TDEToolBar" ));
if( !bar ) if( !bar )
{ {
bar = new TDEToolBar( d->m_widget, name, honor, false ); bar = new TDEToolBar( d->m_widget, name, honor, false );

4
tdeui/qxembed.cpp
Unescape View File

@ -421,7 +421,7 @@ static int qxembed_x11_event_filter( XEvent* e)
// L0671: Keep Qt message time up to date // L0671: Keep Qt message time up to date
if ( msgtime > get_tqt_x_time() ) if ( msgtime > get_tqt_x_time() )
set_tqt_x_time(msgtime); set_tqt_x_time(msgtime);
TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); TQWidget* w = TQWidget::find( e->xclient.window );
if ( !w ) if ( !w )
break; break;
switch ( message) { switch ( message) {
@ -525,7 +525,7 @@ static int qxembed_x11_event_filter( XEvent* e)
} }
} else if ( e->xclient.format == 32 && e->xclient.message_type ) { } else if ( e->xclient.format == 32 && e->xclient.message_type ) {
if ( e->xclient.message_type == tqt_wm_protocols ) { if ( e->xclient.message_type == tqt_wm_protocols ) {
TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); TQWidget* w = TQWidget::find( e->xclient.window );
if ( !w ) if ( !w )
break; break;
// L0690: This is for the embedding side! // L0690: This is for the embedding side!

12
tdeui/tdeaboutdialog.cpp
Unescape View File

@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void )
{ {
if( mShowHeader ) if( mShowHeader )
{ {
gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQt::AlignmentFlags)AlignLeft ); gbox->addWidget( mLabel[i], r, 0, (TQt::AlignmentFlags)AlignLeft );
gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft );
mLabel[i]->show(); mLabel[i]->show();
mText[i]->show(); mText[i]->show();
} }
@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void )
mLabel[i]->hide(); mLabel[i]->hide();
if( !i ) if( !i )
{ {
gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); gbox->addMultiCellWidget( mText[i], r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft );
} }
else else
{ {
gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft );
} }
mText[i]->show(); mText[i]->show();
} }
@ -800,7 +800,7 @@ void TDEAboutContainer::childEvent( TQChildEvent *e )
++itr; ++itr;
if( o->isWidgetType() ) if( o->isWidgetType() )
{ {
TQT_TQWIDGET(o)->setMinimumWidth( s.width() ); static_cast<TQWidget*>(o)->setMinimumWidth( s.width() );
} }
} }
} }
@ -826,7 +826,7 @@ TQSize TDEAboutContainer::sizeHint( void ) const
if( o->isWidgetType() ) if( o->isWidgetType() )
{ {
++numChild; ++numChild;
TQWidget* const w= TQT_TQWIDGET(o); TQWidget* const w= static_cast<TQWidget*>(o);
TQSize s = w->minimumSize(); TQSize s = w->minimumSize();
if( s.isEmpty() ) if( s.isEmpty() )

6
tdeui/tdemainwindow.cpp
Unescape View File

@ -433,7 +433,7 @@ bool TDEMainWindow::restore( int number, bool show )
KXMLGUIFactory *TDEMainWindow::guiFactory() KXMLGUIFactory *TDEMainWindow::guiFactory()
{ {
if ( !factory_ ) if ( !factory_ )
factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" ); factory_ = new KXMLGUIFactory( this, this, "guifactory" );
return factory_; return factory_;
} }
@ -467,7 +467,7 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString &
if( options & ToolBar ){ if( options & ToolBar ){
setStandardToolBarMenuEnabled( true ); setStandardToolBarMenuEnabled( true );
KStdAction::configureToolbars(TQT_TQOBJECT(this), KStdAction::configureToolbars(this,
TQT_SLOT(configureToolbars() ), actionCollection()); TQT_SLOT(configureToolbars() ), actionCollection());
} }
@ -804,7 +804,7 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const
void TDEMainWindow::createStandardStatusBarAction(){ void TDEMainWindow::createStandardStatusBarAction(){
if(!d->showStatusBarAction){ if(!d->showStatusBarAction){
d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection()); d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection());
KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already.
connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool)));
d->showStatusBarAction->setChecked(sb->isHidden()); d->showStatusBarAction->setChecked(sb->isHidden());

2
tdeui/tdemainwindowiface.cpp
Unescape View File

@ -34,7 +34,7 @@ TDEMainWindowInterface::TDEMainWindowInterface(TDEMainWindow * mainWindow)
{ {
m_MainWindow = mainWindow; m_MainWindow = mainWindow;
m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this ); m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow)); m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow);
} }
TDEMainWindowInterface::~TDEMainWindowInterface() TDEMainWindowInterface::~TDEMainWindowInterface()

20
tdeui/tdemessagebox.cpp
Unescape View File

@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text,
if ( !shouldBeShownYesNo(dontAskAgainName, res) ) if ( !shouldBeShownYesNo(dontAskAgainName, res) )
return res; return res;
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Question") : caption, caption.isEmpty() ? i18n("Question") : caption,
KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes | KDialogBase::No,
@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id,
if ( !shouldBeShownYesNo(dontAskAgainName, res) ) if ( !shouldBeShownYesNo(dontAskAgainName, res) )
return res; return res;
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Question") : caption, caption.isEmpty() ? i18n("Question") : caption,
KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text,
if ( !shouldBeShownYesNo(dontAskAgainName, res) ) if ( !shouldBeShownYesNo(dontAskAgainName, res) )
return res; return res;
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Warning") : caption, caption.isEmpty() ? i18n("Warning") : caption,
KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes | KDialogBase::No,
@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text,
if ( !shouldBeShownContinue(dontAskAgainName) ) if ( !shouldBeShownContinue(dontAskAgainName) )
return Continue; return Continue;
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Warning") : caption, caption.isEmpty() ? i18n("Warning") : caption,
KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes | KDialogBase::No,
@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text,
if ( !shouldBeShownYesNo(dontAskAgainName, res) ) if ( !shouldBeShownYesNo(dontAskAgainName, res) )
return res; return res;
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Warning") : caption, caption.isEmpty() ? i18n("Warning") : caption,
KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
@ -755,7 +755,7 @@ void
KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist,
const TQString &caption, int options) const TQString &caption, int options)
{ {
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Error") : caption, caption.isEmpty() ? i18n("Error") : caption,
KDialogBase::Yes, KDialogBase::Yes,
@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text,
const TQString &details, const TQString &details,
const TQString &caption, int options) const TQString &caption, int options)
{ {
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Error") : caption, caption.isEmpty() ? i18n("Error") : caption,
KDialogBase::Yes | KDialogBase::Details, KDialogBase::Yes | KDialogBase::Details,
@ -832,7 +832,7 @@ void
KMessageBox::sorryWId(WId parent_id, const TQString &text, KMessageBox::sorryWId(WId parent_id, const TQString &text,
const TQString &caption, int options) const TQString &caption, int options)
{ {
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Sorry") : caption, caption.isEmpty() ? i18n("Sorry") : caption,
KDialogBase::Yes, KDialogBase::Yes,
@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text,
const TQString &details, const TQString &details,
const TQString &caption, int options) const TQString &caption, int options)
{ {
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Sorry") : caption, caption.isEmpty() ? i18n("Sorry") : caption,
KDialogBase::Yes | KDialogBase::Details, KDialogBase::Yes | KDialogBase::Details,
@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri
if ( !shouldBeShownContinue(dontShowAgainName) ) if ( !shouldBeShownContinue(dontShowAgainName) )
return; return;
TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); TQWidget* parent = TQWidget::find( parent_id );
KDialogBase *dialog= new KDialogBase( KDialogBase *dialog= new KDialogBase(
caption.isEmpty() ? i18n("Information") : caption, caption.isEmpty() ? i18n("Information") : caption,
KDialogBase::Yes, KDialogBase::Yes,

2
tdeui/tdetoolbar.cpp
Unescape View File

@ -1350,7 +1350,7 @@ TQSize TDEToolBar::sizeHint() const
ncThis->polish(); ncThis->polish();
int margin = static_cast<TQWidget*>(ncThis)->layout()->margin() + frameWidth(); int margin = ncThis->layout()->margin() + frameWidth();
switch( barPos() ) switch( barPos() )
{ {
case TDEToolBar::Top: case TDEToolBar::Top:

2
tdeui/twindowlistmenu.cpp
Unescape View File

@ -85,7 +85,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection:
KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name)
: TDEPopupMenu(parent, name) : TDEPopupMenu(parent, name)
{ {
twin_module = new KWinModule(TQT_TQOBJECT(this)); twin_module = new KWinModule(this);
connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
} }

2
tdeutils/kcmultidialog.cpp
Unescape View File

@ -338,7 +338,7 @@ void KCMultiDialog::removeAllModules()
{ {
kdDebug( 710 ) << "remove 2" << endl; kdDebug( 710 ) << "remove 2" << endl;
TDECModuleProxy * kcm = ( *it ).kcm; TDECModuleProxy * kcm = ( *it ).kcm;
TQObject * page = TQT_TQOBJECT(kcm->parent()); TQObject * page = kcm->parent();
kcm->hide(); kcm->hide();
if( page ) if( page )
{ {

2
tdeutils/kfinddialog.cpp
Unescape View File

@ -439,7 +439,7 @@ void KFindDialog::showPatterns()
{ {
if ( !d->m_regexpDialogQueryDone ) if ( !d->m_regexpDialogQueryDone )
{ {
d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
d->m_regexpDialogQueryDone = true; d->m_regexpDialogQueryDone = true;
} }

2
tdeutils/tdecmoduleloader.cpp
Unescape View File

@ -72,7 +72,7 @@ TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &li
KLibFactory *factory = lib->factory(); KLibFactory *factory = lib->factory();
if ( factory ) if ( factory )
{ {
TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, parent, name ? name : mod.handle().latin1(), args );
if (module) if (module)
return module; return module;
} }

2
tdewallet/client/tdewallet.cpp
Unescape View File

@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
} }
// avoid deadlock if the app has some popup open (#65978/#71048) // avoid deadlock if the app has some popup open (#65978/#71048)
while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget())) while( TQWidget* widget = tqApp->activePopupWidget())
widget->close(); widget->close();
bool isPath = ot == Path; bool isPath = ot == Path;

Write Preview
Loading…
Cancel
Save