Browse Source

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
tags/v3.5.13
tpearson 8 years ago
parent
commit
267cf798d9

+ 2
- 2
krename/ProgressDialog.cpp View File

@@ -44,8 +44,8 @@
// update user interface every 1/2 second
#define TIMER_INTERVAL 500

ProgressDialog::ProgressDialog( TQWidget* tqparent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl )
ProgressDialog::ProgressDialog( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( parent, name, fl )
{
renamedFiles = NULL;


+ 1
- 1
krename/ProgressDialog.h View File

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

void setProgressTotalSteps( int t );

+ 2
- 2
krename/confdialog.cpp View File

@@ -29,9 +29,9 @@
#include <kiconloader.h>
#include <klocale.h>

ConfDialog::ConfDialog( TQWidget* tqparent, const char* name )
ConfDialog::ConfDialog( TQWidget* parent, const char* name )
: 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()
{
setupTab1();

+ 1
- 1
krename/confdialog.h View File

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

inline bool loadplugins() const { return checkPlugins->isChecked(); }

+ 6
- 6
krename/coorddialog.cpp View File

@@ -28,8 +28,8 @@
#include <kapplication.h>
#include <klocale.h>

DSLineEdit::DSLineEdit( TQWidget* tqparent, const char* name )
: KLineEdit( tqparent, name )
DSLineEdit::DSLineEdit( TQWidget* parent, const char* name )
: KLineEdit( parent, name )
{
}

@@ -51,14 +51,14 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char *
: KDialogBase( KDialogBase::Plain, "KRename",
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, _parent, name, true, true ), m_file( file )
{
TQFrame* tqparent = plainPage();
TQVBoxLayout* tqlayout = new TQVBoxLayout( tqparent );
TQFrame* parent = plainPage();
TQVBoxLayout* tqlayout = new TQVBoxLayout( parent );

filename = new DSLineEdit( tqparent );
filename = new DSLineEdit( parent );
filename->setText( file );
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->setChecked( m_inversion );

+ 1
- 1
krename/coorddialog.h View File

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

signals:
void changed();

+ 2
- 2
krename/dsdirselectdialog.cpp View File

@@ -30,8 +30,8 @@
#include <klocale.h>
#include <kurlcombobox.h>

DSDirSelectDialog::DSDirSelectDialog( TQWidget* tqparent )
: KFileDialog( ":KRename", "*", tqparent, 0, false )
DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent )
: KFileDialog( ":KRename", "*", parent, 0, false )
{
setOperationMode( KFileDialog::Opening );
setMode( KFile::Files | KFile::ExistingOnly );

+ 1
- 1
krename/dsdirselectdialog.h View File

@@ -30,7 +30,7 @@ class DSDirSelectDialog : public KFileDialog {
TQ_OBJECT

public:
DSDirSelectDialog( TQWidget* tqparent );
DSDirSelectDialog( TQWidget* parent );

bool recursively() const;
bool hidden() const;

+ 2
- 2
krename/firststartdlg.cpp View File

@@ -17,9 +17,9 @@

#include "firststartdlg.h"

FirstStartDlg::FirstStartDlg(TQWidget *tqparent, const char *name )
FirstStartDlg::FirstStartDlg(TQWidget *parent, const char *name )
: KDialogBase( KDialogBase::Plain, "KRename",
KDialogBase::Ok, KDialogBase::Ok, tqparent, name, true, true ),
KDialogBase::Ok, KDialogBase::Ok, parent, name, true, true ),
GUIModeSelector()
{
setCaption( guiModeCaption() );

+ 1
- 1
krename/firststartdlg.h View File

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


+ 2
- 2
krename/helpdialog.cpp View File

@@ -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 )
: TQDialog( tqparent, name, modal, fl )
: TQDialog( parent, name, modal, fl )
{
text = NULL;


+ 1
- 1
krename/helpdialog.h View File

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


+ 2
- 2
krename/kmyhistorycombo.cpp View File

@@ -36,8 +36,8 @@
#define KRENAME_NUMBER 5003
#define KRENAME_DATE 5004

KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* tqparent, const char* name)
: KHistoryCombo(tqparent, name)
KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char* name)
: KHistoryCombo(parent, name)
{
TQStringList history;
TQStringList completion;

+ 1
- 1
krename/kmyhistorycombo.h View File

@@ -34,7 +34,7 @@ class KMyHistoryCombo : public KHistoryCombo {
*
* \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();

/**

+ 2
- 2
krename/kmylistbox.cpp View File

@@ -43,8 +43,8 @@

using namespace KIO;

KMyListBox::KMyListBox(TQWidget* tqparent, const char* name, WFlags fl)
:KListBox(tqparent, name, fl)
KMyListBox::KMyListBox(TQWidget* parent, const char* name, WFlags fl)
:KListBox(parent, name, fl)
{
m_running_lister_counter = 0;


+ 1
- 1
krename/kmylistbox.h View File

@@ -41,7 +41,7 @@ class KMyListBox : public KListBox {
public:
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();

void removeItem( int index );

+ 18
- 18
krename/kmylistview.cpp View File

@@ -24,8 +24,8 @@
#include <kpopupmenu.h>
#include <krun.h>

KMyListView::KMyListView( TQValueList<manualchanges>* _changes, KMyListBox* _list, TQWidget* tqparent, const char* name )
:KListView(tqparent, name )
KMyListView::KMyListView( TQValueList<manualchanges>* _changes, KMyListBox* _list, TQWidget* parent, const char* name )
:KListView(parent, name )
{
changes = _changes;
list = _list;
@@ -114,50 +114,50 @@ void KMyListView::openCurrent()

/////////////////////////////////////////////////////////////

KMyListViewItem::KMyListViewItem(TQListView *tqparent)
: KListViewItem(tqparent)
KMyListViewItem::KMyListViewItem(TQListView *parent)
: KListViewItem(parent)
{ }

KMyListViewItem::KMyListViewItem(TQListViewItem *tqparent)
: KListViewItem(tqparent)
KMyListViewItem::KMyListViewItem(TQListViewItem *parent)
: KListViewItem(parent)
{ }

KMyListViewItem::KMyListViewItem(TQListView *tqparent, TQListViewItem *after)
: KListViewItem(tqparent, after)
KMyListViewItem::KMyListViewItem(TQListView *parent, TQListViewItem *after)
: KListViewItem(parent, after)
{ }

KMyListViewItem::KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after)
: KListViewItem(tqparent, after)
KMyListViewItem::KMyListViewItem(TQListViewItem *parent, TQListViewItem *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 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;
}

KMyListViewItem::KMyListViewItem(bool m, TQListViewItem *tqparent,
KMyListViewItem::KMyListViewItem(bool m, TQListViewItem *parent,
TQString label1, TQString label2, TQString label3, TQString label4,
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;
}

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 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;
}

KMyListViewItem::KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after,
KMyListViewItem::KMyListViewItem(TQListViewItem *parent, TQListViewItem *after,
TQString label1, TQString label2, TQString label3, TQString label4,
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()

+ 9
- 9
krename/kmylistview.h View File

@@ -28,7 +28,7 @@ class KMyListView : public KListView {
Q_OBJECT
TQ_OBJECT
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();

signals:
@@ -54,30 +54,30 @@ class TQColor;
class TQString;
class KMyListViewItem : public KListViewItem {
public:
KMyListViewItem(TQListView *tqparent);
KMyListViewItem(TQListViewItem *tqparent);
KMyListViewItem(TQListView *tqparent, TQListViewItem *after);
KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after);
KMyListViewItem(TQListView *parent);
KMyListViewItem(TQListViewItem *parent);
KMyListViewItem(TQListView *parent, 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());

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());

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());

KMyListViewItem(TQListViewItem *tqparent, TQListViewItem *after,
KMyListViewItem(TQListViewItem *parent, TQListViewItem *after,
TQString, TQString = TQString(),
TQString = TQString(), TQString = TQString(),
TQString = TQString(), TQString = TQString(),

+ 1
- 1
krename/krecursivelister.cpp View File

@@ -19,7 +19,7 @@

#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;
filelist.clear();
dirlist.clear();

+ 1
- 1
krename/krecursivelister.h View File

@@ -37,7 +37,7 @@ class KRecursiveLister : public TQObject {
TQ_OBJECT

public:
KRecursiveLister(TQObject *tqparent=0, const char *name=0);
KRecursiveLister(TQObject *parent=0, const char *name=0);
~KRecursiveLister();

/** Returns the list of fileitems found. */

+ 58
- 58
krename/krenameimpl.cpp View File

@@ -83,21 +83,21 @@ TQString pageTitle[] = {
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 )
: DCOPObject( "KRename" ), TQObject( (TQObject*)p ),
tqparent( p ), menuBar( m ), finishButton( finish )
parent( p ), menuBar( m ), finishButton( finish )
{
m_hasCommandlineProfile = false;

// Load Plugins
plugin = PluginLoader::instance();
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 );

m_switching = false;
@@ -115,7 +115,7 @@ int KRenameImpl::numRealTimePreview = -1;

void KRenameImpl::setup( bool wizardmode )
{
tqparent->setCaption( "KRename" ); // "KRename by Dominik Seichter
parent->setCaption( "KRename" ); // "KRename by Dominik Seichter
setupActions();
setupPages();
updateCount();
@@ -295,9 +295,9 @@ void KRenameImpl::setupActions()
{
KActionCollection* actionCollection = new KActionCollection( this );

KPopupMenu* mnuExtra = new KPopupMenu( tqparent );
KPopupMenu* mnuSettings = new KPopupMenu( tqparent );
KHelpMenu* mnuHelp = new KHelpMenu( tqparent );
KPopupMenu* mnuExtra = new KPopupMenu( parent );
KPopupMenu* mnuSettings = new KPopupMenu( parent );
KHelpMenu* mnuHelp = new KHelpMenu( parent );

menuBar->insertItem( i18n("E&xtras"), mnuExtra );
mnuExtra->insertItem( i18n("&Profiles..."), this, TQT_SLOT( manageProfiles() ) );
@@ -332,7 +332,7 @@ void KRenameImpl::setupPages()

void KRenameImpl::setupPage1()
{
page_1 = new TQWidget( tqparent );
page_1 = new TQWidget( parent );

pageLayout = new TQHBoxLayout( page_1, 11, 6 );
Layout3 = new TQVBoxLayout( 0, 0, 6 );
@@ -414,7 +414,7 @@ void KRenameImpl::setupPage1()

void KRenameImpl::setupPage2()
{
page_2 = new TQWidget( tqparent );
page_2 = new TQWidget( parent );

pageLayout_2 = new TQVBoxLayout( page_2, 6, 6 );

@@ -481,7 +481,7 @@ void KRenameImpl::setupPage2()

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->setTreeListAutoResize( true );

@@ -492,7 +492,7 @@ void KRenameImpl::setupPage3()

void KRenameImpl::setupPage4()
{
page_4 = new TQWidget( tqparent );
page_4 = new TQWidget( parent );
pageLayout_4 = new TQVBoxLayout( page_4, 11, 6 );

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("y characters of old filename starting at x") );
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") );
helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("krename"), true );

@@ -875,7 +875,7 @@ void KRenameImpl::setupTab1()
* Draw plugin user interfaces
*/

TQFrame* tqparent;
TQFrame* parent;
TQVBoxLayout* Layout;
TQVBoxLayout* gLayout;
TQGroupBox* g;
@@ -892,13 +892,13 @@ void KRenameImpl::setupTab1()
while ( it.current() ) {
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");
g = new TQGroupBox( tqparent );
Layout = new TQVBoxLayout( parent, 11, 6, "Layout");
g = new TQGroupBox( parent );
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)->plugin, TQT_SIGNAL( previewChanged( Plugin* ) ), this, TQT_SLOT( updatePluginPreview( Plugin* ) ) );
Layout->addWidget( (*it)->check );
@@ -919,7 +919,7 @@ void KRenameImpl::addFile()
{
bool auto_up = false;
DSDirSelectDialog* dsd = new DSDirSelectDialog( tqparent );
DSDirSelectDialog* dsd = new DSDirSelectDialog( parent );
if( dsd->exec() == TQDialog::Accepted ) {
KURL::List slist = dsd->selectedURLs();
KURL::List::Iterator it = slist.begin();
@@ -1022,12 +1022,12 @@ void KRenameImpl::start()
if( setupBatchRenamer( b, false ) )
{
p->show();
tqparent->hide();
parent->hide();
b->processFiles( p, this );
}

// Memory leak!!! : ??
//delete tqparent;
//delete parent;
}

void KRenameImpl::enableControls()
@@ -1046,16 +1046,16 @@ void KRenameImpl::enableControls()
bool KRenameImpl::checkErrors()
{
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;
}
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 );
return false;
}
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 );
return false;
}
@@ -1164,7 +1164,7 @@ bool KRenameImpl::setupBatchRenamer( BatchRenamer* b, bool preview )
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 ) );
if( m == KMessageBox::Cancel )
return false;
@@ -1278,12 +1278,12 @@ void KRenameImpl::loadConfig()
CoordDialog::m_inversion = config->readBoolEntry("Inverse", false);
m_wizard = config->readBoolEntry( "GUIWizardMode", true );

int width = config->readNumEntry( "Width", tqparent->width() );
int height = config->readNumEntry( "Height", tqparent->height() );
int width = config->readNumEntry( "Width", parent->width() );
int height = config->readNumEntry( "Height", parent->height() );
if( config->readBoolEntry("Maximized", false ) ) {
tqparent->showMaximized();
parent->showMaximized();
} else {
tqparent->resize( width, height );
parent->resize( width, height );
}
refreshColumnMode();
@@ -1305,7 +1305,7 @@ void KRenameImpl::loadConfig()
checkName->setEnabled( false );
}

//tqparent->show();
//parent->show();
page_1->setEnabled( false );
KApplication::setOverrideCursor( TQt::WaitCursor );
plugin->loadPlugins( m_loadplugins );
@@ -1329,11 +1329,11 @@ void KRenameImpl::saveConfig()
config->writeEntry("firststart", false );
config->writeEntry("ImagePreview", checkPreview->isChecked() );
config->writeEntry("StartIndex", m_index );
config->writeEntry("Maximized", tqparent->isMaximized() );
config->writeEntry("Width", tqparent->width() );
config->writeEntry("Height", tqparent->height() );
config->writeEntry("XPos", tqparent->x() );
config->writeEntry("YPos", tqparent->y() );
config->writeEntry("Maximized", parent->isMaximized() );
config->writeEntry("Width", parent->width() );
config->writeEntry("Height", parent->height() );
config->writeEntry("XPos", parent->x() );
config->writeEntry("YPos", parent->y() );
config->writeEntry("LoadFilePlugins", m_loadplugins );
config->writeEntry("ColumnAutosize", m_autosize );
config->writeEntry("Name", checkName->isChecked() );
@@ -1349,7 +1349,7 @@ void KRenameImpl::saveConfig()

void KRenameImpl::replace()
{
ReplaceDialog* r = new ReplaceDialog( rep, tqparent );
ReplaceDialog* r = new ReplaceDialog( rep, parent );
if( r->exec() == TQDialog::Accepted )
{
rep = r->getList();
@@ -1377,7 +1377,7 @@ void KRenameImpl::toggleName()

void KRenameImpl::preferences()
{
ConfDialog* cd = new ConfDialog( tqparent, "cd" );
ConfDialog* cd = new ConfDialog( parent, "cd" );
cd->setLoadPlugins( m_loadplugins );
cd->setThumbSize( fileList->getPreviewSize() );
cd->setAutosize( m_autosize );
@@ -1414,21 +1414,21 @@ void KRenameImpl::changeGUIMode()
/* GUI Mode was changed by the user */
saveConfig();

int x = tqparent->x();
int y = tqparent->y();
int w = tqparent->width();
int h = tqparent->height();
int x = parent->x();
int y = parent->y();
int w = parent->width();
int h = parent->height();

TQWidget* oldtqparent = tqparent;
TQWidget* oldparent = parent;
TQWidget* krename = KRenameImpl::launch( TQRect( x, y, w, h ), TQStringList(), this, false );
m_switching = true;
oldtqparent->removeChild( this );
oldtqparent->hide();
oldparent->removeChild( this );
oldparent->hide();
krename->insertChild( this );
krename->show();

oldtqparent->close();
oldparent->close();
m_switching = false;
}

@@ -1460,7 +1460,7 @@ void KRenameImpl::moveDown()

void KRenameImpl::undo()
{
UndoDialog* u = new UndoDialog( tqparent );
UndoDialog* u = new UndoDialog( parent );
u->exec();
delete u;
}
@@ -1519,7 +1519,7 @@ void KRenameImpl::getCoordinates()
TQFileInfo fi( name );
TQString extension;
splitFilename( &fi, &name, &extension );
CoordDialog* cd = new CoordDialog( name, tqparent );
CoordDialog* cd = new CoordDialog( name, parent );
if( cd->exec() == TQDialog::Accepted ) {
TQString t = filename->text();

@@ -1588,7 +1588,7 @@ void KRenameImpl::updateHist()

void KRenameImpl::changeNumbers()
{
NumberDialog* nd = new NumberDialog( skip, tqparent );
NumberDialog* nd = new NumberDialog( skip, parent );
nd->spinIndex->setValue( m_index );
nd->spinStep->setValue( m_step );
nd->checkResetCounter->setChecked( m_reset );
@@ -1606,7 +1606,7 @@ void KRenameImpl::changeNumbers()

void KRenameImpl::about()
{
KAboutApplication * d = new KAboutApplication( kapp->aboutData(), tqparent );
KAboutApplication * d = new KAboutApplication( kapp->aboutData(), parent );
d->show();
}

@@ -1633,23 +1633,23 @@ void KRenameImpl::setWizardMode( bool mode )

void KRenameImpl::changeParent( TQWidget* p, KMenuBar* m, TQPushButton* finish, TQRect r )
{
tqparent = p;
parent = p;
menuBar = m;
finishButton = finish;

connect( finishButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( start() ));

if( !r.isNull() ) {
tqparent->resize( r.size() );
tqparent->move( r.x(), r.y() );
parent->resize( r.size() );
parent->move( r.x(), r.y() );
}
setupActions();

page_1->reparent( tqparent, TQPoint( 0, 0 ) );
page_2->reparent( tqparent, TQPoint( 0, 0 ) );
page_3->reparent( tqparent, TQPoint( 0, 0 ) );
page_4->reparent( tqparent, TQPoint( 0, 0 ) );
page_1->reparent( parent, TQPoint( 0, 0 ) );
page_2->reparent( parent, TQPoint( 0, 0 ) );
page_3->reparent( parent, TQPoint( 0, 0 ) );
page_4->reparent( parent, TQPoint( 0, 0 ) );

emit pageDone( page_1, i18n( pageTitle[0] ) );
emit pageDone( page_2, i18n( pageTitle[1] ) );
@@ -1802,13 +1802,13 @@ void KRenameImpl::reloadFilePluginData()

void KRenameImpl::manageProfiles()
{
ProfileDlg dlg( this, tqparent, "dlg" );
ProfileDlg dlg( this, parent, "dlg" );
dlg.exec();
}

void KRenameImpl::getHelpDialogString( TQLineEdit* edit )
{
HelpDialog hdlg( helpDialogData, tqparent, "hdlg", true );
HelpDialog hdlg( helpDialogData, parent, "hdlg", true );
hdlg.setLineEdit( edit );
hdlg.updateHeadline();
hdlg.updateItems();

+ 2
- 2
krename/krenameimpl.h View File

@@ -59,7 +59,7 @@ class TQVGroupBox;
class TQWidget;

#include <kguiitem.h>
KPushButton* createButton( KGuiItem item, TQWidget* tqparent );
KPushButton* createButton( KGuiItem item, TQWidget* parent );

class KRenameImpl : public TQObject, public KRenameDCOP {
Q_OBJECT
@@ -195,7 +195,7 @@ class KRenameImpl : public TQObject, public KRenameDCOP {
void getHelpDialogString( TQLineEdit* edit );
protected:
TQWidget* tqparent;
TQWidget* parent;
KMenuBar* menuBar;
KPopupMenu* mnuSort;
KAction* loadPlugins;

+ 2
- 2
krename/myinputdialog.cpp View File

@@ -24,8 +24,8 @@
#include <tqlayout.h>
#include <tqtooltip.h>

MyInputDialog::MyInputDialog( TQString filename, bool revertEnabled, TQWidget* tqparent )
: TQDialog( tqparent, 0, true, 0 )
MyInputDialog::MyInputDialog( TQString filename, bool revertEnabled, TQWidget* parent )
: TQDialog( parent, 0, true, 0 )
{
// I do not think this has to be translated
setCaption( "KRename" );

+ 1
- 1
krename/myinputdialog.h View File

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

TQString filename() const;

+ 2
- 2
krename/numberdialog.cpp View File

@@ -36,9 +36,9 @@ void KMyIntSpinBox::keyPressEvent( TQKeyEvent* e )
emit returnPressed();
}

NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *tqparent )
NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
: 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 );


+ 3
- 3
krename/numberdialog.h View File

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

// TODO: bad object oriented design!!!

+ 2
- 2
krename/permission.cpp View File

@@ -268,7 +268,7 @@ int MyPermPlugin::getPermissions()
{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 col = 0; col < 4; ++col)
@@ -279,7 +279,7 @@ int MyPermPlugin::getPermissions()
permissions |= fperm[row][col];
//fall through
case TQCheckBox::Off:
tqmask |= fperm[row][col];
mask |= fperm[row][col];
break;
default:
break;

+ 4
- 4
krename/profiledlg.cpp View File

@@ -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::Close, KDialogBase::Close, tqparent, name, true, true ), ProfileManager( krename )
KDialogBase::Close, KDialogBase::Close, parent, name, true, true ), ProfileManager( krename )
{
int i;

@@ -525,9 +525,9 @@ void ProfileDlg::slotLoadProfile()
void ProfileDlg::slotCreateProfile()
{
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:"),
"KRename", &ok, this, 0, 0, tqmask );
"KRename", &ok, this, 0, 0, mask );
if( !ok )
return;

+ 1
- 1
krename/profiledlg.h View File

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

private slots:

+ 2
- 2
krename/replacedialog.cpp View File

@@ -35,9 +35,9 @@
#include <kpushbutton.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::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);


+ 1
- 1
krename/replacedialog.h View File

@@ -39,7 +39,7 @@ class ReplaceDialog : public KDialogBase
TQ_OBJECT

public:
ReplaceDialog( TQValueList<replacestrings> & r, TQWidget* tqparent = 0 );
ReplaceDialog( TQValueList<replacestrings> & r, TQWidget* parent = 0 );
~ReplaceDialog();

TQValueList<replacestrings> getList();

+ 2
- 2
krename/tabs.cpp View File

@@ -33,8 +33,8 @@
#include <kpushbutton.h>
#include <kstartupinfo.h>

tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *tqparent, const char *name )
: TQDialog(tqparent,name)
tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
: TQDialog(parent,name)
{
setIcon( BarIcon( "krename" ) );


+ 1
- 1
krename/tabs.h View File

@@ -32,7 +32,7 @@ class tabs : public TQDialog {
Q_OBJECT
TQ_OBJECT
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();

inline KRenameImpl* getKRename() { return krename; }

+ 2
- 2
krename/undodialog.cpp View File

@@ -29,9 +29,9 @@
#include <ktextbrowser.h>
#include <kurlrequester.h>

UndoDialog::UndoDialog( TQWidget* tqparent )
UndoDialog::UndoDialog( TQWidget* parent )
: 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");


+ 1
- 1
krename/undodialog.h View File

@@ -33,7 +33,7 @@ class UndoDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
UndoDialog( TQWidget* tqparent = 0 );
UndoDialog( TQWidget* parent = 0 );
~UndoDialog();

void setUndoScript( const TQString & filename );

+ 2
- 2
krename/wizard.cpp View File

@@ -34,8 +34,8 @@
#include <tqsizepolicy.h>
#include <tqvbox.h>

wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* tqparent, const char* name )
: KWizard( tqparent, name )
wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* parent, const char* name )
: KWizard( parent, name )
{
setIcon( BarIcon( "krename" ) );
menuBar = new KMenuBar(this);

+ 1
- 1
krename/wizard.h View File

@@ -35,7 +35,7 @@ class wizard : public KWizard
TQ_OBJECT

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();

inline KRenameImpl* getKRename() { return krename; }

Loading…
Cancel
Save