rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krename@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 23a5fcb7bc
commit 267cf798d9

@ -44,8 +44,8 @@
// update user interface every 1/2 second // update user interface every 1/2 second
#define TIMER_INTERVAL 500 #define TIMER_INTERVAL 500
ProgressDialog::ProgressDialog( TQWidget* tqparent, const char* name, WFlags fl ) ProgressDialog::ProgressDialog( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl ) : TQWidget( parent, name, fl )
{ {
renamedFiles = NULL; renamedFiles = NULL;

@ -46,7 +46,7 @@ class ProgressDialog : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ProgressDialog( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ProgressDialog( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~ProgressDialog(); ~ProgressDialog();
void setProgressTotalSteps( int t ); void setProgressTotalSteps( int t );

@ -29,9 +29,9 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
ConfDialog::ConfDialog( TQWidget* tqparent, const char* name ) ConfDialog::ConfDialog( TQWidget* parent, const char* name )
: KDialogBase( KDialogBase::IconList, "KRename", : KDialogBase( KDialogBase::IconList, "KRename",
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Default, KDialogBase::Ok, tqparent, name, true, true ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Default, KDialogBase::Ok, parent, name, true, true ),
GUIModeSelector() GUIModeSelector()
{ {
setupTab1(); setupTab1();

@ -35,7 +35,7 @@ class ConfDialog : public KDialogBase, public GUIModeSelector {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ConfDialog( TQWidget* tqparent = 0, const char* name = 0 ); ConfDialog( TQWidget* parent = 0, const char* name = 0 );
~ConfDialog(); ~ConfDialog();
inline bool loadplugins() const { return checkPlugins->isChecked(); } inline bool loadplugins() const { return checkPlugins->isChecked(); }

@ -28,8 +28,8 @@
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
DSLineEdit::DSLineEdit( TQWidget* tqparent, const char* name ) DSLineEdit::DSLineEdit( TQWidget* parent, const char* name )
: KLineEdit( tqparent, name ) : KLineEdit( parent, name )
{ {
} }
@ -51,14 +51,14 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char *
: KDialogBase( KDialogBase::Plain, "KRename", : KDialogBase( KDialogBase::Plain, "KRename",
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, _parent, name, true, true ), m_file( file ) KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, _parent, name, true, true ), m_file( file )
{ {
TQFrame* tqparent = plainPage(); TQFrame* parent = plainPage();
TQVBoxLayout* tqlayout = new TQVBoxLayout( tqparent ); TQVBoxLayout* tqlayout = new TQVBoxLayout( parent );
filename = new DSLineEdit( tqparent ); filename = new DSLineEdit( parent );
filename->setText( file ); filename->setText( file );
filename->setValidator( new TQRegExpValidator( TQRegExp( file ), TQT_TQOBJECT(this) ) ); filename->setValidator( new TQRegExpValidator( TQRegExp( file ), TQT_TQOBJECT(this) ) );
preview = new TQLabel( tqparent ); preview = new TQLabel( parent );
checkInvert = new TQCheckBox( i18n("&Invert selection"), plainPage() ); checkInvert = new TQCheckBox( i18n("&Invert selection"), plainPage() );
checkInvert->setChecked( m_inversion ); checkInvert->setChecked( m_inversion );

@ -26,7 +26,7 @@ class DSLineEdit : public KLineEdit {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
DSLineEdit( TQWidget* tqparent = 0, const char* name = 0 ); DSLineEdit( TQWidget* parent = 0, const char* name = 0 );
signals: signals:
void changed(); void changed();

@ -30,8 +30,8 @@
#include <klocale.h> #include <klocale.h>
#include <kurlcombobox.h> #include <kurlcombobox.h>
DSDirSelectDialog::DSDirSelectDialog( TQWidget* tqparent ) DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent )
: KFileDialog( ":KRename", "*", tqparent, 0, false ) : KFileDialog( ":KRename", "*", parent, 0, false )
{ {
setOperationMode( KFileDialog::Opening ); setOperationMode( KFileDialog::Opening );
setMode( KFile::Files | KFile::ExistingOnly ); setMode( KFile::Files | KFile::ExistingOnly );

@ -30,7 +30,7 @@ class DSDirSelectDialog : public KFileDialog {
TQ_OBJECT TQ_OBJECT
public: public:
DSDirSelectDialog( TQWidget* tqparent ); DSDirSelectDialog( TQWidget* parent );
bool recursively() const; bool recursively() const;
bool hidden() const; bool hidden() const;

@ -17,9 +17,9 @@
#include "firststartdlg.h" #include "firststartdlg.h"
FirstStartDlg::FirstStartDlg(TQWidget *tqparent, const char *name ) FirstStartDlg::FirstStartDlg(TQWidget *parent, const char *name )
: KDialogBase( KDialogBase::Plain, "KRename", : KDialogBase( KDialogBase::Plain, "KRename",
KDialogBase::Ok, KDialogBase::Ok, tqparent, name, true, true ), KDialogBase::Ok, KDialogBase::Ok, parent, name, true, true ),
GUIModeSelector() GUIModeSelector()
{ {
setCaption( guiModeCaption() ); setCaption( guiModeCaption() );

@ -26,7 +26,7 @@ class FirstStartDlg : public KDialogBase, public GUIModeSelector {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
FirstStartDlg(TQWidget *tqparent=0, const char *name=0); FirstStartDlg(TQWidget *parent=0, const char *name=0);
~FirstStartDlg(); ~FirstStartDlg();
}; };

@ -64,9 +64,9 @@ TQStringList HelpDialogData::tokens() const
} }
HelpDialog::HelpDialog( HelpDialogData* data, TQWidget* tqparent, HelpDialog::HelpDialog( HelpDialogData* data, TQWidget* parent,
const char* name, bool modal, WFlags fl ) const char* name, bool modal, WFlags fl )
: TQDialog( tqparent, name, modal, fl ) : TQDialog( parent, name, modal, fl )
{ {
text = NULL; text = NULL;

@ -77,7 +77,7 @@ class HelpDialog : public TQDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
HelpDialog( HelpDialogData* data, TQWidget* tqparent = 0, HelpDialog( HelpDialogData* data, TQWidget* parent = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~HelpDialog(); ~HelpDialog();

@ -36,8 +36,8 @@
#define KRENAME_NUMBER 5003 #define KRENAME_NUMBER 5003
#define KRENAME_DATE 5004 #define KRENAME_DATE 5004
KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* tqparent, const char* name) KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char* name)
: KHistoryCombo(tqparent, name) : KHistoryCombo(parent, name)
{ {
TQStringList history; TQStringList history;
TQStringList completion; TQStringList completion;

@ -34,7 +34,7 @@ class KMyHistoryCombo : public KHistoryCombo {
* *
* \param customPopup insert custom menu items into context menu. * \param customPopup insert custom menu items into context menu.
*/ */
KMyHistoryCombo(bool customPopup, TQWidget* tqparent=0, const char* name=0); KMyHistoryCombo(bool customPopup, TQWidget* parent=0, const char* name=0);
~KMyHistoryCombo(); ~KMyHistoryCombo();
/** /**

@ -43,8 +43,8 @@
using namespace KIO; using namespace KIO;
KMyListBox::KMyListBox(TQWidget* tqparent, const char* name, WFlags fl) KMyListBox::KMyListBox(TQWidget* parent, const char* name, WFlags fl)
:KListBox(tqparent, name, fl) :KListBox(parent, name, fl)
{ {
m_running_lister_counter = 0; m_running_lister_counter = 0;

@ -41,7 +41,7 @@ class KMyListBox : public KListBox {
public: public:
enum { ASCENDING = 1, DESCENDING = 2, RANDOM = 3, NUMMERIC = 4, UNSORTED = 0 }; enum { ASCENDING = 1, DESCENDING = 2, RANDOM = 3, NUMMERIC = 4, UNSORTED = 0 };
KMyListBox(TQWidget* tqparent=0, const char* name=0, WFlags fl=0); KMyListBox(TQWidget* parent=0, const char* name=0, WFlags fl=0);
~KMyListBox(); ~KMyListBox();
void removeItem( int index ); void removeItem( int index );

@ -24,8 +24,8 @@
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <krun.h> #include <krun.h>
KMyListView::KMyListView( TQValueList<manualchanges>* _changes, KMyListBox* _list, TQWidget* tqparent, const char* name ) KMyListView::KMyListView( TQValueList<manualchanges>* _changes, KMyListBox* _list, TQWidget* parent, const char* name )
:KListView(tqparent, name ) :KListView(parent, name )
{ {
changes = _changes; changes = _changes;
list = _list; list = _list;
@ -114,50 +114,50 @@ void KMyListView::openCurrent()
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
KMyListViewItem::KMyListViewItem(TQListView *tqparent) KMyListViewItem::KMyListViewItem(TQListView *parent)
: KListViewItem(tqparent) : KListViewItem(parent)
{ } { }
KMyListViewItem::KMyListViewItem(TQListViewItem *tqparent) KMyListViewItem::KMyListViewItem(TQListViewItem *parent)
: KListViewItem(tqparent) : KListViewItem(parent)
{ } { }
KMyListViewItem::KMyListViewItem(TQListView *tqparent, TQListViewItem *after) KMyListViewItem::KMyListViewItem(TQListView *parent, TQListViewItem *after)
: KListViewItem(tqparent, after) : KListViewItem(parent, after)
{ } { }
KMyListViewItem::KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after) KMyListViewItem::KMyListViewItem(TQListViewItem *parent, TQListViewItem *after)
: KListViewItem(tqparent, after) : KListViewItem(parent, after)
{ } { }
KMyListViewItem::KMyListViewItem(bool m, TQListView *tqparent, KMyListViewItem::KMyListViewItem(bool m, TQListView *parent,
TQString label1, TQString label2, TQString label3, TQString label4, TQString label1, TQString label2, TQString label3, TQString label4,
TQString label5, TQString label6, TQString label7, TQString label8) TQString label5, TQString label6, TQString label7, TQString label8)
: KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8) : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
{ {
modified = m; modified = m;
} }
KMyListViewItem::KMyListViewItem(bool m, TQListViewItem *tqparent, KMyListViewItem::KMyListViewItem(bool m, TQListViewItem *parent,
TQString label1, TQString label2, TQString label3, TQString label4, TQString label1, TQString label2, TQString label3, TQString label4,
TQString label5, TQString label6, TQString label7, TQString label8) TQString label5, TQString label6, TQString label7, TQString label8)
: KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8) : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
{ {
modified = m; modified = m;
} }
KMyListViewItem::KMyListViewItem(bool m, TQListView *tqparent, TQListViewItem *after, KMyListViewItem::KMyListViewItem(bool m, TQListView *parent, TQListViewItem *after,
TQString label1, TQString label2, TQString label3, TQString label4, TQString label1, TQString label2, TQString label3, TQString label4,
TQString label5, TQString label6, TQString label7, TQString label8) TQString label5, TQString label6, TQString label7, TQString label8)
: KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8) : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
{ {
modified = m; modified = m;
} }
KMyListViewItem::KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after, KMyListViewItem::KMyListViewItem(TQListViewItem *parent, TQListViewItem *after,
TQString label1, TQString label2, TQString label3, TQString label4, TQString label1, TQString label2, TQString label3, TQString label4,
TQString label5, TQString label6, TQString label7, TQString label8) TQString label5, TQString label6, TQString label7, TQString label8)
: KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8) : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
{ } { }
KMyListViewItem::~KMyListViewItem() KMyListViewItem::~KMyListViewItem()

@ -28,7 +28,7 @@ class KMyListView : public KListView {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KMyListView( TQValueList<manualchanges>* _changes, KMyListBox* _list, TQWidget* tqparent=0, const char* name=0 ); KMyListView( TQValueList<manualchanges>* _changes, KMyListBox* _list, TQWidget* parent=0, const char* name=0 );
~KMyListView(); ~KMyListView();
signals: signals:
@ -54,30 +54,30 @@ class TQColor;
class TQString; class TQString;
class KMyListViewItem : public KListViewItem { class KMyListViewItem : public KListViewItem {
public: public:
KMyListViewItem(TQListView *tqparent); KMyListViewItem(TQListView *parent);
KMyListViewItem(TQListViewItem *tqparent); KMyListViewItem(TQListViewItem *parent);
KMyListViewItem(TQListView *tqparent, TQListViewItem *after); KMyListViewItem(TQListView *parent, TQListViewItem *after);
KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after); KMyListViewItem(TQListViewItem *parent, TQListViewItem *after);
KMyListViewItem(bool m, TQListView *tqparent, KMyListViewItem(bool m, TQListView *parent,
TQString, TQString = TQString(), TQString, TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString()); TQString = TQString(), TQString = TQString());
KMyListViewItem(bool m, TQListViewItem *tqparent, KMyListViewItem(bool m, TQListViewItem *parent,
TQString, TQString = TQString(), TQString, TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString()); TQString = TQString(), TQString = TQString());
KMyListViewItem(bool m, TQListView *tqparent, TQListViewItem *after, KMyListViewItem(bool m, TQListView *parent, TQListViewItem *after,
TQString, TQString = TQString(), TQString, TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString()); TQString = TQString(), TQString = TQString());
KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after, KMyListViewItem(TQListViewItem *parent, TQListViewItem *after,
TQString, TQString = TQString(), TQString, TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString(), TQString = TQString(), TQString = TQString(),

@ -19,7 +19,7 @@
#include "krecursivelister.h" #include "krecursivelister.h"
KRecursiveLister::KRecursiveLister(TQObject *tqparent, const char *name ) : TQObject(tqparent,name) { KRecursiveLister::KRecursiveLister(TQObject *parent, const char *name ) : TQObject(parent,name) {
lister = 0L; lister = 0L;
filelist.clear(); filelist.clear();
dirlist.clear(); dirlist.clear();

@ -37,7 +37,7 @@ class KRecursiveLister : public TQObject {
TQ_OBJECT TQ_OBJECT
public: public:
KRecursiveLister(TQObject *tqparent=0, const char *name=0); KRecursiveLister(TQObject *parent=0, const char *name=0);
~KRecursiveLister(); ~KRecursiveLister();
/** Returns the list of fileitems found. */ /** Returns the list of fileitems found. */

@ -83,21 +83,21 @@ TQString pageTitle[] = {
I18N_NOOP( "File&name" ) I18N_NOOP( "File&name" )
}; };
KPushButton* createButton( KGuiItem item, TQWidget* tqparent ) KPushButton* createButton( KGuiItem item, TQWidget* parent )
{ {
return new KPushButton( item.iconSet(), item.text(), tqparent ); return new KPushButton( item.iconSet(), item.text(), parent );
} }
KRenameImpl::KRenameImpl( TQWidget* p, KMenuBar* m, TQPushButton* finish ) KRenameImpl::KRenameImpl( TQWidget* p, KMenuBar* m, TQPushButton* finish )
: DCOPObject( "KRename" ), TQObject( (TQObject*)p ), : DCOPObject( "KRename" ), TQObject( (TQObject*)p ),
tqparent( p ), menuBar( m ), finishButton( finish ) parent( p ), menuBar( m ), finishButton( finish )
{ {
m_hasCommandlineProfile = false; m_hasCommandlineProfile = false;
// Load Plugins // Load Plugins
plugin = PluginLoader::instance(); plugin = PluginLoader::instance();
helpDialogData = new HelpDialogData(); helpDialogData = new HelpDialogData();
// Maybe tqparent instead of 0 but might crash when switching from wizard to tab mode // Maybe parent instead of 0 but might crash when switching from wizard to tab mode
helpDialog = new HelpDialog( helpDialogData, NULL, NULL, false ); helpDialog = new HelpDialog( helpDialogData, NULL, NULL, false );
m_switching = false; m_switching = false;
@ -115,7 +115,7 @@ int KRenameImpl::numRealTimePreview = -1;
void KRenameImpl::setup( bool wizardmode ) void KRenameImpl::setup( bool wizardmode )
{ {
tqparent->setCaption( "KRename" ); // "KRename by Dominik Seichter parent->setCaption( "KRename" ); // "KRename by Dominik Seichter
setupActions(); setupActions();
setupPages(); setupPages();
updateCount(); updateCount();
@ -295,9 +295,9 @@ void KRenameImpl::setupActions()
{ {
KActionCollection* actionCollection = new KActionCollection( this ); KActionCollection* actionCollection = new KActionCollection( this );
KPopupMenu* mnuExtra = new KPopupMenu( tqparent ); KPopupMenu* mnuExtra = new KPopupMenu( parent );
KPopupMenu* mnuSettings = new KPopupMenu( tqparent ); KPopupMenu* mnuSettings = new KPopupMenu( parent );
KHelpMenu* mnuHelp = new KHelpMenu( tqparent ); KHelpMenu* mnuHelp = new KHelpMenu( parent );
menuBar->insertItem( i18n("E&xtras"), mnuExtra ); menuBar->insertItem( i18n("E&xtras"), mnuExtra );
mnuExtra->insertItem( i18n("&Profiles..."), this, TQT_SLOT( manageProfiles() ) ); mnuExtra->insertItem( i18n("&Profiles..."), this, TQT_SLOT( manageProfiles() ) );
@ -332,7 +332,7 @@ void KRenameImpl::setupPages()
void KRenameImpl::setupPage1() void KRenameImpl::setupPage1()
{ {
page_1 = new TQWidget( tqparent ); page_1 = new TQWidget( parent );
pageLayout = new TQHBoxLayout( page_1, 11, 6 ); pageLayout = new TQHBoxLayout( page_1, 11, 6 );
Layout3 = new TQVBoxLayout( 0, 0, 6 ); Layout3 = new TQVBoxLayout( 0, 0, 6 );
@ -414,7 +414,7 @@ void KRenameImpl::setupPage1()
void KRenameImpl::setupPage2() void KRenameImpl::setupPage2()
{ {
page_2 = new TQWidget( tqparent ); page_2 = new TQWidget( parent );
pageLayout_2 = new TQVBoxLayout( page_2, 6, 6 ); pageLayout_2 = new TQVBoxLayout( page_2, 6, 6 );
@ -481,7 +481,7 @@ void KRenameImpl::setupPage2()
void KRenameImpl::setupPage3() void KRenameImpl::setupPage3()
{ {
page_3 = new KJanusWidget( tqparent, "janus", KJanusWidget::TreeList ); page_3 = new KJanusWidget( parent, "janus", KJanusWidget::TreeList );
page_3->setShowIconsInTreeList( true ); page_3->setShowIconsInTreeList( true );
page_3->setTreeListAutoResize( true ); page_3->setTreeListAutoResize( true );
@ -492,7 +492,7 @@ void KRenameImpl::setupPage3()
void KRenameImpl::setupPage4() void KRenameImpl::setupPage4()
{ {
page_4 = new TQWidget( tqparent ); page_4 = new TQWidget( parent );
pageLayout_4 = new TQVBoxLayout( page_4, 11, 6 ); pageLayout_4 = new TQVBoxLayout( page_4, 11, 6 );
fileTab = new TQWidgetStack( page_4 ); fileTab = new TQWidgetStack( page_4 );
@ -587,7 +587,7 @@ void KRenameImpl::setupFileTab1()
help.append("[$x-y];;" + i18n("character x to y of old filename") ); help.append("[$x-y];;" + i18n("character x to y of old filename") );
help.append("[$x;y];;" + i18n("y characters of old filename starting at x") ); help.append("[$x;y];;" + i18n("y characters of old filename starting at x") );
help.append("[$dirname];;" + i18n("insert name of directory") ); help.append("[$dirname];;" + i18n("insert name of directory") );
help.append("[$dirname.];;" + i18n("insert name of tqparent directory") ); help.append("[$dirname.];;" + i18n("insert name of parent directory") );
help.append("[#length-0];;" + i18n("insert the length of the input filename") ); help.append("[#length-0];;" + i18n("insert the length of the input filename") );
helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("krename"), true ); helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("krename"), true );
@ -875,7 +875,7 @@ void KRenameImpl::setupTab1()
* Draw plugin user interfaces * Draw plugin user interfaces
*/ */
TQFrame* tqparent; TQFrame* parent;
TQVBoxLayout* Layout; TQVBoxLayout* Layout;
TQVBoxLayout* gLayout; TQVBoxLayout* gLayout;
TQGroupBox* g; TQGroupBox* g;
@ -892,13 +892,13 @@ void KRenameImpl::setupTab1()
while ( it.current() ) { while ( it.current() ) {
if( !(*it)->plugin->alwaysUsed() ) if( !(*it)->plugin->alwaysUsed() )
{ {
tqparent = page_3->addPage( (*it)->plugin->getName(), TQString(), (*it)->plugin->getIcon() ); parent = page_3->addPage( (*it)->plugin->getName(), TQString(), (*it)->plugin->getIcon() );
Layout = new TQVBoxLayout( tqparent, 11, 6, "Layout"); Layout = new TQVBoxLayout( parent, 11, 6, "Layout");
g = new TQGroupBox( tqparent ); g = new TQGroupBox( parent );
gLayout = new TQVBoxLayout( g, 11, 6, "gLayout" ); gLayout = new TQVBoxLayout( g, 11, 6, "gLayout" );
(*it)->check = new TQCheckBox( i18n("&Use this plugin"), tqparent ); (*it)->check = new TQCheckBox( i18n("&Use this plugin"), parent );
connect( (*it)->check, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pluginHelpChanged() ) ); connect( (*it)->check, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pluginHelpChanged() ) );
connect( (*it)->plugin, TQT_SIGNAL( previewChanged( Plugin* ) ), this, TQT_SLOT( updatePluginPreview( Plugin* ) ) ); connect( (*it)->plugin, TQT_SIGNAL( previewChanged( Plugin* ) ), this, TQT_SLOT( updatePluginPreview( Plugin* ) ) );
Layout->addWidget( (*it)->check ); Layout->addWidget( (*it)->check );
@ -919,7 +919,7 @@ void KRenameImpl::addFile()
{ {
bool auto_up = false; bool auto_up = false;
DSDirSelectDialog* dsd = new DSDirSelectDialog( tqparent ); DSDirSelectDialog* dsd = new DSDirSelectDialog( parent );
if( dsd->exec() == TQDialog::Accepted ) { if( dsd->exec() == TQDialog::Accepted ) {
KURL::List slist = dsd->selectedURLs(); KURL::List slist = dsd->selectedURLs();
KURL::List::Iterator it = slist.begin(); KURL::List::Iterator it = slist.begin();
@ -1022,12 +1022,12 @@ void KRenameImpl::start()
if( setupBatchRenamer( b, false ) ) if( setupBatchRenamer( b, false ) )
{ {
p->show(); p->show();
tqparent->hide(); parent->hide();
b->processFiles( p, this ); b->processFiles( p, this );
} }
// Memory leak!!! : ?? // Memory leak!!! : ??
//delete tqparent; //delete parent;
} }
void KRenameImpl::enableControls() void KRenameImpl::enableControls()
@ -1046,16 +1046,16 @@ void KRenameImpl::enableControls()
bool KRenameImpl::checkErrors() bool KRenameImpl::checkErrors()
{ {
if( filename->text().isEmpty() ) { if( filename->text().isEmpty() ) {
KMessageBox::sorry( tqparent, i18n("Specify a template to use for renaming files.") ); KMessageBox::sorry( parent, i18n("Specify a template to use for renaming files.") );
return false; return false;
} }
if( dirname->text().isEmpty() && !optionRename->isChecked()) { if( dirname->text().isEmpty() && !optionRename->isChecked()) {
KMessageBox::sorry( tqparent, i18n("Please give a destination directory !") ); KMessageBox::sorry( parent, i18n("Please give a destination directory !") );
emit showPage( 2 ); emit showPage( 2 );
return false; return false;
} }
if( checkUndoScript->isChecked() && !optionCopy->isChecked() && undorequester->url().isEmpty() ) { if( checkUndoScript->isChecked() && !optionCopy->isChecked() && undorequester->url().isEmpty() ) {
KMessageBox::sorry( tqparent, i18n("Please give the name of the undo script!") ); KMessageBox::sorry( parent, i18n("Please give the name of the undo script!") );
showPage( 2 ); showPage( 2 );
return false; return false;
} }
@ -1164,7 +1164,7 @@ bool KRenameImpl::setupBatchRenamer( BatchRenamer* b, bool preview )
if( !KIO::NetAccess::exists( KURL( url ) ) ) if( !KIO::NetAccess::exists( KURL( url ) ) )
{ {
int m = KMessageBox::warningContinueCancel( tqparent, i18n("The directory %1 does not exist. " int m = KMessageBox::warningContinueCancel( parent, i18n("The directory %1 does not exist. "
"KRename will create it for you.").tqarg( url ) ); "KRename will create it for you.").tqarg( url ) );
if( m == KMessageBox::Cancel ) if( m == KMessageBox::Cancel )
return false; return false;
@ -1278,12 +1278,12 @@ void KRenameImpl::loadConfig()
CoordDialog::m_inversion = config->readBoolEntry("Inverse", false); CoordDialog::m_inversion = config->readBoolEntry("Inverse", false);
m_wizard = config->readBoolEntry( "GUIWizardMode", true ); m_wizard = config->readBoolEntry( "GUIWizardMode", true );
int width = config->readNumEntry( "Width", tqparent->width() ); int width = config->readNumEntry( "Width", parent->width() );
int height = config->readNumEntry( "Height", tqparent->height() ); int height = config->readNumEntry( "Height", parent->height() );
if( config->readBoolEntry("Maximized", false ) ) { if( config->readBoolEntry("Maximized", false ) ) {
tqparent->showMaximized(); parent->showMaximized();
} else { } else {
tqparent->resize( width, height ); parent->resize( width, height );
} }
refreshColumnMode(); refreshColumnMode();
@ -1305,7 +1305,7 @@ void KRenameImpl::loadConfig()
checkName->setEnabled( false ); checkName->setEnabled( false );
} }
//tqparent->show(); //parent->show();
page_1->setEnabled( false ); page_1->setEnabled( false );
KApplication::setOverrideCursor( TQt::WaitCursor ); KApplication::setOverrideCursor( TQt::WaitCursor );
plugin->loadPlugins( m_loadplugins ); plugin->loadPlugins( m_loadplugins );
@ -1329,11 +1329,11 @@ void KRenameImpl::saveConfig()
config->writeEntry("firststart", false ); config->writeEntry("firststart", false );
config->writeEntry("ImagePreview", checkPreview->isChecked() ); config->writeEntry("ImagePreview", checkPreview->isChecked() );
config->writeEntry("StartIndex", m_index ); config->writeEntry("StartIndex", m_index );
config->writeEntry("Maximized", tqparent->isMaximized() ); config->writeEntry("Maximized", parent->isMaximized() );
config->writeEntry("Width", tqparent->width() ); config->writeEntry("Width", parent->width() );
config->writeEntry("Height", tqparent->height() ); config->writeEntry("Height", parent->height() );
config->writeEntry("XPos", tqparent->x() ); config->writeEntry("XPos", parent->x() );
config->writeEntry("YPos", tqparent->y() ); config->writeEntry("YPos", parent->y() );
config->writeEntry("LoadFilePlugins", m_loadplugins ); config->writeEntry("LoadFilePlugins", m_loadplugins );
config->writeEntry("ColumnAutosize", m_autosize ); config->writeEntry("ColumnAutosize", m_autosize );
config->writeEntry("Name", checkName->isChecked() ); config->writeEntry("Name", checkName->isChecked() );
@ -1349,7 +1349,7 @@ void KRenameImpl::saveConfig()
void KRenameImpl::replace() void KRenameImpl::replace()
{ {
ReplaceDialog* r = new ReplaceDialog( rep, tqparent ); ReplaceDialog* r = new ReplaceDialog( rep, parent );
if( r->exec() == TQDialog::Accepted ) if( r->exec() == TQDialog::Accepted )
{ {
rep = r->getList(); rep = r->getList();
@ -1377,7 +1377,7 @@ void KRenameImpl::toggleName()
void KRenameImpl::preferences() void KRenameImpl::preferences()
{ {
ConfDialog* cd = new ConfDialog( tqparent, "cd" ); ConfDialog* cd = new ConfDialog( parent, "cd" );
cd->setLoadPlugins( m_loadplugins ); cd->setLoadPlugins( m_loadplugins );
cd->setThumbSize( fileList->getPreviewSize() ); cd->setThumbSize( fileList->getPreviewSize() );
cd->setAutosize( m_autosize ); cd->setAutosize( m_autosize );
@ -1414,21 +1414,21 @@ void KRenameImpl::changeGUIMode()
/* GUI Mode was changed by the user */ /* GUI Mode was changed by the user */
saveConfig(); saveConfig();
int x = tqparent->x(); int x = parent->x();
int y = tqparent->y(); int y = parent->y();
int w = tqparent->width(); int w = parent->width();
int h = tqparent->height(); int h = parent->height();
TQWidget* oldtqparent = tqparent; TQWidget* oldparent = parent;
TQWidget* krename = KRenameImpl::launch( TQRect( x, y, w, h ), TQStringList(), this, false ); TQWidget* krename = KRenameImpl::launch( TQRect( x, y, w, h ), TQStringList(), this, false );
m_switching = true; m_switching = true;
oldtqparent->removeChild( this ); oldparent->removeChild( this );
oldtqparent->hide(); oldparent->hide();
krename->insertChild( this ); krename->insertChild( this );
krename->show(); krename->show();
oldtqparent->close(); oldparent->close();
m_switching = false; m_switching = false;
} }
@ -1460,7 +1460,7 @@ void KRenameImpl::moveDown()
void KRenameImpl::undo() void KRenameImpl::undo()
{ {
UndoDialog* u = new UndoDialog( tqparent ); UndoDialog* u = new UndoDialog( parent );
u->exec(); u->exec();
delete u; delete u;
} }
@ -1519,7 +1519,7 @@ void KRenameImpl::getCoordinates()
TQFileInfo fi( name ); TQFileInfo fi( name );
TQString extension; TQString extension;
splitFilename( &fi, &name, &extension ); splitFilename( &fi, &name, &extension );
CoordDialog* cd = new CoordDialog( name, tqparent ); CoordDialog* cd = new CoordDialog( name, parent );
if( cd->exec() == TQDialog::Accepted ) { if( cd->exec() == TQDialog::Accepted ) {
TQString t = filename->text(); TQString t = filename->text();
@ -1588,7 +1588,7 @@ void KRenameImpl::updateHist()
void KRenameImpl::changeNumbers() void KRenameImpl::changeNumbers()
{ {
NumberDialog* nd = new NumberDialog( skip, tqparent ); NumberDialog* nd = new NumberDialog( skip, parent );
nd->spinIndex->setValue( m_index ); nd->spinIndex->setValue( m_index );
nd->spinStep->setValue( m_step ); nd->spinStep->setValue( m_step );
nd->checkResetCounter->setChecked( m_reset ); nd->checkResetCounter->setChecked( m_reset );
@ -1606,7 +1606,7 @@ void KRenameImpl::changeNumbers()
void KRenameImpl::about() void KRenameImpl::about()
{ {
KAboutApplication * d = new KAboutApplication( kapp->aboutData(), tqparent ); KAboutApplication * d = new KAboutApplication( kapp->aboutData(), parent );
d->show(); d->show();
} }
@ -1633,23 +1633,23 @@ void KRenameImpl::setWizardMode( bool mode )
void KRenameImpl::changeParent( TQWidget* p, KMenuBar* m, TQPushButton* finish, TQRect r ) void KRenameImpl::changeParent( TQWidget* p, KMenuBar* m, TQPushButton* finish, TQRect r )
{ {
tqparent = p; parent = p;
menuBar = m; menuBar = m;
finishButton = finish; finishButton = finish;
connect( finishButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( start() )); connect( finishButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( start() ));
if( !r.isNull() ) { if( !r.isNull() ) {
tqparent->resize( r.size() ); parent->resize( r.size() );
tqparent->move( r.x(), r.y() ); parent->move( r.x(), r.y() );
} }
setupActions(); setupActions();
page_1->reparent( tqparent, TQPoint( 0, 0 ) ); page_1->reparent( parent, TQPoint( 0, 0 ) );
page_2->reparent( tqparent, TQPoint( 0, 0 ) ); page_2->reparent( parent, TQPoint( 0, 0 ) );
page_3->reparent( tqparent, TQPoint( 0, 0 ) ); page_3->reparent( parent, TQPoint( 0, 0 ) );
page_4->reparent( tqparent, TQPoint( 0, 0 ) ); page_4->reparent( parent, TQPoint( 0, 0 ) );
emit pageDone( page_1, i18n( pageTitle[0] ) ); emit pageDone( page_1, i18n( pageTitle[0] ) );
emit pageDone( page_2, i18n( pageTitle[1] ) ); emit pageDone( page_2, i18n( pageTitle[1] ) );
@ -1802,13 +1802,13 @@ void KRenameImpl::reloadFilePluginData()
void KRenameImpl::manageProfiles() void KRenameImpl::manageProfiles()
{ {
ProfileDlg dlg( this, tqparent, "dlg" ); ProfileDlg dlg( this, parent, "dlg" );
dlg.exec(); dlg.exec();
} }
void KRenameImpl::getHelpDialogString( TQLineEdit* edit ) void KRenameImpl::getHelpDialogString( TQLineEdit* edit )
{ {
HelpDialog hdlg( helpDialogData, tqparent, "hdlg", true ); HelpDialog hdlg( helpDialogData, parent, "hdlg", true );
hdlg.setLineEdit( edit ); hdlg.setLineEdit( edit );
hdlg.updateHeadline(); hdlg.updateHeadline();
hdlg.updateItems(); hdlg.updateItems();

@ -59,7 +59,7 @@ class TQVGroupBox;
class TQWidget; class TQWidget;
#include <kguiitem.h> #include <kguiitem.h>
KPushButton* createButton( KGuiItem item, TQWidget* tqparent ); KPushButton* createButton( KGuiItem item, TQWidget* parent );
class KRenameImpl : public TQObject, public KRenameDCOP { class KRenameImpl : public TQObject, public KRenameDCOP {
Q_OBJECT Q_OBJECT
@ -195,7 +195,7 @@ class KRenameImpl : public TQObject, public KRenameDCOP {
void getHelpDialogString( TQLineEdit* edit ); void getHelpDialogString( TQLineEdit* edit );
protected: protected:
TQWidget* tqparent; TQWidget* parent;
KMenuBar* menuBar; KMenuBar* menuBar;
KPopupMenu* mnuSort; KPopupMenu* mnuSort;
KAction* loadPlugins; KAction* loadPlugins;

@ -24,8 +24,8 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
MyInputDialog::MyInputDialog( TQString filename, bool revertEnabled, TQWidget* tqparent ) MyInputDialog::MyInputDialog( TQString filename, bool revertEnabled, TQWidget* parent )
: TQDialog( tqparent, 0, true, 0 ) : TQDialog( parent, 0, true, 0 )
{ {
// I do not think this has to be translated // I do not think this has to be translated
setCaption( "KRename" ); setCaption( "KRename" );

@ -32,7 +32,7 @@ class MyInputDialog : public TQDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
MyInputDialog( TQString filename, bool revertEnabled = true, TQWidget* tqparent = 0 ); MyInputDialog( TQString filename, bool revertEnabled = true, TQWidget* parent = 0 );
~MyInputDialog(); ~MyInputDialog();
TQString filename() const; TQString filename() const;

@ -36,9 +36,9 @@ void KMyIntSpinBox::keyPressEvent( TQKeyEvent* e )
emit returnPressed(); emit returnPressed();
} }
NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *tqparent ) NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
: KDialogBase( KDialogBase::Plain, "KRename", : KDialogBase( KDialogBase::Plain, "KRename",
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent, 0, true, true ) KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, 0, true, true )
{ {
TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );

@ -30,8 +30,8 @@ class KMyIntSpinBox : public KIntSpinBox
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KMyIntSpinBox( TQWidget* tqparent ) KMyIntSpinBox( TQWidget* parent )
: KIntSpinBox( tqparent ) : KIntSpinBox( parent )
{ }; { };
~KMyIntSpinBox() { }; ~KMyIntSpinBox() { };
private: private:
@ -48,7 +48,7 @@ class NumberDialog : public KDialogBase {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
NumberDialog(TQValueList<int> & n,TQWidget *tqparent=0); NumberDialog(TQValueList<int> & n,TQWidget *parent=0);
~NumberDialog(); ~NumberDialog();
// TODO: bad object oriented design!!! // TODO: bad object oriented design!!!

@ -268,7 +268,7 @@ int MyPermPlugin::getPermissions()
{S_IROTH, S_IWOTH, S_IXOTH, S_ISVTX} {S_IROTH, S_IWOTH, S_IXOTH, S_ISVTX}
}; };
int permissions = 0, tqmask = 0; int permissions = 0, mask = 0;
for (int row = 0;row < 3; ++row) for (int row = 0;row < 3; ++row)
for (int col = 0; col < 4; ++col) for (int col = 0; col < 4; ++col)
@ -279,7 +279,7 @@ int MyPermPlugin::getPermissions()
permissions |= fperm[row][col]; permissions |= fperm[row][col];
//fall through //fall through
case TQCheckBox::Off: case TQCheckBox::Off:
tqmask |= fperm[row][col]; mask |= fperm[row][col];
break; break;
default: default:
break; break;

@ -391,9 +391,9 @@ void ProfileManager::loadProfile( const TQString & name, KRenameImpl* krename )
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *tqparent, const char *name) ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name)
: KDialogBase( KDialogBase::Plain, i18n("Profiles"), : KDialogBase( KDialogBase::Plain, i18n("Profiles"),
KDialogBase::Close, KDialogBase::Close, tqparent, name, true, true ), ProfileManager( krename ) KDialogBase::Close, KDialogBase::Close, parent, name, true, true ), ProfileManager( krename )
{ {
int i; int i;
@ -525,9 +525,9 @@ void ProfileDlg::slotLoadProfile()
void ProfileDlg::slotCreateProfile() void ProfileDlg::slotCreateProfile()
{ {
bool ok = false; bool ok = false;
const char* tqmask = "xXXXXXXXXXXXXXXXXXXX"; // allows for 20 characters const char* mask = "xXXXXXXXXXXXXXXXXXXX"; // allows for 20 characters
TQString name = KInputDialog::getText( i18n("Profile Name"), i18n("Please enter a name for the new profile:"), TQString name = KInputDialog::getText( i18n("Profile Name"), i18n("Please enter a name for the new profile:"),
"KRename", &ok, this, 0, 0, tqmask ); "KRename", &ok, this, 0, 0, mask );
if( !ok ) if( !ok )
return; return;

@ -57,7 +57,7 @@ class ProfileDlg : public KDialogBase, public ProfileManager
TQ_OBJECT TQ_OBJECT
public: public:
ProfileDlg(KRenameImpl* krename, TQWidget *tqparent = 0, const char *name = 0); ProfileDlg(KRenameImpl* krename, TQWidget *parent = 0, const char *name = 0);
~ProfileDlg(); ~ProfileDlg();
private slots: private slots:

@ -35,9 +35,9 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
ReplaceDialog::ReplaceDialog( TQValueList<replacestrings> & r, TQWidget* tqparent ) ReplaceDialog::ReplaceDialog( TQValueList<replacestrings> & r, TQWidget* parent )
: KDialogBase( KDialogBase::Plain, i18n( "Find and Replace" ), : KDialogBase( KDialogBase::Plain, i18n( "Find and Replace" ),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent, 0, true, true ) KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, 0, true, true )
{ {
ReplaceDialogLayout = new TQGridLayout( plainPage(), 11, 6); ReplaceDialogLayout = new TQGridLayout( plainPage(), 11, 6);

@ -39,7 +39,7 @@ class ReplaceDialog : public KDialogBase
TQ_OBJECT TQ_OBJECT
public: public:
ReplaceDialog( TQValueList<replacestrings> & r, TQWidget* tqparent = 0 ); ReplaceDialog( TQValueList<replacestrings> & r, TQWidget* parent = 0 );
~ReplaceDialog(); ~ReplaceDialog();
TQValueList<replacestrings> getList(); TQValueList<replacestrings> getList();

@ -33,8 +33,8 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>
tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *tqparent, const char *name ) tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
: TQDialog(tqparent,name) : TQDialog(parent,name)
{ {
setIcon( BarIcon( "krename" ) ); setIcon( BarIcon( "krename" ) );

@ -32,7 +32,7 @@ class tabs : public TQDialog {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
tabs(KRenameImpl* impl, TQRect r, TQWidget *tqparent=0, const char *name=0); tabs(KRenameImpl* impl, TQRect r, TQWidget *parent=0, const char *name=0);
~tabs(); ~tabs();
inline KRenameImpl* getKRename() { return krename; } inline KRenameImpl* getKRename() { return krename; }

@ -29,9 +29,9 @@
#include <ktextbrowser.h> #include <ktextbrowser.h>
#include <kurlrequester.h> #include <kurlrequester.h>
UndoDialog::UndoDialog( TQWidget* tqparent ) UndoDialog::UndoDialog( TQWidget* parent )
: KDialogBase( KDialogBase::Plain, i18n("Undo Renaming"), : KDialogBase( KDialogBase::Plain, i18n("Undo Renaming"),
KDialogBase::User1 | KDialogBase::Close, KDialogBase::User1, tqparent, 0, false, true ) KDialogBase::User1 | KDialogBase::Close, KDialogBase::User1, parent, 0, false, true )
{ {
UndoDialogLayout = new TQVBoxLayout( plainPage(), 11, 6, "UndoDialogLayout"); UndoDialogLayout = new TQVBoxLayout( plainPage(), 11, 6, "UndoDialogLayout");

@ -33,7 +33,7 @@ class UndoDialog : public KDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
UndoDialog( TQWidget* tqparent = 0 ); UndoDialog( TQWidget* parent = 0 );
~UndoDialog(); ~UndoDialog();
void setUndoScript( const TQString & filename ); void setUndoScript( const TQString & filename );

@ -34,8 +34,8 @@
#include <tqsizepolicy.h> #include <tqsizepolicy.h>
#include <tqvbox.h> #include <tqvbox.h>
wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* tqparent, const char* name ) wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* parent, const char* name )
: KWizard( tqparent, name ) : KWizard( parent, name )
{ {
setIcon( BarIcon( "krename" ) ); setIcon( BarIcon( "krename" ) );
menuBar = new KMenuBar(this); menuBar = new KMenuBar(this);

@ -35,7 +35,7 @@ class wizard : public KWizard
TQ_OBJECT TQ_OBJECT
public: public:
wizard( KRenameImpl* impl, TQRect r, TQWidget* tqparent = 0, const char* name = 0 ); wizard( KRenameImpl* impl, TQRect r, TQWidget* parent = 0, const char* name = 0 );
~wizard(); ~wizard();
inline KRenameImpl* getKRename() { return krename; } inline KRenameImpl* getKRename() { return krename; }

Loading…
Cancel
Save