From bab0c762c48a8defdeda42a1e3351179b0c3c2f7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ksquirrel@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksquirrel/imageedit/sq_imagebcg.ui | 2 +- ksquirrel/imageedit/sq_imageconvert.ui | 2 +- ksquirrel/imageedit/sq_imageeditoptions.ui | 2 +- ksquirrel/imageedit/sq_imagefilter.ui | 2 +- ksquirrel/imageedit/sq_writeoption.ui | 2 +- ksquirrel/ksquirrel-libs-configurator/klc.ui | 2 +- ksquirrel/ksquirrelpart/ksquirrelpart.cpp | 6 +++--- ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui | 2 +- ksquirrel/ksquirrelpart/sq_helpwidget.ui | 2 +- ksquirrel/ksquirrelpart/sq_imagebcg.ui | 2 +- ksquirrel/ksquirrelpart/sq_imagefilter.ui | 2 +- ksquirrel/ksquirrelpart/sq_imageproperties.ui | 2 +- ksquirrel/ksquirrelpart/sq_imageproperties.ui.h | 2 +- ksquirrel/sidebar/sq_directorybasket.cpp | 8 ++++---- ksquirrel/sidebar/sq_directorybasket.h | 4 ++-- ksquirrel/sidebar/sq_treeviewitem.cpp | 8 ++++---- ksquirrel/sidebar/sq_treeviewitem.h | 4 ++-- ksquirrel/sq_codecsettingsskeleton.ui | 2 +- ksquirrel/sq_externaltools.ui | 2 +- ksquirrel/sq_filters.ui | 2 +- ksquirrel/sq_glinfo.ui | 2 +- ksquirrel/sq_glview.cpp | 2 +- ksquirrel/sq_helpwidget.ui | 2 +- ksquirrel/sq_iconlistbox.cpp | 8 ++++---- ksquirrel/sq_iconlistbox.h | 4 ++-- ksquirrel/sq_imageproperties.ui | 2 +- ksquirrel/sq_imageproperties.ui.h | 2 +- ksquirrel/sq_options.ui | 2 +- ksquirrel/sq_pluginsinfo.ui | 2 +- ksquirrel/sq_selectdeselectgroup.ui | 2 +- ksquirrel/sq_slideshow.ui | 2 +- ksquirrel/sq_slideshowlisting.ui | 2 +- ksquirrel/sq_tabopendialog.ui | 2 +- ksquirrel/sq_thumbnailcachemaster.ui | 2 +- ksquirrel/sq_viewcache.ui | 2 +- 35 files changed, 49 insertions(+), 49 deletions(-) diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui index e291d2e..f431374 100644 --- a/ksquirrel/imageedit/sq_imagebcg.ui +++ b/ksquirrel/imageedit/sq_imagebcg.ui @@ -982,7 +982,7 @@ setPreviewImage( const TQImage & im ) instance() - + knuminput.h sq_label.h diff --git a/ksquirrel/imageedit/sq_imageconvert.ui b/ksquirrel/imageedit/sq_imageconvert.ui index 1ec4728..649680f 100644 --- a/ksquirrel/imageedit/sq_imageconvert.ui +++ b/ksquirrel/imageedit/sq_imageconvert.ui @@ -338,7 +338,7 @@ fillWriteOptions( fmt_writeoptions * opt, const fmt_writeoptionsabs & opt2 ) closeEvent( TQCloseEvent * e ) - + kprogress.h diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui b/ksquirrel/imageedit/sq_imageeditoptions.ui index 6bf32c2..cb5549f 100644 --- a/ksquirrel/imageedit/sq_imageeditoptions.ui +++ b/ksquirrel/imageedit/sq_imageeditoptions.ui @@ -219,7 +219,7 @@ exec( SQ_ImageOptions * o ) setConfigPrefix( const TQString & pr ) - + kurlrequester.h klineedit.h diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/ksquirrel/imageedit/sq_imagefilter.ui index 146796c..79ec3e4 100644 --- a/ksquirrel/imageedit/sq_imagefilter.ui +++ b/ksquirrel/imageedit/sq_imagefilter.ui @@ -1552,7 +1552,7 @@ hackConnect() instance() - + kcolorbutton.h knuminput.h diff --git a/ksquirrel/imageedit/sq_writeoption.ui b/ksquirrel/imageedit/sq_writeoption.ui index bdd71fa..cba0f45 100644 --- a/ksquirrel/imageedit/sq_writeoption.ui +++ b/ksquirrel/imageedit/sq_writeoption.ui @@ -161,7 +161,7 @@ - + knuminput.h knuminput.h diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/ksquirrel/ksquirrel-libs-configurator/klc.ui index 34c0a55..91a0dc0 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui @@ -186,5 +186,5 @@ moveCodecs( bool e2d ) closeEvent( TQCloseEvent * ev ) - + diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp index 8be24cc..58df2dc 100644 --- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp +++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp @@ -38,7 +38,7 @@ typedef KParts::GenericFactory KSquirrelFactory; K_EXPORT_COMPONENT_FACTORY(libksquirrelpart, KSquirrelFactory) -KSquirrelPart::KSquirrelPart(TQWidget *tqparentWidget, const char *, +KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *, TQObject* tqparent, const char *name, const TQStringList &) : KParts::ReadOnlyPart(tqparent, name) { @@ -52,7 +52,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *tqparentWidget, const char *, KGlobal::locale()->setActiveCatalogue(KSquirrelFactory::instance()->instanceName()); if(!SQ_ErrorString::instance()) - new SQ_ErrorString(TQT_TQOBJECT(tqparentWidget)); + new SQ_ErrorString(TQT_TQOBJECT(parentWidget)); if(!SQ_Config::instance()) new SQ_Config; @@ -72,7 +72,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *tqparentWidget, const char *, new SQ_DirOperator; - gl = new SQ_GLWidget(tqparentWidget, "ksquirrelpart-opengl-widget"); + gl = new SQ_GLWidget(parentWidget, "ksquirrelpart-opengl-widget"); gl->glInitA(); connect(gl, TQT_SIGNAL(message(const TQString &)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui index 8a5a677..7f282ab 100644 --- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui +++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui @@ -213,5 +213,5 @@ exec( fmt_settings & settings ) setCodecInfo( const TQPixmap & pixmap, const TQString & text ) - + diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui b/ksquirrel/ksquirrelpart/sq_helpwidget.ui index 1902366..02fb30d 100644 --- a/ksquirrel/ksquirrelpart/sq_helpwidget.ui +++ b/ksquirrel/ksquirrelpart/sq_helpwidget.ui @@ -330,5 +330,5 @@ destroy() event( TQEvent * e ) - + diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui index e291d2e..f431374 100644 --- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui +++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui @@ -982,7 +982,7 @@ setPreviewImage( const TQImage & im ) instance() - + knuminput.h sq_label.h diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/ksquirrel/ksquirrelpart/sq_imagefilter.ui index 146796c..79ec3e4 100644 --- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui +++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui @@ -1552,7 +1552,7 @@ hackConnect() instance() - + kcolorbutton.h knuminput.h diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui index 6f445f4..85b262f 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui @@ -965,5 +965,5 @@ setMetaInfo( TQValueVector<TQPair<TQString, TQString> > meta ) setFile( const TQString & _file ) - + diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h index 35726d7..c1b6988 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h @@ -142,7 +142,7 @@ void SQ_ImageProperties::setFileParams() kew1->setMode(KExifWidget::SIMPLE); } - // finally, add all widgets to tqlayouts + // finally, add all widgets to layouts pageLayoutGR->addWidget(mode1, 0, 0); pageLayoutGR->addWidget(mode2, 0, 1); pageLayoutGR->addItem(spacer, 0, 2); diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp index d14ef1a..1ee3eac 100644 --- a/ksquirrel/sidebar/sq_directorybasket.cpp +++ b/ksquirrel/sidebar/sq_directorybasket.cpp @@ -118,12 +118,12 @@ void SQ_DBMenu::slotDirectoryDelete() /* ******************************************************************************* */ -SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeViewItem *tqparentItem, KFileItem *fileItem, KFileTreeBranch *tqparentBranch) - : KFileTreeViewItem(tqparentItem, fileItem, tqparentBranch), m_index(0) +SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeViewItem *parentItem, KFileItem *fileItem, KFileTreeBranch *parentBranch) + : KFileTreeViewItem(parentItem, fileItem, parentBranch), m_index(0) {} -SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *tqparentBranch) - : KFileTreeViewItem(tqparent, fileItem, tqparentBranch), m_index(0) +SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch) + : KFileTreeViewItem(tqparent, fileItem, parentBranch), m_index(0) {} SQ_DirectoryItem::~SQ_DirectoryItem() diff --git a/ksquirrel/sidebar/sq_directorybasket.h b/ksquirrel/sidebar/sq_directorybasket.h index 6fb4a19..995d9ca 100644 --- a/ksquirrel/sidebar/sq_directorybasket.h +++ b/ksquirrel/sidebar/sq_directorybasket.h @@ -65,8 +65,8 @@ void SQ_DBMenu::setItem(SQ_DirectoryItem *i) class SQ_DirectoryItem : public KFileTreeViewItem { public: - SQ_DirectoryItem(KFileTreeViewItem *tqparentItem, KFileItem *fileItem, KFileTreeBranch *tqparentBranch); - SQ_DirectoryItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *tqparentBranch); + SQ_DirectoryItem(KFileTreeViewItem *parentItem, KFileItem *fileItem, KFileTreeBranch *parentBranch); + SQ_DirectoryItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch); ~SQ_DirectoryItem(); int index() const; diff --git a/ksquirrel/sidebar/sq_treeviewitem.cpp b/ksquirrel/sidebar/sq_treeviewitem.cpp index 2339ae9..8d6500f 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.cpp +++ b/ksquirrel/sidebar/sq_treeviewitem.cpp @@ -23,13 +23,13 @@ #include "sq_treeviewitem.h" -SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeViewItem *tqparentItem, KFileItem *fileItem, KFileTreeBranch *tqparentBranch) - : KFileTreeViewItem(tqparentItem, fileItem, tqparentBranch), +SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeViewItem *parentItem, KFileItem *fileItem, KFileTreeBranch *parentBranch) + : KFileTreeViewItem(parentItem, fileItem, parentBranch), m_checked(false), count_files(0), count_dirs(0), use_c1(false), use_c2(false) {} -SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *tqparentBranch) - : KFileTreeViewItem(tqparent, fileItem, tqparentBranch), +SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch) + : KFileTreeViewItem(tqparent, fileItem, parentBranch), m_checked(false), count_files(0), count_dirs(0), use_c1(false), use_c2(false) {} diff --git a/ksquirrel/sidebar/sq_treeviewitem.h b/ksquirrel/sidebar/sq_treeviewitem.h index 26cb0c5..a544ca9 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.h +++ b/ksquirrel/sidebar/sq_treeviewitem.h @@ -25,8 +25,8 @@ class KFileTreeBranch; class SQ_TreeViewItem : public KFileTreeViewItem { public: - SQ_TreeViewItem(KFileTreeViewItem *tqparentItem, KFileItem *fileItem, KFileTreeBranch *tqparentBranch); - SQ_TreeViewItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *tqparentBranch); + SQ_TreeViewItem(KFileTreeViewItem *parentItem, KFileItem *fileItem, KFileTreeBranch *parentBranch); + SQ_TreeViewItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch); ~SQ_TreeViewItem(); bool checked() const; diff --git a/ksquirrel/sq_codecsettingsskeleton.ui b/ksquirrel/sq_codecsettingsskeleton.ui index 8a5a677..7f282ab 100644 --- a/ksquirrel/sq_codecsettingsskeleton.ui +++ b/ksquirrel/sq_codecsettingsskeleton.ui @@ -213,5 +213,5 @@ exec( fmt_settings & settings ) setCodecInfo( const TQPixmap & pixmap, const TQString & text ) - + diff --git a/ksquirrel/sq_externaltools.ui b/ksquirrel/sq_externaltools.ui index 92960ba..be97196 100644 --- a/ksquirrel/sq_externaltools.ui +++ b/ksquirrel/sq_externaltools.ui @@ -459,5 +459,5 @@ init() - + diff --git a/ksquirrel/sq_filters.ui b/ksquirrel/sq_filters.ui index 16d35cc..9cc6865 100644 --- a/ksquirrel/sq_filters.ui +++ b/ksquirrel/sq_filters.ui @@ -409,5 +409,5 @@ init() - + diff --git a/ksquirrel/sq_glinfo.ui b/ksquirrel/sq_glinfo.ui index 4aadd44..862eb9e 100644 --- a/ksquirrel/sq_glinfo.ui +++ b/ksquirrel/sq_glinfo.ui @@ -161,5 +161,5 @@ init() - + diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp index 18c1520..ab62530 100644 --- a/ksquirrel/sq_glview.cpp +++ b/ksquirrel/sq_glview.cpp @@ -270,7 +270,7 @@ void SQ_GLView::setupTabbar() m_tabbar->tabAt(i)->setIconSet(m_tabsclose ? SmallIcon("fileclose") : TQPixmap()); m_tabbar->setHoverCloseButton(m_tabsclose); - m_tabbar->tqlayoutTabs(); + m_tabbar->layoutTabs(); } if(m_tabs == SQ_Config::instance()->readBoolEntry("tabs", false)) diff --git a/ksquirrel/sq_helpwidget.ui b/ksquirrel/sq_helpwidget.ui index 1902366..02fb30d 100644 --- a/ksquirrel/sq_helpwidget.ui +++ b/ksquirrel/sq_helpwidget.ui @@ -330,5 +330,5 @@ destroy() event( TQEvent * e ) - + diff --git a/ksquirrel/sq_iconlistbox.cpp b/ksquirrel/sq_iconlistbox.cpp index 39e155a..e0ceb3e 100644 --- a/ksquirrel/sq_iconlistbox.cpp +++ b/ksquirrel/sq_iconlistbox.cpp @@ -51,20 +51,20 @@ void SQ_IconListBox::updateWidth() } } -void SQ_IconListBox::tqinvalidateHeight() +void SQ_IconListBox::invalidateHeight() { mHeightValid = false; } -void SQ_IconListBox::tqinvalidateWidth() +void SQ_IconListBox::invalidateWidth() { mWidthValid = false; } void SQ_IconListBox::updateAndInstall(TQObject *o) { - tqinvalidateHeight(); - tqinvalidateWidth(); + invalidateHeight(); + invalidateWidth(); updateWidth(); TQFont listFont(font()); diff --git a/ksquirrel/sq_iconlistbox.h b/ksquirrel/sq_iconlistbox.h index 5537ab5..cb4ba43 100644 --- a/ksquirrel/sq_iconlistbox.h +++ b/ksquirrel/sq_iconlistbox.h @@ -35,8 +35,8 @@ class SQ_IconListBox : public KListBox private: void updateWidth(); - void tqinvalidateHeight(); - void tqinvalidateWidth(); + void invalidateHeight(); + void invalidateWidth(); private: bool mHeightValid; diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui index 6f445f4..85b262f 100644 --- a/ksquirrel/sq_imageproperties.ui +++ b/ksquirrel/sq_imageproperties.ui @@ -965,5 +965,5 @@ setMetaInfo( TQValueVector<TQPair<TQString, TQString> > meta ) setFile( const TQString & _file ) - + diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h index ba5fab8..377570d 100644 --- a/ksquirrel/sq_imageproperties.ui.h +++ b/ksquirrel/sq_imageproperties.ui.h @@ -142,7 +142,7 @@ void SQ_ImageProperties::setFileParams() kew1->setMode(KExifWidget::SIMPLE); } - // finally, add all widgets to tqlayouts + // finally, add all widgets to layouts pageLayoutGR->addWidget(mode1, 0, 0); pageLayoutGR->addWidget(mode2, 0, 1); pageLayoutGR->addItem(spacer, 0, 2); diff --git a/ksquirrel/sq_options.ui b/ksquirrel/sq_options.ui index 1c75c46..bbc722f 100644 --- a/ksquirrel/sq_options.ui +++ b/ksquirrel/sq_options.ui @@ -2101,7 +2101,7 @@ validPixmap( TQPixmap pix ) isPowerOf2( int tested ) - + sq_iconlistbox.h kpushbutton.h diff --git a/ksquirrel/sq_pluginsinfo.ui b/ksquirrel/sq_pluginsinfo.ui index 385e045..49962df 100644 --- a/ksquirrel/sq_pluginsinfo.ui +++ b/ksquirrel/sq_pluginsinfo.ui @@ -271,5 +271,5 @@ init() showLibs() - + diff --git a/ksquirrel/sq_selectdeselectgroup.ui b/ksquirrel/sq_selectdeselectgroup.ui index 7aaeac6..2395c46 100644 --- a/ksquirrel/sq_selectdeselectgroup.ui +++ b/ksquirrel/sq_selectdeselectgroup.ui @@ -102,5 +102,5 @@ init() exec( TQString & tqmask ) - + diff --git a/ksquirrel/sq_slideshow.ui b/ksquirrel/sq_slideshow.ui index d23c800..a8b718e 100644 --- a/ksquirrel/sq_slideshow.ui +++ b/ksquirrel/sq_slideshow.ui @@ -441,7 +441,7 @@ setPath( const TQString & path ) appendPath( const TQString & path ) - + knuminput.h knuminput.h diff --git a/ksquirrel/sq_slideshowlisting.ui b/ksquirrel/sq_slideshowlisting.ui index 541fd63..15d60b1 100644 --- a/ksquirrel/sq_slideshowlisting.ui +++ b/ksquirrel/sq_slideshowlisting.ui @@ -106,7 +106,7 @@ init() setFile( int count, const TQString & f ) - + ksqueezedtextlabel.h diff --git a/ksquirrel/sq_tabopendialog.ui b/ksquirrel/sq_tabopendialog.ui index 7e3a3e3..6359e64 100644 --- a/ksquirrel/sq_tabopendialog.ui +++ b/ksquirrel/sq_tabopendialog.ui @@ -100,5 +100,5 @@ init() result() - + diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui index 7ec6f28..dd31202 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui +++ b/ksquirrel/sq_thumbnailcachemaster.ui @@ -252,7 +252,7 @@ init() - + kpushbutton.h kpushbutton.h diff --git a/ksquirrel/sq_viewcache.ui b/ksquirrel/sq_viewcache.ui index dc87d83..f748c39 100644 --- a/ksquirrel/sq_viewcache.ui +++ b/ksquirrel/sq_viewcache.ui @@ -164,5 +164,5 @@ init() - +