From abcbb684982167791304dc2fe0bc979489506b43 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:24:21 -0600 Subject: Rename obsolete tq methods to standard names --- languages/cpp/addattributedialogbase.ui | 6 ++-- languages/cpp/addmethoddialogbase.ui | 6 ++-- languages/cpp/app_templates/kapp/appview.cpp | 2 +- languages/cpp/app_templates/kapp/pref.cpp | 8 ++--- .../cpp/app_templates/kde4app/kapp4view_base.ui | 4 +-- languages/cpp/app_templates/kde4app/prefs_base.ui | 4 +-- .../cpp/app_templates/kscons_kmdi/appkmdiView.cpp | 4 +-- .../cpp/app_templates/opieinput/simpleimpl.cpp | 2 +- .../cpp/app_templates/qtopia4app/examplebase.ui | 4 +-- languages/cpp/ccconfigwidget.cpp | 6 ++-- languages/cpp/ccconfigwidgetbase.ui | 24 +++++++-------- .../cpp/compiler/gccoptions/gccoptionsplugin.cpp | 36 +++++++++++----------- languages/cpp/configproblemreporter.ui | 2 +- languages/cpp/cppnewclassdlgbase.ui | 4 +-- languages/cpp/debugger/dbgpsdlg.cpp | 2 +- languages/cpp/debugger/debuggerconfigwidgetbase.ui | 6 ++-- languages/cpp/debugger/gdbbreakpointwidget.cpp | 2 +- languages/cpp/debugger/gdboutputwidget.cpp | 4 +-- languages/cpp/debugger/memviewdlg.cpp | 2 +- languages/cpp/debugger/variablewidget.cpp | 8 ++--- .../pcsimporter/qtimporter/settingsdialogbase.ui | 2 +- languages/cpp/typedesc.cpp | 4 +-- 22 files changed, 71 insertions(+), 71 deletions(-) (limited to 'languages/cpp') diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 0ca00eb4..4e42f714 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -79,7 +79,7 @@ - tqlayout3 + layout3 @@ -133,7 +133,7 @@ - tqlayout4 + layout4 @@ -178,7 +178,7 @@ - tqlayout5 + layout5 diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 40a59154..a8048708 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -90,7 +90,7 @@ - tqlayout3 + layout3 @@ -144,7 +144,7 @@ - tqlayout4 + layout4 @@ -189,7 +189,7 @@ - tqlayout5 + layout5 diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 5f9d906a..32afca2e 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -17,7 +17,7 @@ : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { - // setup our tqlayout manager to automatically add our widgets + // setup our layout manager to automatically add our widgets TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index 673df14e..ff83190f 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -25,8 +25,8 @@ %{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } @@ -34,8 +34,8 @@ %{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index f85bd963..6738a789 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui @@ -15,7 +15,7 @@ true - + 11 @@ -204,7 +204,7 @@ - + qPixmapFromMimeSource diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index 3a78c979..87a191f1 100644 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui @@ -9,7 +9,7 @@ 156 - + @@ -136,7 +136,7 @@ p, li { white-space: pre-wrap; } - + qPixmapFromMimeSource diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index 006b844e..d7c00001 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -35,9 +35,9 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" ); + TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); part()->widget()->reparent( this, TQPoint(0, 0) ); - tqlayout->addWidget( part()->widget() ); + layout->addWidget( part()->widget() ); // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index 6a7bef4f..a4c2e177 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){ /* * Send the key - * ke is the tqunicode + * ke is the unicode * _ke + 0x41 is the keycode * m_state Normally the state * down/up diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui index 76e7d49f..107d4e96 100644 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui @@ -15,7 +15,7 @@ %{APPNAME} - + 11 @@ -39,6 +39,6 @@ - + diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 67fde8ed..d1e0d0c6 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -561,7 +561,7 @@ void CCConfigWidget::openPluginPaths() kdDebug(9024) << "Plugin paths opened" << endl; QtBuildConfig* c = m_pPart->qtBuildConfig(); KDialog d( this ); - TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d ); + TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); @@ -576,8 +576,8 @@ void CCConfigWidget::openPluginPaths() req->setMode( KFile::Directory ); KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d ); p->insertStringList( c->designerPluginPaths() ); - maintqlayout->addWidget( p ); - maintqlayout->addLayout( btns ); + mainlayout->addWidget( p ); + mainlayout->addLayout( btns ); d.resize( 450, 250 ); if( d.exec() == TQDialog::Accepted) { diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 5daf1e34..dae89168 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -36,7 +36,7 @@ - tqlayout11 + layout11 @@ -77,7 +77,7 @@ - tqlayout13 + layout13 @@ -227,7 +227,7 @@ completion-box. - tqlayout14 + layout14 @@ -299,7 +299,7 @@ argument hint - tqlayout12 + layout12 @@ -397,7 +397,7 @@ Note: Parsing may become very slow when this is enabled - tqlayout6 + layout6 @@ -605,7 +605,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a") - tqlayout6 + layout6 @@ -905,7 +905,7 @@ This option only applies to QMake projects. - tqlayout9 + layout9 @@ -974,7 +974,7 @@ This option only applies to QMake projects. - tqlayout9 + layout9 @@ -1006,7 +1006,7 @@ This option only applies to QMake projects. - tqlayout8 + layout8 @@ -1149,7 +1149,7 @@ This option only applies to QMake projects. - tqlayout9 + layout9 @@ -1178,7 +1178,7 @@ This option only applies to QMake projects. - tqlayout10 + layout10 @@ -1250,7 +1250,7 @@ This option only applies to QMake projects. - tqlayout5_2 + layout5_2 diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index dec76d0b..cf090adf 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -101,9 +101,9 @@ private: GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); - tqlayout->addSpacing( 10 ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); + layout->addSpacing( 10 ); TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this ); new FlagCheckBox( output_group, controller, @@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addSpacing( 10 ); + layout->addSpacing( 10 ); TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); if ( type != GccOptionsPlugin::GPP ) @@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha "-short-double", i18n( "Make 'double' the same as 'float'" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -167,8 +167,8 @@ void GeneralTab::writeFlags( TQStringList *list ) OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this ); Odefault = new TQRadioButton( i18n( "Default" ), group ); @@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, } TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -264,9 +264,9 @@ void OptimizationTab::writeFlags( TQStringList *list ) G77Tab::G77Tab( TQWidget *parent, const char *name ) : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); - tqlayout->addSpacing( 10 ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); + layout->addSpacing( 10 ); TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this ); new FlagCheckBox( dialect_group, controller, @@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name ) "-fonetrip", i18n( "DO loops are executed at least once" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addSpacing( 10 ); + layout->addSpacing( 10 ); TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); new FlagCheckBox( codegen_group, controller, @@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name ) "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -319,8 +319,8 @@ void G77Tab::writeFlags( TQStringList *list ) Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); new FlagCheckBox( this, controller, "-w", i18n( "Inhibit all warnings" ) ); @@ -417,8 +417,8 @@ void Warnings1Tab::writeFlags( TQStringList *list ) Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); wrestBox = new FlagListBox( this ); @@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const "deprecated by using the 'deprecated' attribute" ) ); new FlagListItem( wrestBox, "-Wpacked", i18n( "Warn if a structure is given the packed attribute, but the packed\n" - "attribute has no effect on the tqlayout or size of the structure" ) ); + "attribute has no effect on the layout or size of the structure" ) ); new FlagListItem( wrestBox, "-Wpadded", i18n( "Warn if padding is included in a structure, either to align an\n" "element of the structure or to align the whole structure" ) ); diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index 0e03bec2..d752d715 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -62,7 +62,7 @@ If disabled, the parser will typically only run when the file is saved. - tqlayout2 + layout2 diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index f4d3a399..3e61701b 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -446,7 +446,7 @@ Namespace1::Namespace2::...::NamespaceN - tqlayout5 + layout5 @@ -640,7 +640,7 @@ Namespace1::Namespace2::...::NamespaceN - tqlayout4 + layout4 diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index a399b5e1..3f89227f 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->tqlayout(); + buttonbox->layout(); topLayout->addWidget(buttonbox); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index eee96cb9..72bb4c93 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -102,7 +102,7 @@ - tqlayout4 + layout4 @@ -208,7 +208,7 @@ check this option. - tqlayout3 + layout3 @@ -303,7 +303,7 @@ check this option. - tqlayout1 + layout1 diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index b2f47d99..5c69502d 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -1234,7 +1234,7 @@ TQWidget* ComplexEditCell::createEditor() const TQPushButton* b = new TQPushButton("...", box); // This is exactly what is done in TQDesigner source in the // similar context. Haven't had any success making the good look - // with tqlayout, I suppose that sizeHint for button is always larger + // with layout, I suppose that sizeHint for button is always larger // than 20. b->setFixedWidth( 20 ); diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index e6f80530..11e50feb 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -356,8 +356,8 @@ void OutputText::copyAll() // Make sure the text is pastable both with Ctrl-C and with // middle click. - TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard); - TQApplication::tqclipboard()->setText(text, TQClipboard::Selection); + TQApplication::clipboard()->setText(text, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(text, TQClipboard::Selection); } void OutputText::toggleShowInternalCommands() diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 4db5b0b8..81340ea5 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -84,7 +84,7 @@ namespace GDBDebugger { TQVBoxLayout* l = new TQVBoxLayout(this); - // Grid tqlayout: labels + address field + // Grid layout: labels + address field TQGridLayout* gl = new TQGridLayout(l); gl->setColSpacing(0, 2); diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index bc598978..4abbe69b 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e) void VariableTree::copyToClipboard(TQListViewItem* item) { - TQClipboard *qb = KApplication::tqclipboard(); + TQClipboard *qb = KApplication::clipboard(); TQString text = item->text( 1 ); qb->setText( text, TQClipboard::Clipboard ); @@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) s = s.mid(i+2); } - // A hack to nicely display TQStrings. The content of TQString is tqunicode + // A hack to nicely display TQStrings. The content of TQString is unicode // for for ASCII only strings we get ascii character mixed with \000. // Remove those \000 now. @@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes() else varTree->controller()->addCommand( new ValueSpecialRepresentationCommand( - this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\"")); + this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\"")); return true; } @@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, if (!alive_) { /* Draw this as disabled. */ - TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(), + TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(), column, width, align); } else diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index 6f0ac590..19fd0db1 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -35,7 +35,7 @@ - tqlayout2 + layout2 diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 1150f8fb..5f2c292c 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() { int len = m_cleanName.length(); for ( int a = 0; a < len; a++ ) - ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1)); + ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1)); int n = 1; @@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() { int len = m_cleanName.length(); for ( int a = 0; a < len; a++ ) - ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1)); + ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1)); int n = 1; -- cgit v1.2.1