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

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 4a25ca5c80
commit 93910780ef
184 changed files with 673 additions and 673 deletions
Show Stats Download Patch File Download Diff File

2
kcron/ktapp.cpp
Unescape Escape View File

@ -208,7 +208,7 @@ bool KTApp::queryClose()
{
if(cthost->dirty())
{
KTApp* win = (KTApp*)tqparent();
KTApp* win = (KTApp*)parent();
int retVal = KMessageBox::warningYesNoCancel(win,
i18n("Scheduled tasks have been modified.\nDo you want to save changes?"),

12
kcron/ktlistcron.cpp
Unescape Escape View File

@ -19,22 +19,22 @@
#include "kticon.h"
#include "ktprint.h"
KTListCron::KTListCron(KTListItem* tqparent, const char* name,
KTListCron::KTListCron(KTListItem* parent, const char* name,
CTCron* _ctcron) :
KTListItem(tqparent, name, _ctcron)
KTListItem(parent, name, _ctcron)
{
refresh();
}
KTListCron::KTListCron(TQListView* tqparent, const char* name,
KTListCron::KTListCron(TQListView* parent, const char* name,
CTCron* _ctcron) :
KTListItem(tqparent, name, _ctcron)
KTListItem(parent, name, _ctcron)
{
refresh();
}
KTListCron::KTListCron(TQListView* tqparent, CTCron* _ctcron) :
KTListItem(tqparent, (const char*)0, _ctcron)
KTListCron::KTListCron(TQListView* parent, CTCron* _ctcron) :
KTListItem(parent, (const char*)0, _ctcron)
{
refresh();
}

6
kcron/ktlistcron.h
Unescape Escape View File

@ -28,17 +28,17 @@ public:
/**
* Construct tasks or variables folder from branch.
*/
KTListCron(KTListItem* tqparent, const char* name, CTCron* _ctcron);
KTListCron(KTListItem* parent, const char* name, CTCron* _ctcron);
/**
* Construct tasks or variables folder from root.
*/
KTListCron(TQListView* tqparent, const char* name, CTCron* _ctcron);
KTListCron(TQListView* parent, const char* name, CTCron* _ctcron);
/**
* Construct user folder from root.
*/
KTListCron(TQListView* tqparent, CTCron* _ctcron);
KTListCron(TQListView* parent, CTCron* _ctcron);
/**
* Refresh.

8
kcron/ktlistitem.cpp
Unescape Escape View File

@ -14,14 +14,14 @@
#include "ctcron.h"
KTListItem::KTListItem(KTListItem* tqparent, const char* name, CTCron* _ctcron) :
TQListViewItem(tqparent, name),
KTListItem::KTListItem(KTListItem* parent, const char* name, CTCron* _ctcron) :
TQListViewItem(parent, name),
ctcron(_ctcron)
{
}
KTListItem::KTListItem(TQListView* tqparent, const char* name, CTCron* _ctcron) :
TQListViewItem(tqparent, name),
KTListItem::KTListItem(TQListView* parent, const char* name, CTCron* _ctcron) :
TQListViewItem(parent, name),
ctcron(_ctcron)
{
}

4
kcron/ktlistitem.h
Unescape Escape View File

@ -32,12 +32,12 @@ public:
/**
* Construct a root list view item from a CTCron.
*/
KTListItem(KTListItem* tqparent, const char* name, CTCron* _ctcron);
KTListItem(KTListItem* parent, const char* name, CTCron* _ctcron);
/**
* Construct a non-root list view item from a CTCron.
*/
KTListItem(TQListView* tqparent, const char* name, CTCron* _ctcron);
KTListItem(TQListView* parent, const char* name, CTCron* _ctcron);
/**
* Destructor.

8
kcron/ktlisttask.cpp
Unescape Escape View File

@ -18,14 +18,14 @@
#include "kttask.h"
#include "ktprint.h"
KTListTask::KTListTask(KTListItem* tqparent,
KTListTask::KTListTask(KTListItem* parent,
CTCron* _ctcron, CTTask* _cttask) :
KTListItem(tqparent, 0, _ctcron),
KTListItem(parent, 0, _ctcron),
cttask(_cttask)
{
refresh();
tqparent->setOpen(true);
parent->setOpen(true);
}
void KTListTask::refresh()
@ -61,7 +61,7 @@ void KTListTask::edit()
{
KTTask(cttask,i18n("Modify Task")).exec();
refresh();
tqparent()->sortChildItems(1, true);
parent()->sortChildItems(1, true);
}
CTTask* KTListTask::getCTTask() const

2
kcron/ktlisttask.h
Unescape Escape View File

@ -30,7 +30,7 @@ public:
/**
* Initialize the list view item and task.
*/
KTListTask(KTListItem* tqparent, CTCron* _ctcron, CTTask* _cttask);
KTListTask(KTListItem* parent, CTCron* _ctcron, CTTask* _cttask);
/**
* Refresh from underlying task.

8
kcron/ktlisttasks.cpp
Unescape Escape View File

@ -24,14 +24,14 @@
#include "kttask.h"
#include "ktprint.h"
KTListTasks::KTListTasks(KTListItem* tqparent, CTCron* _ctcron) :
KTListItem(tqparent, 0, _ctcron)
KTListTasks::KTListTasks(KTListItem* parent, CTCron* _ctcron) :
KTListItem(parent, 0, _ctcron)
{
refresh();
}
KTListTasks::KTListTasks(TQListView* tqparent, CTCron* _ctcron) :
KTListItem(tqparent, 0, _ctcron)
KTListTasks::KTListTasks(TQListView* parent, CTCron* _ctcron) :
KTListItem(parent, 0, _ctcron)
{
refresh();
}

4
kcron/ktlisttasks.h
Unescape Escape View File

@ -30,12 +30,12 @@ public:
/**
* Construct tasks folder from branch.
*/
KTListTasks(KTListItem* tqparent, CTCron* _ctcron);
KTListTasks(KTListItem* parent, CTCron* _ctcron);
/**
* Construct tasks folder from root.
*/
KTListTasks(TQListView* tqparent, CTCron* _ctcron);
KTListTasks(TQListView* parent, CTCron* _ctcron);
/**
* Internationalized description.

8
kcron/ktlistvar.cpp
Unescape Escape View File

@ -19,13 +19,13 @@
#include "kticon.h"
#include "ktvariable.h"
KTListVar::KTListVar(KTListItem* tqparent, CTCron* _ctcron,
KTListVar::KTListVar(KTListItem* parent, CTCron* _ctcron,
CTVariable* _ctvariable) :
KTListItem(tqparent, 0, _ctcron),
KTListItem(parent, 0, _ctcron),
ctvar(_ctvariable)
{
refresh();
tqparent->setOpen(true);
parent->setOpen(true);
}
void KTListVar::refresh()
@ -71,7 +71,7 @@ void KTListVar::edit()
{
KTVariable(ctvar,i18n("Modify Variable")).exec();
refresh();
tqparent()->sortChildItems(1, true);
parent()->sortChildItems(1, true);
}
CTVariable* KTListVar::getCTVariable() const

2
kcron/ktlistvar.h
Unescape Escape View File

@ -30,7 +30,7 @@ public:
/**
* Initialize the list view item and environment variable.
*/
KTListVar(KTListItem* tqparent, CTCron* _ctcron, CTVariable* _ctvariable);
KTListVar(KTListItem* parent, CTCron* _ctcron, CTVariable* _ctvariable);
/**
* Refresh from underlying variable.

8
kcron/ktlistvars.cpp
Unescape Escape View File

@ -25,14 +25,14 @@
#include "ktvariable.h"
#include "ktprint.h"
KTListVars::KTListVars(KTListItem* tqparent, CTCron* _ctcron) :
KTListItem(tqparent, 0, _ctcron)
KTListVars::KTListVars(KTListItem* parent, CTCron* _ctcron) :
KTListItem(parent, 0, _ctcron)
{
refresh();
}
KTListVars::KTListVars(TQListView* tqparent, CTCron* _ctcron) :
KTListItem(tqparent, 0, _ctcron)
KTListVars::KTListVars(TQListView* parent, CTCron* _ctcron) :
KTListItem(parent, 0, _ctcron)
{
refresh();
}

4
kcron/ktlistvars.h
Unescape Escape View File

@ -31,12 +31,12 @@ public:
/**
* Construct variables folder from branch.
*/
KTListVars(KTListItem* tqparent, CTCron* _ctcron);
KTListVars(KTListItem* parent, CTCron* _ctcron);
/**
* Construct variables folder from root.
*/
KTListVars(TQListView* tqparent, CTCron* _ctcron);
KTListVars(TQListView* parent, CTCron* _ctcron);
/**
* Internationalized description.

6
kcron/kttask.cpp
Unescape Escape View File

@ -36,15 +36,15 @@
class KTPushButton : public TQPushButton
{
public:
KTPushButton(TQWidget * tqparent, const char * name = 0 )
: TQPushButton(tqparent, name), isSelected(false), isDirty(false)
KTPushButton(TQWidget * parent, const char * name = 0 )
: TQPushButton(parent, name), isSelected(false), isDirty(false)
{
updatePalette();
}
void updatePalette()
{
palNormal = ((TQWidget *)tqparent())->palette();
palNormal = ((TQWidget *)parent())->palette();
palSelected = palNormal;
for(int cg = (int) TQPalette::Disabled; cg < (int) TQPalette::NColorGroups; cg++)
{

24
kcron/ktview.cpp
Unescape Escape View File

@ -51,8 +51,8 @@
#include "kttask.h"
#include "ktprint.h"
KTView::KTView(TQWidget *tqparent, const char* name) :
TQWidget(tqparent, name),
KTView::KTView(TQWidget *parent, const char* name) :
TQWidget(parent, name),
listView(0),
currentCTCron(0),
currentIsTask(true),
@ -67,16 +67,16 @@ KTView::KTView(TQWidget *tqparent, const char* name) :
refresh();
listView->setSelected(listView->firstChild(), true);
connect(this, TQT_SIGNAL(enableModificationButtons(bool)), tqparent,
connect(this, TQT_SIGNAL(enableModificationButtons(bool)), parent,
TQT_SLOT(slotEnableModificationButtons(bool)));
connect(this, TQT_SIGNAL(enablePaste(bool)), tqparent,
connect(this, TQT_SIGNAL(enablePaste(bool)), parent,
TQT_SLOT(slotEnablePaste(bool)));
connect(this, TQT_SIGNAL(enableRunNow(bool)), tqparent,
connect(this, TQT_SIGNAL(enableRunNow(bool)), parent,
TQT_SLOT(slotEnableRunNow(bool)));
connect(this, TQT_SIGNAL(enableEnabled(bool)), tqparent,
connect(this, TQT_SIGNAL(enableEnabled(bool)), parent,
TQT_SLOT(slotEnableEnabled(bool)));
}
@ -216,7 +216,7 @@ void KTView::print () const
//Check that the correct item is selected, they must
//select the top level entry for all items to print
while (ktli->depth() != 0)
ktli = (KTListItem*)ktli->tqparent();
ktli = (KTListItem*)ktli->parent();
user = ktli; //Used to store user's name
@ -367,7 +367,7 @@ void KTView::create()
{
KTListItem* ktli = (KTListItem*)listView->currentItem();
if ((ktli->text(0) != KTListTasks::getDescription()) && (ktli->text(0) != KTListVars::getDescription())) {
ktli = (KTListItem*)ktli->tqparent();
ktli = (KTListItem*)ktli->parent();
}
Q_CHECK_PTR(ktli);
ktli->create();
@ -498,7 +498,7 @@ void KTView::slotEdit(TQListViewItem* /*qlvi*/)
void KTView::slotSetCurrent (TQListViewItem* qlvi)
{
TQListViewItem* tqparent = qlvi->tqparent();
TQListViewItem* parent = qlvi->parent();
if (qlvi->text(0) == KTListVars::getDescription())
{
@ -527,9 +527,9 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi)
emit(enableEnabled(false));
}
else if (tqparent)
else if (parent)
{
if (tqparent->text(0) == KTListVars::getDescription())
if (parent->text(0) == KTListVars::getDescription())
{
// variable
currentCTCron = ((KTListVar*)qlvi)->getCTCron();
@ -542,7 +542,7 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi)
emit(enableEnabled(currentCTVariable->enabled));
}
else if (tqparent->text(0) == KTListTasks::getDescription())
else if (parent->text(0) == KTListTasks::getDescription())
{
// task
currentCTCron = ((KTListTask*)qlvi)->getCTCron();

2
kcron/ktview.h
Unescape Escape View File

@ -41,7 +41,7 @@ public:
/**
* Initializes view.
*/
KTView (TQWidget* tqparent = 0, const char* name=0);
KTView (TQWidget* parent = 0, const char* name=0);
/**
* Destructor.

28
kdat/Archive.cpp
Unescape Escape View File

@ -289,40 +289,40 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con
//path.remove(path.first());
path.remove(path.begin());
TQPtrListIterator<File> i( getChildren() );
File* tqparent = 0;
File* parent = 0;
for ( ; i.current() ; ++i ) {
if ( i.current()->getName() == dir ) {
tqparent = i.current();
parent = i.current();
break;
}
}
if ( tqparent == 0 ) {
tqparent = new File( 0, 0, 0, startRecord, endRecord, dir );
addChild( tqparent );
if ( parent == 0 ) {
parent = new File( 0, 0, 0, startRecord, endRecord, dir );
addChild( parent );
}
for ( TQStringList::Iterator j = path.begin();
j != path.end();
++j ) {
TQString dir = *j;
File* ptqparent = tqparent;
TQPtrListIterator<File> i( ptqparent->getChildren() );
for ( tqparent = 0; i.current() ; ++i ) {
File* pparent = parent;
TQPtrListIterator<File> i( pparent->getChildren() );
for ( parent = 0; i.current() ; ++i ) {
if ( i.current()->getName() == dir ) {
tqparent = i.current();
parent = i.current();
break;
}
}
if ( tqparent == 0 ) {
tqparent = new File( ptqparent, 0, 0, 0, 0, dir );
ptqparent->addChild( tqparent );
if ( parent == 0 ) {
parent = new File( pparent, 0, 0, 0, 0, dir );
pparent->addChild( parent );
}
}
file = new File( tqparent, size, mtime, startRecord, endRecord, fn );
tqparent->addChild( file );
file = new File( parent, size, mtime, startRecord, endRecord, fn );
parent->addChild( file );
return file;
}

2
kdat/Archive.h
Unescape Escape View File

@ -159,7 +159,7 @@ public:
/**
* Create a new file entry, and add it to the archive. Based on the
* full path name of the file, an appropriate tqparent is found. The tqparent
* full path name of the file, an appropriate parent is found. The parent
* may be this archive or another file entry. File entries will be created
* on demand if some or all of the file's path does not yet exist in this
* archive.

4
kdat/ArchiveInfoWidget.cpp
Unescape Escape View File

@ -35,8 +35,8 @@
#include "ArchiveInfoWidget.moc"
ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name ),
ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name )
: TQWidget( parent, name ),
_archive( 0 )
{
TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), this );

2
kdat/ArchiveInfoWidget.h
Unescape Escape View File

@ -45,7 +45,7 @@ public:
/**
* Create a new archive info widget.
*/
ArchiveInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
ArchiveInfoWidget( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the archive info widget.

4
kdat/BackupDlg.cpp
Unescape Escape View File

@ -51,8 +51,8 @@
BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental,
const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape,
TQWidget* tqparent, const char* name )
: TQDialog( tqparent, name, TRUE ),
TQWidget* parent, const char* name )
: TQDialog( parent, name, TRUE ),
_proc( NULL ),
_tarParser( NULL ),
_archiveName( archiveName ),

4
kdat/BackupDlg.h
Unescape Escape View File

@ -93,12 +93,12 @@ public:
* @param removeSnapshot Remove the snapshot before backing up.
* @param archiveSize The estimate size of the archive in kilobytes.
* @param tape The tape index to add the archive to.
* @param tqparent The tqparent widget for this dialog.
* @param parent The parent widget for this dialog.
* @param name The name of this widget.
*/
BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental,
const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape,
TQWidget* tqparent = 0, const char* name = 0 );
TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the backup dialog.

4
kdat/BackupOptDlg.cpp
Unescape Escape View File

@ -30,8 +30,8 @@
#include "BackupOptDlg.moc"
BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* tqparent, const char* name )
: TQDialog( tqparent, name, TRUE )
BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, const char* name )
: TQDialog( parent, name, TRUE )
{
setIconText( i18n( "KDat: Backup Options" ) );
setCaption( i18n( "KDat: Backup Options" ) );

2
kdat/BackupOptDlg.h
Unescape Escape View File

@ -37,7 +37,7 @@ public:
*
* @param backupProfile The backup profile.
*/
BackupOptDlg( BackupProfile* backupProfile, TQWidget* tqparent=0, const char* name=0 );
BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent=0, const char* name=0 );
/**
* Destroy the backup options dialog.

4
kdat/BackupProfileInfoWidget.cpp
Unescape Escape View File

@ -36,8 +36,8 @@
#include "BackupProfileInfoWidget.moc"
BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name ),
BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char* name )
: TQWidget( parent, name ),
_backupProfile( 0 )
{
TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this );

2
kdat/BackupProfileInfoWidget.h
Unescape Escape View File

@ -45,7 +45,7 @@ public:
/**
* Create a new backup profile info widget.
*/
BackupProfileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
BackupProfileInfoWidget( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the backup profile widget.

4
kdat/BackupProfileWidget.cpp
Unescape Escape View File

@ -33,8 +33,8 @@
#include "BackupProfileWidget.moc"
BackupProfileWidget::BackupProfileWidget( TQWidget* tqparent, const char* name )
: KTabCtl( tqparent, name )
BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
: KTabCtl( parent, name )
{
TQWidget* one = new TQWidget( this );
addTab( one, i18n( "Backup" ) );

4
kdat/BackupProfileWidget.h
Unescape Escape View File

@ -57,10 +57,10 @@ public:
*
* @param archiveName The default name for the new archive.
* @param files The list of files to be archived.
* @param tqparent The tqparent widget of this dialog.
* @param parent The parent widget of this dialog.
* @param name The widget name of this dialog.
*/
BackupProfileWidget( TQWidget* tqparent=0, const char* name=0 );
BackupProfileWidget( TQWidget* parent=0, const char* name=0 );
/**
* Destroy the backup profile widget.

12
kdat/File.cpp
Unescape Escape View File

@ -21,10 +21,10 @@
#include "File.h"
File::File( File* tqparent, int size, int mtime, int startRecord, int endRecord, const TQString & name )
File::File( File* parent, int size, int mtime, int startRecord, int endRecord, const TQString & name )
: _stubbed( FALSE ),
_name( name ),
_parent( tqparent )
_parent( parent )
{
assert( endRecord >= startRecord );
@ -34,9 +34,9 @@ File::File( File* tqparent, int size, int mtime, int startRecord, int endRecord,
_union._data._endRecord = endRecord;
}
File::File( File* tqparent, FILE* fptr, int offset )
File::File( File* parent, FILE* fptr, int offset )
: _stubbed( TRUE ),
_parent( tqparent )
_parent( parent )
{
_union._stub._fptr = fptr;
_union._stub._offset = offset;
@ -236,8 +236,8 @@ TQString File::getName()
TQString File::getFullPathName()
{
TQString tmp = _name.copy();
for ( File* tqparent = getParent(); tqparent; tqparent = tqparent->getParent() ) {
tmp.prepend( tqparent->getName() );
for ( File* parent = getParent(); parent; parent = parent->getParent() ) {
tmp.prepend( parent->getName() );
}
return tmp;

10
kdat/File.h
Unescape Escape View File

@ -52,7 +52,7 @@ public:
/**
* Create a new file entry.
*
* @param tqparent The directory file entry that contains this file.
* @param parent The directory file entry that contains this file.
* @param size The size of the file in bytes.
* @param mtime The last modification time of the file in seconds since
* the Epoch.
@ -63,21 +63,21 @@ public:
* the file's path name should be passed in. The rest of the
* path is determined by this file entry's ancestors.
*/
File( File* tqparent, int size, int mtime, int startRecord, int endRecord, const TQString & name );
File( File* parent, int size, int mtime, int startRecord, int endRecord, const TQString & name );
/**
* Create a new stubbed instance of a file entry. The file pointer and
* offset specify where the actual instance data can be found. The real
* data is read on demand when one of the accessor functions is called.
*
* @param tqparent The directory file entry that contains this file.
* @param parent The directory file entry that contains this file.
* @param fptr The open index file containing this file entry. The file
* must be left open so that the file entry information can
* be read at a later time.
* @param offset The offset that will be seeked to when reading the file
* entry information.
*/
File( File* tqparent, FILE* fptr, int offset );
File( File* parent, FILE* fptr, int offset );
/**
* Destroy the file entry and all of its tqchildren.
@ -163,7 +163,7 @@ public:
TQString getFullPathName();
/**
* Get the file entry's tqparent. A NULL tqparent indicates that this is one
* Get the file entry's parent. A NULL parent indicates that this is one
* of (possibly) many top level directories within the tar archive.
*
* @return A pointer to the file entry that contains this file entry.

4
kdat/FileInfoWidget.cpp
Unescape Escape View File

@ -36,8 +36,8 @@
#include "FileInfoWidget.moc"
FileInfoWidget::FileInfoWidget( TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name )
FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
TQLabel* lbl1 = new TQLabel( i18n( "File name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this );

4
kdat/FileInfoWidget.h
Unescape Escape View File

@ -40,10 +40,10 @@ public:
/**
* Create a new file info widget.
*
* @param tqparent The tqparent widget.
* @param parent The parent widget.
* @param name The name of this widget.
*/
FileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
FileInfoWidget( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the file info widget.

4
kdat/FormatOptDlg.cpp
Unescape Escape View File

@ -34,8 +34,8 @@
#include "FormatOptDlg.moc"
FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* tqparent, const char* name )
: TQDialog( tqparent, name, TRUE )
FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char* name )
: TQDialog( parent, name, TRUE )
{
setIconText( i18n( "KDat: Format Options" ) );
setCaption( i18n( "KDat: Format Options" ) );

4
kdat/FormatOptDlg.h
Unescape Escape View File

@ -43,10 +43,10 @@ public:
* Create a new format options dialog.
*
* @param def The default value for the tape name.
* @param tqparent The tqparent widget for the dialog.
* @param parent The parent widget for the dialog.
* @param name The name for the dialog.
*/
FormatOptDlg( const TQString & def, TQWidget* tqparent=0, const char* name=0 );
FormatOptDlg( const TQString & def, TQWidget* parent=0, const char* name=0 );
/**
* Destroy the format options dialog.

4
kdat/IndexDlg.cpp
Unescape Escape View File

@ -41,8 +41,8 @@
#include "IndexDlg.moc"
IndexDlg::IndexDlg( Tape* tape, TQWidget* tqparent, const char* name )
: TQDialog( tqparent, name, TRUE ),
IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
: TQDialog( parent, name, TRUE ),
_tarParser( NULL ),
_tape( tape ),
_archive( NULL ),

4
kdat/IndexDlg.h
Unescape Escape View File

@ -79,10 +79,10 @@ public:
* Create a new tape index dialog.
*
* @param tape A pointer to the empty tape index to fill in.
* @param tqparent The tqparent widget for this dialog.
* @param parent The parent widget for this dialog.
* @param name The name of this dialog.
*/
IndexDlg( Tape* tape, TQWidget* tqparent = 0, const char* name = 0 );
IndexDlg( Tape* tape, TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the tape index dialog.

4
kdat/InfoShellWidget.cpp
Unescape Escape View File

@ -23,8 +23,8 @@
#include "InfoShellWidget.moc"
InfoShellWidget::InfoShellWidget( TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name )
InfoShellWidget::InfoShellWidget( TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
}

6
kdat/InfoShellWidget.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tqwidget.h>
/**
* @short A suitable tqparent for the info widgets.
* @short A suitable parent for the info widgets.
*/
class InfoShellWidget : public TQWidget {
Q_OBJECT
@ -31,10 +31,10 @@ public:
/**
* Create a new info shell widget.
*
* @param tqparent The tqparent widget.
* @param parent The parent widget.
* @param name The name of this widget.
*/
InfoShellWidget( TQWidget* tqparent = 0, const char* name = 0 );
InfoShellWidget( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the info shell widget.

2
kdat/KDat.kdoc
Unescape Escape View File

@ -519,7 +519,7 @@ KTreeViewItem::delayedExpanding=KTreeViewItem.html#delayedExpanding
KTreeViewItem::doTree=KTreeViewItem.html#doTree
KTreeViewItem::doText=KTreeViewItem.html#doText
KTreeViewItem::paint=KTreeViewItem.html#paint
KTreeViewItem::tqparent=KTreeViewItem.html#tqparent
KTreeViewItem::parent=KTreeViewItem.html#parent
KTreeViewItem::sibling=KTreeViewItem.html#sibling
KTreeViewItem::pixmap=KTreeViewItem.html#pixmap
KTreeViewItem::text=KTreeViewItem.html#text

16
kdat/KDatMainWindow.cpp
Unescape Escape View File

@ -578,10 +578,10 @@ void KDatMainWindow::doVerify( bool restore )
if ( !archiveNode ) {
if ( ((Node*)_tree->getCurrentItem())->isType( Node::RangeableNodeType ) ) {
rangeableNode = (RangeableNode*)_tree->getCurrentItem();
Node* tqparent = rangeableNode;
for ( ; !tqparent->isType( Node::MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() );
assert( tqparent );
archive = ((MountedArchiveNode*)tqparent)->getArchive();
Node* parent = rangeableNode;
for ( ; !parent->isType( Node::MountedArchiveNodeType ); parent = (Node*)parent->getParent() );
assert( parent );
archive = ((MountedArchiveNode*)parent)->getArchive();
}
}
@ -1263,10 +1263,10 @@ void KDatMainWindow::configureUI( Tape* tape )
// even if sel==NULL when a child is selected (see loop above).
if( sel != (Node *)0x0 )
{
for ( Node* tqparent = (Node*)sel->getParent();
( tqparent ) && ( tqparent->getParent() );
tqparent = (Node*)tqparent->getParent() ) {
if ( tqparent->isType( Node::TapeNodeType ) ) {
for ( Node* parent = (Node*)sel->getParent();
( parent ) && ( parent->getParent() );
parent = (Node*)parent->getParent() ) {
if ( parent->isType( Node::TapeNodeType ) ) {
canRestore = FALSE;
}
}

4
kdat/LoggerWidget.cpp
Unescape Escape View File

@ -29,8 +29,8 @@
#include "LoggerWidget.moc"
LoggerWidget::LoggerWidget( const TQString & title, TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name )
LoggerWidget::LoggerWidget( const TQString & title, TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
TQLabel* lbl1 = new TQLabel( title, this );
lbl1->setFixedHeight( lbl1->tqsizeHint().height() );

4
kdat/LoggerWidget.h
Unescape Escape View File

@ -35,10 +35,10 @@ public:
* Create a titled logging widget
*
* @param title The title text displayed above the logging window.
* @param tqparent The tqparent widget.
* @param parent The parent widget.
* @param name The name of this widget.
*/
LoggerWidget( const TQString & title, TQWidget* tqparent = 0, const char* name = 0 );
LoggerWidget( const TQString & title, TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the logging widget.

48
kdat/Node.cpp
Unescape Escape View File

@ -655,10 +655,10 @@ void MountedArchiveNode::setSelected( bool select )
{
if ( select ) {
// Deselect all other archives.
Node* tqparent = (Node*)getParent();
for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) {
if ( tqparent->tqchildAt( i ) != this ) {
((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE );
Node* parent = (Node*)getParent();
for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
if ( parent->tqchildAt( i ) != this ) {
((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
}
}
}
@ -730,9 +730,9 @@ TQString MountedTapeDirectoryNode::getFullPath()
{
if ( _fullPath.length() == 0 ) {
_fullPath = getText() + "/";
for ( Node* tqparent = (Node*)getParent(); !tqparent->isType( MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ) {
for ( Node* parent = (Node*)getParent(); !parent->isType( MountedArchiveNodeType ); parent = (Node*)parent->getParent() ) {
_fullPath.prepend( "/" );
_fullPath.prepend( tqparent->getText() );
_fullPath.prepend( parent->getText() );
}
}
@ -748,17 +748,17 @@ void MountedTapeDirectoryNode::setSelected( bool select )
{
if ( select ) {
// Deselect all other archives.
Node* tqparent = (Node*)getParent();
Node* parent = (Node*)getParent();
Node* arcNode = 0;
while ( !tqparent->isType( TapeDriveNodeType ) ) {
if ( tqparent->isType( MountedArchiveNodeType ) ) {
arcNode = tqparent;
while ( !parent->isType( TapeDriveNodeType ) ) {
if ( parent->isType( MountedArchiveNodeType ) ) {
arcNode = parent;
}
tqparent = (Node*)tqparent->getParent();
parent = (Node*)parent->getParent();
}
for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) {
if ( tqparent->tqchildAt( i ) != arcNode ) {
((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE );
for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
if ( parent->tqchildAt( i ) != arcNode ) {
((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
}
}
}
@ -836,9 +836,9 @@ TQString MountedTapeFileNode::getFullPath()
{
if ( _fullPath.length() == 0 ) {
_fullPath = getText();
for ( Node* tqparent = (Node*)getParent(); !tqparent->isType( MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ) {
for ( Node* parent = (Node*)getParent(); !parent->isType( MountedArchiveNodeType ); parent = (Node*)parent->getParent() ) {
_fullPath.prepend( "/" );
_fullPath.prepend( tqparent->getText() );
_fullPath.prepend( parent->getText() );
}
}
@ -854,17 +854,17 @@ void MountedTapeFileNode::setSelected( bool select )
{
if ( select ) {
// Deselect all other archives.
Node* tqparent = (Node*)getParent();
Node* parent = (Node*)getParent();
Node* arcNode = 0;
while ( !tqparent->isType( TapeDriveNodeType ) ) {
if ( tqparent->isType( MountedArchiveNodeType ) ) {
arcNode = tqparent;
while ( !parent->isType( TapeDriveNodeType ) ) {
if ( parent->isType( MountedArchiveNodeType ) ) {
arcNode = parent;
}
tqparent = (Node*)tqparent->getParent();
parent = (Node*)parent->getParent();
}
for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) {
if ( tqparent->tqchildAt( i ) != arcNode ) {
((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE );
for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
if ( parent->tqchildAt( i ) != arcNode ) {
((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
}
}
}

4
kdat/OptionsDlg.cpp
Unescape Escape View File

@ -34,9 +34,9 @@
#include <kglobal.h>
#include "OptionsDlg.moc"
OptionsDlg::OptionsDlg( TQWidget* tqparent, const char* name )
OptionsDlg::OptionsDlg( TQWidget* parent, const char* name )
: KDialogBase( Swallow, i18n ("Options"), Ok | Apply | Cancel,
Ok, tqparent, name, true, true ), apply (0)
Ok, parent, name, true, true ), apply (0)
{
_baseWidget = new OptionsDlgWidget ( 0 );
setMainWidget (_baseWidget);

4
kdat/OptionsDlg.h
Unescape Escape View File

@ -39,10 +39,10 @@ public:
/**
* Create a new options dialog.
*
* @param tqparent The tqparent widget of the dialog.
* @param parent The parent widget of the dialog.
* @param name The name of the dialog.
*/
OptionsDlg( TQWidget* tqparent = 0, const char* name = 0 );
OptionsDlg( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the options dialog.

4
kdat/TapeFileInfoWidget.cpp
Unescape Escape View File

@ -30,8 +30,8 @@
#include "TapeFileInfoWidget.moc"
TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name )
TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
TQLabel* lbl1 = new TQLabel( i18n( "File name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Last modified:" ), this );

4
kdat/TapeFileInfoWidget.h
Unescape Escape View File

@ -41,10 +41,10 @@ public:
/**
* Create a new tape file info widget.
*
* @param tqparent The tqparent widget.
* @param parent The parent widget.
* @param name The name of this widget.
*/
TapeFileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
TapeFileInfoWidget( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the tape file info widget.

4
kdat/TapeInfoWidget.cpp
Unescape Escape View File

@ -37,8 +37,8 @@
#include "TapeInfoWidget.moc"
TapeInfoWidget::TapeInfoWidget( TQWidget* tqparent, const char* name )
: TQWidget( tqparent, name ),
TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name )
: TQWidget( parent, name ),
_tape( 0 )
{
TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this );

2
kdat/TapeInfoWidget.h
Unescape Escape View File

@ -54,7 +54,7 @@ public:
/**
* Create a new tape info widget.
*/
TapeInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
TapeInfoWidget( TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the tape info widget.

4
kdat/VerifyDlg.cpp
Unescape Escape View File

@ -45,8 +45,8 @@
VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges,
bool restore, TQWidget* tqparent, const char* name )
: TQDialog( tqparent, name, TRUE ),
bool restore, TQWidget* parent, const char* name )
: TQDialog( parent, name, TRUE ),
_restore( restore ),
_proc( NULL ),
_workingDir( workingDir ),

4
kdat/VerifyDlg.h
Unescape Escape View File

@ -80,11 +80,11 @@ public:
* @param fileno The tape file number of the archive to verify/restore.
* @param ranges A list of tar block ranges to read.
* @param restore TRUE means restore, FALSE means verify.
* @param tqparent The tqparent widget for the dialog.
* @param parent The parent widget for the dialog.
* @param name The name of this widget.
*/
VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges,
bool restore = FALSE, TQWidget* tqparent = 0, const char* name = 0 );
bool restore = FALSE, TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the verify/restore dialog.

4
kdat/VerifyOptDlg.cpp
Unescape Escape View File

@ -33,8 +33,8 @@
#include "VerifyOptDlg.moc"
VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore, TQWidget* tqparent, const char* name )
: TQDialog( tqparent, name, TRUE ),
VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore, TQWidget* parent, const char* name )
: TQDialog( parent, name, TRUE ),
_restore( restore )
{
if ( _restore ) {

4
kdat/VerifyOptDlg.h
Unescape Escape View File

@ -46,10 +46,10 @@ public:
* @param def The default working directory.
* @param files The list of files that will be verified/restored.
* @param restore TRUE means we are doing a restore, FALSE means we are doing a verify.
* @param tqparent The tqparent widget for the dialog.
* @param parent The parent widget for the dialog.
* @param name The name for the dialog.
*/
VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = FALSE, TQWidget* tqparent = 0, const char* name = 0 );
VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = FALSE, TQWidget* parent = 0, const char* name = 0 );
/**
* Destroy the verify/restore options dialog.

80
kdat/ktreeview.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText) :
doTree(true),
doText(true),
child(0),
tqparent(0),
parent(0),
sibling(0),
deleteChildren(false)
{
@ -67,7 +67,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText,
doTree(true),
doText(true),
child(0),
tqparent(0),
parent(0),
sibling(0),
deleteChildren(false)
{
@ -92,7 +92,7 @@ KTreeViewItem::~KTreeViewItem()
// appends a direct child
void KTreeViewItem::appendChild(KTreeViewItem* newChild)
{
newChild->tqparent = this;
newChild->parent = this;
newChild->owner = owner;
if (!getChild()) {
child = newChild;
@ -169,10 +169,10 @@ KTreeViewItem* KTreeViewItem::getChild() const
return child;
}
// returns the tqparent of this item
// returns the parent of this item
KTreeViewItem* KTreeViewItem::getParent() const
{
return tqparent;
return parent;
}
// returns reference to the item pixmap
@ -199,10 +199,10 @@ bool KTreeViewItem::hasChild() const
return child != 0;
}
// indicates whether this item has a tqparent
// indicates whether this item has a parent
bool KTreeViewItem::hasParent() const
{
return tqparent != 0;
return parent != 0;
}
// indicates whether this item has a sibling below it
@ -234,7 +234,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild)
appendChild(newChild);
return;
}
newChild->tqparent = this;
newChild->parent = this;
newChild->owner = owner;
if (index == 0) {
newChild->sibling = getChild();
@ -393,9 +393,9 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
/*
* If this is not the first item in the tree draw the line up
* towards tqparent or sibling.
* towards parent or sibling.
*/
if (tqparent->tqparent != 0 || tqparent->getChild() != this)
if (parent->parent != 0 || parent->getChild() != this)
p->drawLine(parentLeaderX, 0, parentLeaderX, cellCenterY);
// draw the line down towards sibling
@ -408,12 +408,12 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
* item out to the left.
*/
if (sibling || (doExpandButton && (child || delayedExpanding)) ||
tqparent->tqparent != 0 ||
parent->parent != 0 ||
/*
* The following handles the case of an item at the end of the
* topmost level which doesn't have tqchildren.
*/
tqparent->getChild() != this)
parent->getChild() != this)
{
p->drawLine(parentLeaderX, cellCenterY, itemLeaderX, cellCenterY);
}
@ -422,7 +422,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
* If there are siblings of ancestors below, draw our portion of the
* branches that extend through this cell.
*/
KTreeViewItem* prevRoot = tqparent;
KTreeViewItem* prevRoot = parent;
while (prevRoot->getParent() != 0) { /* while not root item */
if (prevRoot->hasSibling()) {
int sibLeaderX = owner->indentation(prevRoot) - (22 / 2);
@ -573,10 +573,10 @@ int KTreeViewItem::width(int indent, const TQFontMetrics& fm) const
*/
// constructor
KTreeView::KTreeView(TQWidget *tqparent,
KTreeView::KTreeView(TQWidget *parent,
const char *name,
WFlags f) :
TQGridView(tqparent, name, f),
TQGridView(parent, name, f),
clearing(false),
current(-1),
drawExpandButton(true),
@ -649,7 +649,7 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix
// appends the given item to the tqchildren of the item at the given index
void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
{
/* find tqparent item and append new item to tqparent's sub tree */
/* find parent item and append new item to parent's sub tree */
KTreeViewItem* parentItem = itemAt(index);
if (!parentItem)
return;
@ -660,7 +660,7 @@ void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
// given path
void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath)
{
/* find tqparent item and append new item to tqparent's sub tree */
/* find parent item and append new item to parent's sub tree */
KTreeViewItem* parentItem = itemAt(thePath);
if (!parentItem)
return;
@ -994,7 +994,7 @@ int KTreeView::itemRow(KTreeViewItem* item)
/*
* move the subtree at the specified index up one branch level (make root
* item a sibling of its current tqparent)
* item a sibling of its current parent)
*/
void KTreeView::join(int index)
{
@ -1005,7 +1005,7 @@ void KTreeView::join(int index)
/*
* move the subtree at the specified index up one branch level (make root
* item a sibling of it's current tqparent)
* item a sibling of it's current parent)
*/
void KTreeView::join(const KPath& path)
{
@ -1014,7 +1014,7 @@ void KTreeView::join(const KPath& path)
join(item);
}
/* move item at specified index one slot down in its tqparent's sub tree */
/* move item at specified index one slot down in its parent's sub tree */
void KTreeView::lowerItem(int index)
{
KTreeViewItem *item = itemAt(index);
@ -1022,7 +1022,7 @@ void KTreeView::lowerItem(int index)
lowerItem(item);
}
/* move item at specified path one slot down in its tqparent's sub tree */
/* move item at specified path one slot down in its parent's sub tree */
void KTreeView::lowerItem(const KPath& path)
{
KTreeViewItem* item = itemAt(path);
@ -1030,7 +1030,7 @@ void KTreeView::lowerItem(const KPath& path)
lowerItem(item);
}
/* move item at specified index one slot up in its tqparent's sub tree */
/* move item at specified index one slot up in its parent's sub tree */
void KTreeView::raiseItem(int index)
{
KTreeViewItem* item = itemAt(index);
@ -1038,7 +1038,7 @@ void KTreeView::raiseItem(int index)
raiseItem(item);
}
/* move item at specified path one slot up in its tqparent's sub tree */
/* move item at specified path one slot up in its parent's sub tree */
void KTreeView::raiseItem(const KPath& path)
{
KTreeViewItem* item = itemAt(path);
@ -1237,7 +1237,7 @@ bool KTreeView::treeDrawing() const
}
// appends a child to the specified tqparent item (note: a child, not a sibling, is added!)
// appends a child to the specified parent item (note: a child, not a sibling, is added!)
void KTreeView::appendChildItem(KTreeViewItem* theParent,
KTreeViewItem* newItem)
{
@ -1317,17 +1317,17 @@ bool KTreeView::countItem(KTreeViewItem*, void* total)
}
// if item is expanded, collapses it or vice-versa
void KTreeView::expandOrCollapse(KTreeViewItem* tqparent)
void KTreeView::expandOrCollapse(KTreeViewItem* parent)
{
bool autoU = autoUpdate();
setAutoUpdate(false);
int parentIndex = itemRow(tqparent);
if (tqparent->isExpanded()) {
collapseSubTree(tqparent);
int parentIndex = itemRow(parent);
if (parent->isExpanded()) {
collapseSubTree(parent);
emit collapsed(parentIndex);
}
else {
expandSubTree(tqparent);
expandSubTree(parent);
emit expanded(parentIndex);
}
if (autoU && isVisible())
@ -1534,7 +1534,7 @@ void KTreeView::itemPath(KTreeViewItem* item, KPath& path) const
/*
* joins the item's branch into the tree, making the item a sibling of its
* tqparent
* parent
*/
void KTreeView::join(KTreeViewItem *item)
{
@ -1632,15 +1632,15 @@ int KTreeView::level(KTreeViewItem* item) const
assert(item->owner == this);
assert(item != treeRoot);
int l = 0;
item = item->tqparent->tqparent; /* since item != treeRoot, there is a tqparent */
item = item->parent->parent; /* since item != treeRoot, there is a parent */
while (item != 0) {
item = item->tqparent;
item = item->parent;
l++;
}
return l;
}
/* move specified item down one slot in tqparent's subtree */
/* move specified item down one slot in parent's subtree */
void KTreeView::lowerItem(KTreeViewItem *item)
{
KTreeViewItem *itemParent = item->getParent();
@ -1866,7 +1866,7 @@ void KTreeView::paintCell(TQPainter* p, int row, int)
p->setClipping(false);
}
/* raise the specified item up one slot in tqparent's subtree */
/* raise the specified item up one slot in parent's subtree */
void KTreeView::raiseItem(KTreeViewItem *item)
{
KTreeViewItem *itemParent = item->getParent();
@ -1891,15 +1891,15 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path)
// get the next key
TQString* searchString = path.pop();
// find the tqparent item
KTreeViewItem* tqparent = recursiveFind(path);
if (tqparent == 0)
// find the parent item
KTreeViewItem* parent = recursiveFind(path);
if (parent == 0)
return 0;
/*
* Iterate through the tqparent's tqchildren searching for searchString.
* Iterate through the parent's tqchildren searching for searchString.
*/
KTreeViewItem* sibling = tqparent->getChild();
KTreeViewItem* sibling = parent->getChild();
while (sibling != 0) {
if (*searchString == sibling->getText()) {
break; /* found it! */
@ -1988,7 +1988,7 @@ void KTreeView::takeItem(KTreeViewItem* item)
c = c->getParent();
}
if (c != 0) {
// move current item to tqparent
// move current item to parent
cur = item->getParent();
if (cur == treeRoot)
cur = 0;

26
kdat/ktreeview.h
Unescape Escape View File

@ -61,7 +61,7 @@ public:
/**
* Appends a new (direct) child item at the end. It does not update
* administrative data in newChild except for its tqparent (which is this
* administrative data in newChild except for its parent (which is this
* item) and owner.
*/
void appendChild(KTreeViewItem* newChild);
@ -100,7 +100,7 @@ public:
KTreeViewItem* getChild() const;
/**
* Returns a pointer to the tqparent of this item, or 0 if none.
* Returns a pointer to the parent of this item, or 0 if none.
*/
KTreeViewItem* getParent() const;
@ -128,7 +128,7 @@ public:
bool hasChild() const;
/**
* Indicates whether this item has a tqparent.
* Indicates whether this item has a parent.
*/
bool hasParent() const;
@ -142,7 +142,7 @@ public:
* Inserts the a new (direct) child in this item before the child at
* the specified index (first child is index 0). If there is no child
* at the specified index, the item is appended. It does not update
* administrative data in newChild except for its tqparent (which is this
* administrative data in newChild except for its parent (which is this
* item) and owner.
*/
void insertChild(int index, KTreeViewItem* newChild);
@ -224,7 +224,7 @@ protected:
virtual int height(const TQFontMetrics& fm) const;
/**
* Paints the item: pixmap, text, expand button, tqparent branches
* Paints the item: pixmap, text, expand button, parent branches
*/
virtual void paint(TQPainter* p, int indent,
const TQColorGroup& cg, bool highlighted) const;
@ -286,7 +286,7 @@ protected:
bool doText;
mutable TQRect expandButton; /* is set in paint() */
KTreeViewItem* child;
KTreeViewItem* tqparent;
KTreeViewItem* parent;
KTreeViewItem* sibling;
TQPixmap pixmap;
TQString text;
@ -331,7 +331,7 @@ typedef bool (*KForEvery)
by the programmer.
* The list items can be returned by index or logical path and the tree
navigated by tqparent, child or sibling references contained in them. Also,
navigated by parent, child or sibling references contained in them. Also,
item information such as text, pixmap, branch level can be obtained.
* Items can be inserted, changed and removed either by index in the visible
@ -407,7 +407,7 @@ public:
* current item to -1, and sets default values for scroll bars (both
* auto).
*/
KTreeView(TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0);
KTreeView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0);
/*
* Desctructor. Deletes all items from the topmost level that have been
@ -425,7 +425,7 @@ public:
int index);
/**
* Same as above except that the tqparent item is specified by a path.
* Same as above except that the parent item is specified by a path.
*/
void appendChildItem(const TQString & theText, const TQPixmap& thePixmap,
const KPath& thePath);
@ -438,7 +438,7 @@ public:
void appendChildItem(KTreeViewItem* newItem, int index);
/**
* Same as above except that the tqparent item is specified by a path.
* Same as above except that the parent item is specified by a path.
*/
void appendChildItem(KTreeViewItem* newItem, const KPath& thePath);
@ -515,7 +515,7 @@ public:
void expandItem(int index);
/**
Returns the depth to which all tqparent items are automatically
Returns the depth to which all parent items are automatically
expanded.
*/
int expandLevel() const;
@ -622,7 +622,7 @@ public:
/**
* Outdents the item at the given row one level so that it becomes a
* sibling of its tqparent.
* sibling of its parent.
*/
void join(int index);
@ -870,7 +870,7 @@ public:
protected:
virtual void updateCellWidth();
virtual void updateVisibleItems();
void updateVisibleItemRec(KTreeViewItem* tqparent, int& count, int& width);
void updateVisibleItemRec(KTreeViewItem* parent, int& count, int& width);
KTreeViewItem* treeRoot;
bool clearing;

4
kfile-plugins/deb/kfile_deb.cpp
Unescape Escape View File

@ -43,10 +43,10 @@ typedef KGenericFactory<KDebPlugin> DebFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_deb, DebFactory( "kfile_deb" ))
KDebPlugin::KDebPlugin(TQObject *tqparent, const char *name,
KDebPlugin::KDebPlugin(TQObject *parent, const char *name,
const TQStringList &args)
: KFilePlugin(tqparent, name, args)
: KFilePlugin(parent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-deb" );
KFileMimeTypeInfo::GroupInfo* group = 0L;

2
kfile-plugins/deb/kfile_deb.h
Unescape Escape View File

@ -30,7 +30,7 @@ class KDebPlugin: public KFilePlugin
TQ_OBJECT
public:
KDebPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
KDebPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);

4
kfile-plugins/rpm/kfile_rpm.cpp
Unescape Escape View File

@ -36,10 +36,10 @@ typedef KGenericFactory<KRpmPlugin> RpmFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_rpm, RpmFactory( "kfile_rpm" ))
KRpmPlugin::KRpmPlugin(TQObject *tqparent, const char *name,
KRpmPlugin::KRpmPlugin(TQObject *parent, const char *name,
const TQStringList &args)
: KFilePlugin(tqparent, name, args)
: KFilePlugin(parent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-rpm" );
KFileMimeTypeInfo::GroupInfo* group = 0L;

2
kfile-plugins/rpm/kfile_rpm.h
Unescape Escape View File

@ -30,7 +30,7 @@ class KRpmPlugin: public KFilePlugin
TQ_OBJECT
public:
KRpmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
KRpmPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);

8
knetworkconf/backends/file.pl.in
Unescape Escape View File

@ -456,11 +456,11 @@ sub gst_file_open_write_compressed
sub gst_file_run_pipe
{
my ($cmd, $mode_tqmask, $stderr) = @_;
my ($cmd, $mode_mask, $stderr) = @_;
my ($command);
local *PIPE;
$mode_tqmask = $GST_FILE_READ if $mode_tqmask eq undef;
$mode_mask = $GST_FILE_READ if $mode_mask eq undef;
&gst_report_enter ();
@ -480,8 +480,8 @@ sub gst_file_run_pipe
return undef;
}
$command .= " |" if $mode_tqmask & $GST_FILE_READ;
$command = "| $command > /dev/null" if $mode_tqmask & $GST_FILE_WRITE;
$command .= " |" if $mode_mask & $GST_FILE_READ;
$command = "| $command > /dev/null" if $mode_mask & $GST_FILE_WRITE;
open PIPE, $command;
&gst_report ("file_run_pipe_success", $command);

4
knetworkconf/backends/guess_system.sh
Unescape Escape View File

@ -84,7 +84,7 @@ main:
.prologue 0
.long 0x47e03d80 # implver $0
lda \$2,259
.long 0x47e20c21 # atqmask $2,$1
.long 0x47e20c21 # amask $2,$1
srl \$1,8,\$2
sll \$2,2,\$2
sll \$0,3,\$0
@ -711,7 +711,7 @@ EOF
.prologue 0
.long 0x47e03d80 # implver $0
lda \$2,259
.long 0x47e20c21 # atqmask $2,$1
.long 0x47e20c21 # amask $2,$1
srl \$1,8,\$2
sll \$2,2,\$2
sll \$0,3,\$0

156
knetworkconf/backends/network.pl.in
Unescape Escape View File

@ -161,10 +161,10 @@ sub gst_network_config_wireless
sub gst_network_enable_iface
{
my ($hash, $dev, $command_ifconfig) = @_;
my ($address, $nettqmask, $bootproto, $remote_address);
my ($address, $netmask, $bootproto, $remote_address);
$address = $$hash{"configuration"}{"address"};
$nettqmask = $$hash{"configuration"}{"nettqmask"};
$netmask = $$hash{"configuration"}{"netmask"};
$bootproto = $$hash{"configuration"}{"bootproto"};
$remote_address = $$hash{"configuration"}{"remote_address"};
@ -188,7 +188,7 @@ sub gst_network_enable_iface
$command = $command_ifconfig;
$command .= " $dev";
$command .= " $address" if ($address);
$command .= " nettqmask $nettqmask" if ($nettqmask);
$command .= " netmask $netmask" if ($netmask);
$command .= " dstaddr $remote_address" if ($remote_address);
$command .= " up";
}
@ -432,11 +432,11 @@ sub gst_network_ipv4_vec2str
# Gets the subnet, in bitmap.
sub gst_network_ipv4_calc_subnet_vec
{
my ($addr, $tqmask) = @_;
my ($addr, $mask) = @_;
my ($addrvec, $maskvec);
$addrvec = &gst_network_ipv4_str2vec ($addr);
$maskvec = &gst_network_ipv4_str2vec ($tqmask);
$maskvec = &gst_network_ipv4_str2vec ($mask);
return $addrvec & $maskvec;
}
@ -444,7 +444,7 @@ sub gst_network_ipv4_calc_subnet_vec
# What you're looking for.
sub gst_network_ipv4_calc_subnet
{
my ($addr, $tqmask) = @_;
my ($addr, $mask) = @_;
return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_subnet_vec);
}
@ -452,10 +452,10 @@ sub gst_network_ipv4_calc_subnet
# The broadcast, bitmap.
sub gst_network_ipv4_calc_bcast_vec
{
my ($addr, $tqmask) = @_;
my ($addr, $mask) = @_;
$addrvec = &gst_network_ipv4_str2vec ($addr);
$maskvec = &gst_network_ipv4_str2vec ($tqmask);
$maskvec = &gst_network_ipv4_str2vec ($mask);
return $addrvec | ~$maskvec;
}
@ -463,7 +463,7 @@ sub gst_network_ipv4_calc_bcast_vec
# And this returning the quad-dot notation.
sub gst_network_ipv4_calc_bcast
{
my ($addr, $tqmask) = @_;
my ($addr, $mask) = @_;
return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_bcast_vec);
}
@ -870,7 +870,7 @@ sub gst_network_freebsd_interfaces_get_info
{
$ifaces{$dev}{"hwaddr"} = $1 if /ether[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"addr"} = $1 if /inet[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"tqmask"} = $1 if /nettqmask[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"mask"} = $1 if /netmask[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"bcast"} = $1 if /broadcast[ \t]+([^ \t]+)/i;
}
}
@ -905,7 +905,7 @@ sub gst_network_linux_interfaces_get_info
{
$ifaces{$dev}{"hwaddr"} = $1 if /HWaddr[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"addr"} = $1 if /addr:([^ \t]+)/i;
$ifaces{$dev}{"tqmask"} = $1 if /tqmask:([^ \t]+)/i;
$ifaces{$dev}{"mask"} = $1 if /mask:([^ \t]+)/i;
$ifaces{$dev}{"bcast"} = $1 if /bcast:([^ \t]+)/i;
$ifaces{$dev}{"enabled"} = 1 if /^UP[ \t]/i;
}
@ -1028,17 +1028,17 @@ sub gst_network_interface_ensure_broadcast_and_network
{
my ($iface) = @_;
if (exists $$iface{"nettqmask"} &&
if (exists $$iface{"netmask"} &&
exists $$iface{"address"})
{
if (! exists $$iface{"broadcast"})
{
$$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"nettqmask"});
$$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"netmask"});
}
if (! exists $$iface{"network"})
{
$$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"nettqmask"});
$$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"netmask"});
}
}
}
@ -1660,7 +1660,7 @@ sub gst_network_interfaces_get
{
delete $$hash{$i}{"addr"};
delete $$hash{$i}{"bcast"};
delete $$hash{$i}{"tqmask"};
delete $$hash{$i}{"mask"};
}
foreach $i (@ifaces)
@ -2182,7 +2182,7 @@ sub gst_network_suse70_interface_activate
sub gst_network_slackware91_interface_activate_by_dev
{
my ($dev, $enabled) = @_;
my ($address, $nettqmask, $gateway);
my ($address, $netmask, $gateway);
my ($file) = "/etc/rc.d/rc.inet1.conf";
my ($ret) = 0;
@ -2206,10 +2206,10 @@ sub gst_network_slackware91_interface_activate_by_dev
else
{
$address = &gst_parse_rcinet1conf ($file, $dev, "IPADDR");
$nettqmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK");
$gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $nettqmask);
$netmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK");
$gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $netmask);
$ret = &gst_file_run ("ifconfig $dev $address nettqmask $nettqmask up");
$ret = &gst_file_run ("ifconfig $dev $address netmask $netmask up");
# Add the gateway if necessary
if ($gateway ne undef)
@ -3526,11 +3526,11 @@ sub gst_network_suse90_set_auto
}
}
# Return IP address or nettqmask, depending on $what
# Return IP address or netmask, depending on $what
sub gst_network_pld10_get_ipaddr
{
my ($file, $key, $what) = @_;
my ($ipaddr, $nettqmask, $ret, $i);
my ($ipaddr, $netmask, $ret, $i);
my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
$ipaddr = &gst_parse_sh($file, $key);
@ -3538,22 +3538,22 @@ sub gst_network_pld10_get_ipaddr
if($ipaddr =~ /([^\/]*)\/([[:digit:]]*)/)
{
$nettqmask = $2;
return undef if $nettqmask eq "";
$netmask = $2;
return undef if $netmask eq "";
if($what eq "address")
{
return $1;
}
for($i = 0; $i < int($nettqmask/8); $i++)
for($i = 0; $i < int($netmask/8); $i++)
{
$ret .= "255.";
}
$ret .= "$netmask_prefixes[$b%8]." if $nettqmask < 32;
$ret .= "$netmask_prefixes[$b%8]." if $netmask < 32;
for($i = int($nettqmask/8) + 1; $i < 4; $i++)
for($i = int($netmask/8) + 1; $i < 4; $i++)
{
$ret .= "0.";
}
@ -3564,7 +3564,7 @@ sub gst_network_pld10_get_ipaddr
return undef;
}
# Writes IP address or nettqmask, depending in $what, to $file
# Writes IP address or netmask, depending in $what, to $file
sub gst_network_pld10_set_ipaddr
{
my ($file, $key, $what, $value) = @_;
@ -3580,7 +3580,7 @@ sub gst_network_pld10_set_ipaddr
"254" => 7,
"255" => 8
);
my ($ipaddr, $nettqmask);
my ($ipaddr, $netmask);
$ipaddr = &gst_parse_sh($file, $key);
return undef if $ipaddr eq "";
@ -3593,8 +3593,8 @@ sub gst_network_pld10_set_ipaddr
{
if($value =~ /([[:digit:]]*).([[:digit:]]*).([[:digit:]]*).([[:digit:]]*)/)
{
$nettqmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4};
$ipaddr =~ s/\/[[:digit:]]*/\/$nettqmask/;
$netmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4};
$ipaddr =~ s/\/[[:digit:]]*/\/$netmask/;
}
}
@ -3605,25 +3605,25 @@ sub gst_network_pld10_set_ipaddr
# it checks if a IP address is in the same network than another
sub gst_network_is_ip_in_same_network
{
my ($address1, $address2, $nettqmask) = @_;
my (@add1, @add2, @tqmask);
my ($address1, $address2, $netmask) = @_;
my (@add1, @add2, @mask);
my ($i);
return 0 if (($address1 eq undef) ||
($address2 eq undef) ||
($nettqmask eq undef));
($netmask eq undef));
@add1 = split (/\./, $address1);
@add2 = split (/\./, $address2);
@tqmask = split (/\./, $nettqmask);
@mask = split (/\./, $netmask);
for ($i = 0; $i < 4; $i++)
{
$add1[$i] += 0;
$add2[$i] += 0;
$tqmask[$i] += 0;
$mask[$i] += 0;
return 0 if (($add1[$i] & $tqmask[$i]) != ($add2[$i] & $tqmask[$i]));
return 0 if (($add1[$i] & $mask[$i]) != ($add2[$i] & $mask[$i]));
}
return 1;
@ -3633,14 +3633,14 @@ sub gst_network_is_ip_in_same_network
sub gst_network_get_gateway_dev_from_address
{
my ($interface, $gateway) = @_;
my ($address, $nettqmask, $key);
my ($address, $netmask, $key);
foreach $key (keys %$interface)
{
$address = $$interface{$key}{"address"};
$nettqmask = $$interface{$key}{"nettqmask"};
$netmask = $$interface{$key}{"netmask"};
return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask));
return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $netmask));
}
return undef;
@ -3658,23 +3658,23 @@ sub gst_network_get_plip_gateway
sub gst_network_get_gateway
{
my ($file, $key, $address, $nettqmask) = @_;
my ($file, $key, $address, $netmask) = @_;
my ($gateway);
return undef if ($address eq undef);
$gateway = &gst_parse_sh ($file, $key);
return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask);
return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $netmask);
return undef;
}
sub gst_network_suse90_get_gateway
{
my ($file, $address, $nettqmask) = @_;
my ($file, $address, $netmask) = @_;
my ($gateway) = &gst_parse_split_first_array_pos ($file, "default", 0, "[ \t]+", "[ \t]+");
return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask);
return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $netmask);
return undef;
}
@ -3689,10 +3689,10 @@ sub gst_network_suse90_get_plip_gateway
sub gst_network_suse90_replace_gateway
{
my ($file, $dev, $address, $nettqmask, $value) = @_;
my ($file, $dev, $address, $netmask, $value) = @_;
return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") if &gst_network_is_ip_in_same_network ($address, $value, $nettqmask);
return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") if &gst_network_is_ip_in_same_network ($address, $value, $netmask);
# return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") ;
return undef;
@ -4039,7 +4039,7 @@ sub gst_network_ensure_loopback_interface
"user" => 0,
"dev" => "lo",
"address" => "127.0.0.1",
"nettqmask" => "255.0.0.0",
"netmask" => "255.0.0.0",
"broadcast" => "127.255.255.255",
"network" => "127.0.0.0",
"bootproto" => "none",
@ -4674,7 +4674,7 @@ sub gst_network_get_interface_parse_table
# [ "user", \&gst_parse_sh_bool, IFCFG, USERCTL ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -4737,7 +4737,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_trivial, IFACE ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -4807,7 +4807,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_trivial, IFACE ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -4874,7 +4874,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, NAME ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -4938,7 +4938,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, NAME ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -5003,7 +5003,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, NAME ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -5069,7 +5069,7 @@ sub gst_network_get_interface_parse_table
[ "auto", \&gst_parse_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
# [ "name", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ],
[ "address", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ],
[ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
[ "broadcast", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ],
[ "network", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ],
[ "gateway", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
@ -5124,7 +5124,7 @@ sub gst_network_get_interface_parse_table
[ "auto", \&gst_network_debian_woody_get_auto, [INTERFACES, IFACE]],
# [ "name", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ],
[ "address", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ],
[ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
[ "broadcast", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ],
[ "network", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ],
[ "gateway", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
@ -5176,7 +5176,7 @@ sub gst_network_get_interface_parse_table
[ "name", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], GST_IFACE_NAME ],
[ "dev", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], NETDEV ],
[ "address", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], IPADDR ],
[ "nettqmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], nettqmask ],
[ "netmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], netmask ],
[ "broadcast", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], broadcast ],
# [ "network", \&gst_parse_trivial, 0 ], # not supported.
# [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], # not supported
@ -5203,12 +5203,12 @@ sub gst_network_get_interface_parse_table
[ "auto", \&gst_network_suse90_get_auto, IFCFG, STARTMODE ],
[ "bootproto", \&gst_network_parse_bootproto, IFCFG, BOOTPROTO ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "remote_address", \&gst_parse_sh, IFCFG, REMOTE_IPADDR ],
[ "essid", \&gst_parse_sh, IFCFG, WIRELESS_ESSID ],
[ "key_type", \&gst_network_get_wep_key_type, [ \&gst_parse_sh, IFCFG, WIRELESS_KEY ]],
[ "key", \&gst_network_get_wep_key, [ \&gst_parse_sh, IFCFG, WIRELESS_KEY ]],
[ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%nettqmask%" ],
[ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%netmask%" ],
[ "gateway", \&gst_network_suse90_get_plip_gateway, ROUTE_CONF, "%remote_address%" ],
# Modem stuff goes here
[ "serial_port", \&gst_parse_sh, IFCFG, MODEM_DEVICE ],
@ -5252,7 +5252,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, DEVICE ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "address" ],
[ "nettqmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "nettqmask" ],
[ "netmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "netmask" ],
# [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
# [ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@ -5300,8 +5300,8 @@ sub gst_network_get_interface_parse_table
[ "user", \&gst_parse_trivial, 0 ], # not supported.
[ "dev", \&gst_parse_trivial, IFACE ],
[ "address", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], IPADDR ],
[ "nettqmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ],
[ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%nettqmask%" ],
[ "netmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ],
[ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%netmask%" ],
[ "auto", \&gst_network_slackware91_get_auto, [RC_INET, RC_LOCAL, IFACE]],
[ "bootproto", \&gst_network_slackware91_parse_bootproto, [RC_INET_CONF, IFACE]],
[ "essid", \&gst_parse_wireless_opts, [ WIRELESS, IFACE ], \&gst_network_get_wireless_ifaces, ESSID ],
@ -5348,7 +5348,7 @@ sub gst_network_get_interface_parse_table
[ "user", \&gst_parse_trivial, 0 ], # not supported.
[ "dev", \&gst_parse_trivial, IFACE ],
[ "address", \&gst_parse_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ],
[ "nettqmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "nettqmask[ \t]+([0-9\.]*)" ],
[ "netmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "netmask[ \t]+([0-9\.]*)" ],
[ "remote_address", \&gst_parse_confd_net_re, NET, "config_%dev%", "dest_address[ \t]+([0-9\.]*)" ],
# [ "gateway", \&gst_parse_sh_re, NET, "gateway", "%dev%/([0-9\.\:]*)" ],
[ "gateway", \&gst_network_gentoo_parse_gateway, [ NET, IFACE ]],
@ -5396,15 +5396,15 @@ sub gst_network_get_interface_parse_table
# we need to double check these values both in the start_if and in the rc.conf files, in this order
[ "address", \&gst_parse_startif, STARTIF, "inet[ \t]+([0-9\.]+)" ],
[ "address", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "inet[ \t]+([0-9\.]+)" ],
[ "nettqmask", \&gst_parse_startif, STARTIF, "nettqmask[ \t]+([0-9\.]+)" ],
[ "nettqmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)" ],
[ "netmask", \&gst_parse_startif, STARTIF, "netmask[ \t]+([0-9\.]+)" ],
[ "netmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)" ],
[ "remote_address", \&gst_parse_startif, STARTIF, "dest_address[ \t]+([0-9\.]+)" ],
[ "remote_address", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "dest_address[ \t]+([0-9\.]+)" ],
[ "essid", \&gst_parse_startif, STARTIF, "ssid[ \t]+(\".*\"|[^\"][^ ]+)" ],
[ "essid", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "ssid[ \t]+([^ ]*)" ],
# this is for plip interfaces
[ "gateway", \&gst_network_get_plip_gateway, RC_CONF, "defaultrouter", "%remote_address%" ],
[ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%nettqmask%" ],
[ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%netmask%" ],
[ "enabled", \&gst_network_interface_active, IFACE, \&gst_network_freebsd5_active_interfaces_get ],
[ "bootproto", \&gst_network_parse_bootproto, RC_CONF, "ifconfig_%dev%" ],
# Modem stuff
@ -5961,7 +5961,7 @@ sub gst_network_get_interface_replace_table
[ "dev", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6020,7 +6020,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6082,7 +6082,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6142,7 +6142,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6202,7 +6202,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6262,7 +6262,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6324,7 +6324,7 @@ sub gst_network_get_interface_replace_table
[ "auto", \&gst_replace_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
[ "name", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "name" ],
[ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ],
[ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
[ "broadcast", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ],
[ "network", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "network" ],
[ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
@ -6372,7 +6372,7 @@ sub gst_network_get_interface_replace_table
[ "bootproto", \&gst_network_deb22_replace_bootproto, [INTERFACES, IFACE]],
[ "auto", \&gst_network_debian_woody_set_auto, [INTERFACES, IFACE]],
[ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ],
[ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
[ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
[ "essid", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-essid" ],
[ "key", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-key" ],
@ -6432,7 +6432,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_network_suse70_replace_iface_sh, [IFCFG, IFACE], GST_IFACE_NAME ],
[ "address", \&gst_network_suse70_replace_iface_sh, [IFCFG, IFACE], IPADDR ],
[ "address", \&gst_network_suse70_set_ifconfig_ip, [IFCFG, IFACE] ],
[ "nettqmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], nettqmask ],
[ "netmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], netmask ],
[ "broadcast", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], broadcast ],
# [ "network", \&gst_parse_trivial, 0 ], # not supported.
# [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], # not supported
@ -6458,7 +6458,7 @@ sub gst_network_get_interface_replace_table
[ "auto", \&gst_network_suse90_set_auto, IFCFG, STARTMODE ],
[ "bootproto", \&gst_network_suse90_replace_bootproto, IFCFG, BOOTPROTO ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
[ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "remote_address", \&gst_replace_sh, IFCFG, REMOTE_IPADDR ],
[ "essid", \&gst_replace_sh, IFCFG, WIRELESS_ESSID ],
[ "key", \&gst_replace_sh, IFCFG, WIRELESS_KEY ],
@ -6506,7 +6506,7 @@ sub gst_network_get_interface_replace_table
# [ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "address" ],
[ "nettqmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "nettqmask" ],
[ "netmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "netmask" ],
# [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
# [ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@ -6551,7 +6551,7 @@ sub gst_network_get_interface_replace_table
table =>
[
[ "address", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], IPADDR ],
[ "nettqmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ],
[ "netmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ],
[ "gateway", \&gst_replace_rcinet1conf_global, RC_INET_CONF, GATEWAY ],
[ "bootproto", \&gst_network_slackware91_replace_bootproto, [ RC_INET_CONF, IFACE ] ],
[ "auto", \&gst_network_slackware91_set_auto, [ RC_INET, RC_LOCAL, IFACE ] ],
@ -6603,7 +6603,7 @@ sub gst_network_get_interface_replace_table
[ "bootproto", \&gst_network_gentoo_replace_bootproto, [ NET, IFACE ]],
[ "address", \&gst_replace_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ],
[ "address", \&gst_replace_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ],
[ "nettqmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+nettqmask[ \t]+[0-9\.]*", " nettqmask %nettqmask%"],
[ "netmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+netmask[ \t]+[0-9\.]*", " netmask %netmask%"],
[ "broadcast", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+broadcast[ \t]+[0-9\.]*", " broadcast %broadcast%" ],
[ "remote_address", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+dest_address[ \t]+[0-9\.]*", " dest_address %remote_address%" ],
[ "gateway", \&gst_replace_confd_net_re, NET, "routes_%dev%", "[ \t]*default[ \t]+(via|gw)[ \t]+[0-9\.\:]*", "default via %gateway%" ],
@ -6648,7 +6648,7 @@ sub gst_network_get_interface_replace_table
[ "auto", \&gst_network_freebsd5_set_auto, [ RC_CONF, IFACE ]],
[ "bootproto", \&gst_network_freebsd5_replace_bootproto, [ RC_CONF, IFACE ]],
[ "address", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "inet[ \t]+([0-9\.]+)", "inet %address%" ],
[ "nettqmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)", " nettqmask %nettqmask%" ],
[ "netmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)", " netmask %netmask%" ],
[ "remote_address", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "dest_address[ \t]+([0-9\.]+)", " dest_address %remote_address%" ],
[ "essid", \&gst_network_freebsd5_replace_essid, [ RC_CONF, STARTIF, IFACE ]],
# Modem stuff

4
knetworkconf/backends/util.pl.in
Unescape Escape View File

@ -279,7 +279,7 @@ sub gst_get_key_for_subkey_and_subvalues
# --- IP calculation --- #
# &gst_ip_calc_network (<IP>, <nettqmask>)
# &gst_ip_calc_network (<IP>, <netmask>)
#
# Calculates the network address and returns it as a string.
@ -300,7 +300,7 @@ sub gst_ip_calc_network
}
# &gst_ip_calc_network (<IP>, <nettqmask>)
# &gst_ip_calc_network (<IP>, <netmask>)
#
# Calculates the broadcast address and returns it as a string.

2
knetworkconf/backends/xml.pl.in
Unescape Escape View File

@ -238,7 +238,7 @@ sub gst_xml_print_arrays
}
}
# Pass a hash, create a tqparent tag $tag and print <key>val</key> for every
# Pass a hash, create a parent tag $tag and print <key>val</key> for every
# value pair in the hash. If structure refs are found, these are recursively
# printed with print_structure.
sub gst_xml_print_hash

18
knetworkconf/knetworkconf/kadddevicecontainer.cpp
Unescape Escape View File

@ -17,8 +17,8 @@
***************************************************************************/
#include "kadddevicecontainer.h"
KAddDeviceContainer::KAddDeviceContainer(TQWidget *tqparent, const char *name)
: KDialog(tqparent, name)
KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
: KDialog(parent, name)
{
_modified = false;
_advanced = false;
@ -67,14 +67,14 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *tqparent, const char *name)
connect((KAddDeviceDlgExtension*)extension(),TQT_SIGNAL(valueChangedSignal(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->kleIPAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
// connect(addDlg->kleGateway,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
connect(addDlg->kcbNettqmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->kcbNetmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->kcbAutoBootProto,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
connect(addDlg->kcbstartAtBoot,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleAdvancedOptionsSlot(bool)));
connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),kpbAdvanced,TQT_SLOT(setDisabled(bool)));
connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
// connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQT_SLOT(setDisabled(bool)));
// connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNettqmask,TQT_SLOT(setDisabled(bool)));
// connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQT_SLOT(setDisabled(bool)));
// connect(addDlg->rbBootProtoManual,TQT_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQT_SLOT(setDisabled(bool)));
connect(kpbCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelSlot()));
connect(kpbApply,TQT_SIGNAL(clicked()),this,TQT_SLOT(verifyDeviceInfoSlot()));
@ -120,7 +120,7 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
if (addDlg->rbBootProtoManual->isChecked())
{
TQString ipAddress = addDlg->kleIPAddress->text();
TQString nettqmask = addDlg->kcbNettqmask->currentText();
TQString netmask = addDlg->kcbNetmask->currentText();
TQString broadcast = advancedOptions->kleBroadcast->text();
TQString gateway = advancedOptions->kleGateway->text();
@ -128,8 +128,8 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
{
KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address"));
}
else if (_advanced && !KAddressValidator::isNetmaskValid(nettqmask))
KMessageBox::error(this,i18n("The format of the specified nettqmask is not valid."),i18n("Invalid IP Address"));
else if (_advanced && !KAddressValidator::isNetmaskValid(netmask))
KMessageBox::error(this,i18n("The format of the specified netmask is not valid."),i18n("Invalid IP Address"));
else if (!broadcast.isEmpty() && _advanced && !KAddressValidator::isBroadcastValid(broadcast))
KMessageBox::error(this,i18n("The format of the specified broadcast is not valid."),i18n("Invalid IP Address"));
@ -172,12 +172,12 @@ void KAddDeviceContainer::advancedOptionsSlot()
if (!_advanced)
{
kpbAdvanced->setText(i18n("Basic Settings"));
addDlg->kcbNettqmask->setEditable(true);
addDlg->kcbNetmask->setEditable(true);
}
else
{
kpbAdvanced->setText(i18n("Advanced Settings"));
addDlg->kcbNettqmask->setEditable(false);
addDlg->kcbNetmask->setEditable(false);
}
_advanced = !_advanced;
showExtension(_advanced );

2
knetworkconf/knetworkconf/kadddevicecontainer.h
Unescape Escape View File

@ -48,7 +48,7 @@ class KAddDeviceContainer : public KDialog
Q_OBJECT
TQ_OBJECT
public:
KAddDeviceContainer(TQWidget *tqparent = 0, const char *name = 0);
KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0);
~KAddDeviceContainer();
KPushButton* kpbAdvanced;

16
knetworkconf/knetworkconf/kadddevicedlg.ui
Unescape Escape View File

@ -228,16 +228,16 @@
</property>
</item>
<property name="name">
<cstring>kcbNettqmask</cstring>
<cstring>kcbNetmask</cstring>
</property>
<property name="editable">
<bool>false</bool>
</property>
<property name="toolTip" stdset="0">
<string>Subnettqmask of the network device</string>
<string>Subnetmask of the network device</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;p&gt;Please enter the desired subnettqmask for the interface here.&lt;/p&gt;
<string>&lt;p&gt;Please enter the desired subnetmask for the interface here.&lt;/p&gt;
&lt;p&gt;For small private networks, 255.255.255.0 will most often be a reasonable default value.&lt;/p&gt;
&lt;p&gt;This field will change from a popup box to a combo box as soon as you enable the advanced settings below.&lt;/p&gt;</string>
</property>
@ -281,13 +281,13 @@
<cstring>TextLabel1_2</cstring>
</property>
<property name="text">
<string>Nettqmask:</string>
<string>Netmask:</string>
</property>
<property name="toolTip" stdset="0">
<string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string>
<string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string>
</property>
<property name="whatsThis" stdset="0">
<string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string>
<string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string>
</property>
</widget>
<widget class="KLineEdit" row="2" column="3" rowspan="1" colspan="2">
@ -384,7 +384,7 @@
<connection>
<sender>rbBootProtoAuto</sender>
<signal>toggled(bool)</signal>
<receiver>kcbNettqmask</receiver>
<receiver>kcbNetmask</receiver>
<slot>setDisabled(bool)</slot>
</connection>
</connections>
@ -393,7 +393,7 @@
<tabstop>kcbAutoBootProto</tabstop>
<tabstop>rbBootProtoManual</tabstop>
<tabstop>kleIPAddress</tabstop>
<tabstop>kcbNettqmask</tabstop>
<tabstop>kcbNetmask</tabstop>
<tabstop>kcbstartAtBoot</tabstop>
</tabstops>
<includes>

58
knetworkconf/knetworkconf/kaddressvalidator.cpp
Unescape Escape View File

@ -123,37 +123,37 @@ bool KAddressValidator::isBroadcastValid(TQString addr){
}
/** \fn unsigned long int prefix2tqmask(int bits)
\brief creates a nettqmask from a specified number of bits
/** \fn unsigned long int prefix2mask(int bits)
\brief creates a netmask from a specified number of bits
This function converts a prefix length to a nettqmask. As CIDR (classless
This function converts a prefix length to a netmask. As CIDR (classless
internet domain internet domain routing) has taken off, more an more IP
addresses are being specified in the format address/prefix
(i.e. 192.168.2.3/24, with a corresponding nettqmask 255.255.255.0). If you
need to see what nettqmask corresponds to the prefix part of the address, this
is the function. See also \ref tqmask2prefix.
(i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you
need to see what netmask corresponds to the prefix part of the address, this
is the function. See also \ref mask2prefix.
\param prefix is the number of bits to create a tqmask for.
\return a network tqmask, in network byte order.
\param prefix is the number of bits to create a mask for.
\return a network mask, in network byte order.
*/
unsigned long int KAddressValidator::prefix2tqmask(int prefix){
unsigned long int KAddressValidator::prefix2mask(int prefix){
return htonl(~((2 << (31 - prefix)) - 1));
}
/** \fn int tqmask2prefix(unsigned long int tqmask)
\brief calculates the number of bits masked off by a nettqmask.
/** \fn int mask2prefix(unsigned long int mask)
\brief calculates the number of bits masked off by a netmask.
This function calculates the significant bits in an IP address as specified by
a nettqmask. See also \ref prefix2tqmask.
a netmask. See also \ref prefix2mask.
\param tqmask is the nettqmask, specified as an unsigned long integer in network byte order.
\param mask is the netmask, specified as an unsigned long integer in network byte order.
\return the number of significant bits. */
int KAddressValidator::tqmask2prefix(unsigned long int tqmask){
int KAddressValidator::mask2prefix(unsigned long int mask){
unsigned i;
int count = IPBITS;
for (i = 0; i < IPBITS; i++)
{
if (!(ntohl(tqmask) & ((2 << i) - 1)))
if (!(ntohl(mask) & ((2 << i) - 1)))
count--;
}
@ -170,7 +170,7 @@ int KAddressValidator::tqmask2prefix(unsigned long int tqmask){
\return the calculated broadcast address for the network, in network byte
order. */
unsigned long int KAddressValidator::calc_broadcast(unsigned long int addr, int prefix){
return (addr & prefix2tqmask(prefix)) | ~prefix2tqmask(prefix);
return (addr & prefix2mask(prefix)) | ~prefix2mask(prefix);
}
/** \fn unsigned long int calc_network(unsigned long int addr, int prefix)
\brief calculates the network address for a specified address and prefix.
@ -180,25 +180,25 @@ unsigned long int KAddressValidator::calc_broadcast(unsigned long int addr, int
\return the base address of the network that addr is associated with, in
network byte order. */
unsigned long int KAddressValidator::calc_network(unsigned long int addr, int prefix){
return (addr & prefix2tqmask(prefix));
return (addr & prefix2mask(prefix));
}
/** Is a wrapper function to calc_network that receives the IP address and netstqmask as TQString and
/** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and
returns the network value also as a TQString, or NULL if it couldn't be calculated. */
TQString KAddressValidator::calculateNetwork(TQString addr,TQString nettqmask){
struct in_addr _addr, _nettqmask, _network;
TQString KAddressValidator::calculateNetwork(TQString addr,TQString netmask){
struct in_addr _addr, _netmask, _network;
int prefix = 0;
TQString s;
if (addr.isNull() || nettqmask.isNull())
if (addr.isNull() || netmask.isNull())
return NULL; //bad address
if (!inet_pton(AF_INET,addr.latin1(),&_addr))
return NULL; //bad address
else
{
if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask))
if (!inet_pton(AF_INET,netmask.latin1(),&_netmask))
return NULL; //bad address
else
{
prefix = tqmask2prefix(_nettqmask.s_addr);
prefix = mask2prefix(_netmask.s_addr);
_network.s_addr = calc_network(_addr.s_addr, prefix);
char * char_network = new char[20];
if (!inet_ntop(AF_INET,&_network,char_network,20))
@ -210,23 +210,23 @@ TQString KAddressValidator::calculateNetwork(TQString addr,TQString nettqmask){
return s;
}
/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask as TQString and
/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and
returns the broadcast value also as a TQString, or NULL if it couldn't be calculated. */
TQString KAddressValidator::calculateBroadcast(TQString addr, TQString nettqmask){
struct in_addr _addr, _nettqmask, _network;
TQString KAddressValidator::calculateBroadcast(TQString addr, TQString netmask){
struct in_addr _addr, _netmask, _network;
int prefix = 0;
TQString s;
if (addr.isNull() || nettqmask.isNull())
if (addr.isNull() || netmask.isNull())
return NULL; //bad address
if (!inet_pton(AF_INET,addr.latin1(),&_addr))
return NULL; //bad address
else
{
if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask))
if (!inet_pton(AF_INET,netmask.latin1(),&_netmask))
return NULL; //bad address
else
{
prefix = tqmask2prefix(_nettqmask.s_addr);
prefix = mask2prefix(_netmask.s_addr);
_network.s_addr = calc_broadcast(_addr.s_addr, prefix);
char * char_network = new char[20];
if (!inet_ntop(AF_INET,&_network,char_network,20))

38
knetworkconf/knetworkconf/kaddressvalidator.h
Unescape Escape View File

@ -55,19 +55,19 @@ public:
~KAddressValidator();
/** Validates if the address written by the user is a valid one. Return true if it is and false if not. */
static bool isValidIPAddress(TQString addr);
/** Validates if the Nettqmask written by the user is a valid one. Return true if it is and false if not. */
/** Validates if the Netmask written by the user is a valid one. Return true if it is and false if not. */
static bool isNetmaskValid(TQString addr);
/** Validates if the Network written by the user is a valid one. Return true if it is and false if not. */
static bool isNetworkValid(const TQString &addr);
/** Validates if the Broadcast written by the user is a valid one. Return true if it is and false if not. */
static bool isBroadcastValid(TQString addr);
/** Is a wrapper function to calc_network that receives the IP address and netstqmask as TQString and
/** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and
returns the network value also as a TQString, or NULL if it couldn't be calculated. */
static TQString calculateNetwork(TQString addr,TQString nettqmask);
/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask as TQString and
static TQString calculateNetwork(TQString addr,TQString netmask);
/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and
returns the broadcast value also as a TQString, or NULL if it couldn't be calculated. */
static TQString calculateBroadcast(TQString addr, TQString nettqmask);
static TQString calculateBroadcast(TQString addr, TQString netmask);
private: // Private methods
/** \fn unsigned long int calc_broadcast(unsigned long int addr, int prefix)
@ -88,29 +88,29 @@ private: // Private methods
\return the base address of the network that addr is associated with, in
network byte order. */
static unsigned long int calc_network(unsigned long int addr, int prefix);
/** \fn unsigned long int prefix2tqmask(int bits)
\brief creates a nettqmask from a specified number of bits
/** \fn unsigned long int prefix2mask(int bits)
\brief creates a netmask from a specified number of bits
This function converts a prefix length to a nettqmask. As CIDR (classless
This function converts a prefix length to a netmask. As CIDR (classless
internet domain internet domain routing) has taken off, more an more IP
addresses are being specified in the format address/prefix
(i.e. 192.168.2.3/24, with a corresponding nettqmask 255.255.255.0). If you
need to see what nettqmask corresponds to the prefix part of the address, this
is the function. See also \ref tqmask2prefix.
(i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you
need to see what netmask corresponds to the prefix part of the address, this
is the function. See also \ref mask2prefix.
\param prefix is the number of bits to create a tqmask for.
\return a network tqmask, in network byte order.
\param prefix is the number of bits to create a mask for.
\return a network mask, in network byte order.
*/
static unsigned long int prefix2tqmask(int prefix);
/** \fn int tqmask2prefix(unsigned long int tqmask)
\brief calculates the number of bits masked off by a nettqmask.
static unsigned long int prefix2mask(int prefix);
/** \fn int mask2prefix(unsigned long int mask)
\brief calculates the number of bits masked off by a netmask.
This function calculates the significant bits in an IP address as specified by
a nettqmask. See also \ref prefix2tqmask.
a netmask. See also \ref prefix2mask.
\param tqmask is the nettqmask, specified as an unsigned long integer in network byte order.
\param mask is the netmask, specified as an unsigned long integer in network byte order.
\return the number of significant bits. */
static int tqmask2prefix(unsigned long int tqmask);
static int mask2prefix(unsigned long int mask);
};
#endif

26
knetworkconf/knetworkconf/knetworkconf.cpp
Unescape Escape View File

@ -19,7 +19,7 @@
#include "knetworkconf.h"
KNetworkConf::KNetworkConf(TQWidget *tqparent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(tqparent, name)
KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name)
{
netInfo = 0L;
makeButtonsResizeable();
@ -245,7 +245,7 @@ void KNetworkConf::configureDeviceSlot(){
configDlg.addDlg->rbBootProtoManual->setChecked(false);
configDlg.addDlg->rbBootProtoAuto->setChecked(true);
configDlg.addDlg->kleIPAddress->setEnabled(false);
configDlg.addDlg->kcbNettqmask->setEnabled(false);
configDlg.addDlg->kcbNetmask->setEnabled(false);
configDlg.kpbAdvanced->setEnabled(false);
}
else if (dev->getBootProto().lower() == "bootp")
@ -266,12 +266,12 @@ void KNetworkConf::configureDeviceSlot(){
if (!dev->getBroadcast().isEmpty())
advancedOptions->kleBroadcast->setText(dev->getBroadcast());
else
advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNettqmask()));
advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNetmask()));
advancedOptions->kleGateway->setText(dev->getGateway());
if (!dev->getNettqmask().isEmpty())
configDlg.addDlg->kcbNettqmask->setCurrentText(dev->getNettqmask());
if (!dev->getNetmask().isEmpty())
configDlg.addDlg->kcbNetmask->setCurrentText(dev->getNetmask());
if (readOnly)
{
@ -305,7 +305,7 @@ void KNetworkConf::configureDeviceSlot(){
dev->setBootProto("none");
}
//If the selected boot protocol is dhcp or bootp (Auto), then we don't need the
//past IP address, nettqmask, network and broadcast, as a new one will be assigned by
//past IP address, netmask, network and broadcast, as a new one will be assigned by
//the dhcp server.
else if (configDlg.addDlg->rbBootProtoAuto->isChecked())
{
@ -314,7 +314,7 @@ void KNetworkConf::configureDeviceSlot(){
dev->setIpAddress("");
configDlg.addDlg->kleIPAddress->setText("");
dev->setGateway("");
dev->setNettqmask("");
dev->setNetmask("");
dev->setNetwork("");
dev->setBroadcast("");
}
@ -326,7 +326,7 @@ void KNetworkConf::configureDeviceSlot(){
if (valuesChanged(dev,
configDlg.addDlg->kcbAutoBootProto->currentText(),
configDlg.addDlg->kcbNettqmask->currentText(),
configDlg.addDlg->kcbNetmask->currentText(),
configDlg.addDlg->kleIPAddress->text(),
advancedOptions->kleGateway->text(),
configDlg.addDlg->kcbstartAtBoot->isChecked(),
@ -335,12 +335,12 @@ void KNetworkConf::configureDeviceSlot(){
{
dev->setIpAddress(configDlg.addDlg->kleIPAddress->text().stripWhiteSpace());
dev->setGateway(advancedOptions->kleGateway->text().stripWhiteSpace());
dev->setNettqmask(configDlg.addDlg->kcbNettqmask->currentText().stripWhiteSpace());
TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace());
dev->setNetmask(configDlg.addDlg->kcbNetmask->currentText().stripWhiteSpace());
TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace());
dev->setNetwork(network);
TQString broadcast = advancedOptions->kleBroadcast->text().stripWhiteSpace();
if (broadcast.isEmpty())
broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace());
broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace());
dev->setBroadcast(broadcast);
dev->setDescription(advancedOptions->kleDescription->text());
@ -789,14 +789,14 @@ TQStringList KNetworkConf::getDeviceList(){
/** No descriptions */
bool KNetworkConf::valuesChanged(KNetworkInterface *dev,
TQString bootProto,
TQString nettqmask,
TQString netmask,
TQString ipAddr,
TQString gateway,
bool onBoot,
TQString desc,
TQString broadcast){
if ((dev->getBootProto() != bootProto) ||
(dev->getNettqmask() != nettqmask) ||
(dev->getNetmask() != netmask) ||
(dev->getIpAddress() != ipAddr) ||
(dev->getGateway() != gateway) ||
((dev->getOnBoot() == "yes") && !(onBoot)) ||

4
knetworkconf/knetworkconf/knetworkconf.h
Unescape Escape View File

@ -79,7 +79,7 @@ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface
TQ_OBJECT
public:
/** construtor */
KNetworkConf(TQWidget* tqparent=0, const char *name=0);
KNetworkConf(TQWidget* parent=0, const char *name=0);
/** destructor */
~KNetworkConf();
/** Puts the application in read-only mode. This happens when the user runing the application isn't root. */
@ -165,7 +165,7 @@ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface
virtual void removeServerSlot();
bool valuesChanged(KNetworkInterface *dev,
TQString bootProto,
TQString nettqmask,
TQString netmask,
TQString ipAddr,
TQString gateway,
bool onBoot,

22
knetworkconf/knetworkconf/knetworkconfigparser.cpp
Unescape Escape View File

@ -142,8 +142,8 @@ void KNetworkConfigParser::readListIfacesSlot(){
originalDevice->setIpAddress(tempDevice->getIpAddress());
if (!tempDevice->getMacAddress().isEmpty())
originalDevice->setMacAddress(tempDevice->getMacAddress());
if (!tempDevice->getNettqmask().isEmpty())
originalDevice->setNettqmask(tempDevice->getNettqmask());
if (!tempDevice->getNetmask().isEmpty())
originalDevice->setNetmask(tempDevice->getNetmask());
if (!tempDevice->getNetwork().isEmpty())
originalDevice->setNetwork(tempDevice->getNetwork());
}
@ -299,7 +299,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
procSaveNetworkInfo->addArgument( "--set" );
// KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal
KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)tqparent(), 0, true);
KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true);
dialog->setCaption(i18n("Reloading Network"));
dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
dialog->show();
@ -410,11 +410,11 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo
t = doc->createTextNode( device->getBroadcast() );
innerTag.appendChild( t );
}
if (!device->getNettqmask().isEmpty())
if (!device->getNetmask().isEmpty())
{
innerTag = doc->createElement( "nettqmask" );
innerTag = doc->createElement( "netmask" );
configurationTag.appendChild( innerTag );
t = doc->createTextNode( device->getNettqmask() );
t = doc->createTextNode( device->getNetmask() );
innerTag.appendChild( t );
}
if (!device->getNetwork().isEmpty())
@ -677,11 +677,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
if (!e.text().isEmpty())
tempDevice->setGateway(e.text());
}
else if ( configNodeName == "nettqmask" || configNodeName == "tqmask")
else if ( configNodeName == "netmask" || configNodeName == "mask")
{
TQDomElement e = configNode.toElement();
if (!e.text().isEmpty())
tempDevice->setNettqmask(e.text());
tempDevice->setNetmask(e.text());
}
else if ( configNodeName == "network" )
{
@ -707,11 +707,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
if (!e.text().isEmpty())
tempDevice->setIpAddress(e.text());
}
else if ( nodeName == "tqmask")
else if ( nodeName == "mask")
{
TQDomElement e = node.toElement();
if (!e.text().isEmpty())
tempDevice->setNettqmask(e.text());
tempDevice->setNetmask(e.text());
}
else if ( nodeName == "bdcast")
{
@ -769,7 +769,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp"))
{
tempDevice->setIpAddress("");
tempDevice->setNettqmask("");
tempDevice->setNetmask("");
tempDevice->setNetwork("");
tempDevice->setBroadcast("");
}

4
knetworkconf/knetworkconf/knetworkconfmodule.cpp
Unescape Escape View File

@ -23,8 +23,8 @@
KNetworkConfModule::KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/)
: KCModule(tqparent,name)
KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/)
: KCModule(parent,name)
{
TQVBoxLayout *top = new TQVBoxLayout(this);

2
knetworkconf/knetworkconf/knetworkconfmodule.h
Unescape Escape View File

@ -28,7 +28,7 @@ class KNetworkConfModule : public KCModule
TQ_OBJECT
public:
KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/);
KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/);
~KNetworkConfModule();
void load();

8
knetworkconf/knetworkconf/knetworkinterface.cpp
Unescape Escape View File

@ -34,8 +34,8 @@ TQString KNetworkInterface::getDeviceName(){
TQString KNetworkInterface::getIpAddress(){
return ipAddress;
}
TQString KNetworkInterface::getNettqmask(){
return nettqmask;
TQString KNetworkInterface::getNetmask(){
return netmask;
}
TQString KNetworkInterface::getNetwork(){
return network;
@ -59,8 +59,8 @@ void KNetworkInterface::setDeviceName(const TQString &deviceName){
void KNetworkInterface::setIpAddress(const TQString &ipAddress){
KNetworkInterface::ipAddress = ipAddress;
}
void KNetworkInterface::setNettqmask(const TQString &nettqmask){
KNetworkInterface::nettqmask = nettqmask;
void KNetworkInterface::setNetmask(const TQString &netmask){
KNetworkInterface::netmask = netmask;
}
void KNetworkInterface::setNetwork(const TQString &network){
KNetworkInterface::network = network;

8
knetworkconf/knetworkconf/knetworkinterface.h
Unescape Escape View File

@ -33,7 +33,7 @@ class KNetworkInterface {
TQString getBroadcast();
TQString getDeviceName();
TQString getIpAddress();
TQString getNettqmask();
TQString getNetmask();
TQString getNetwork();
TQString getOnBoot();
TQString getGateway();
@ -41,7 +41,7 @@ class KNetworkInterface {
void setBroadcast(const TQString &broadcast);
void setDeviceName(const TQString &deviceName);
void setIpAddress(const TQString &ipAddress);
void setNettqmask(const TQString &nettqmask);
void setNetmask(const TQString &netmask);
void setNetwork(const TQString &network);
void setOnBoot(const TQString &onBoot);
void setGateway(const TQString &gateway);
@ -61,8 +61,8 @@ class KNetworkInterface {
TQString bootProto;
/** IPv4 address of the interface. */
TQString ipAddress;
/** The Nettqmask. */
TQString nettqmask;
/** The Netmask. */
TQString netmask;
/** The network. */
TQString network;
/** The broadcast. */

4
knetworkconf/knetworkconf/kprofileslistviewtooltip.h
Unescape Escape View File

@ -28,7 +28,7 @@
class KProfilesListViewToolTip : public TQToolTip
{
public:
KProfilesListViewToolTip(TQListView* tqparent);
KProfilesListViewToolTip(TQListView* parent);
void setProfiles(TQPtrList<KNetworkInfo> profiles_);
~KProfilesListViewToolTip();
@ -47,7 +47,7 @@ inline void KProfilesListViewToolTip::setProfiles(TQPtrList<KNetworkInfo> profil
profiles = profiles_;
}
inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* tqparent ):TQToolTip( tqparent->viewport() ), listView( tqparent ) {}
inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* parent ):TQToolTip( parent->viewport() ), listView( parent ) {}
inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
{

4
knetworkconf/knetworkconf/main.cpp
Unescape Escape View File

@ -40,10 +40,10 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo
extern "C"
{
KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *tqparent, const char *name)
KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *parent, const char *name)
{
KGlobal::locale()->insertCatalogue("knetworkconf");
return new KNetworkConfModule(tqparent, name);
return new KNetworkConfModule(parent, name);
}
}

10
kpackage/fbsdInterface.cpp
Unescape Escape View File

@ -577,11 +577,11 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
}
bsdPortsIndexItem::bsdPortsIndexItem(fbsdInterface *tqparent, char *desc, bool binaries, const TQString &dname) : bin(binaries), port(!binaries), installed(false) {
bsdPortsIndexItem::bsdPortsIndexItem(fbsdInterface *parent, char *desc, bool binaries, const TQString &dname) : bin(binaries), port(!binaries), installed(false) {
fields = TQStringList::split('|', desc, TRUE);
TQString name = fields[NAME];
bsdPortsIndexItem *port = tqparent->ports[name];
bsdPortsIndexItem *port = parent->ports[name];
if (port) {
port->bin = port->bin || bin;
port->port = port->port || port;
@ -600,7 +600,7 @@ bsdPortsIndexItem::bsdPortsIndexItem(fbsdInterface *tqparent, char *desc, bool b
}
void bsdPortsIndexItem::processFile(fbsdInterface *tqparent, const TQString &fname, bool binaries, const TQString &dname) {
void bsdPortsIndexItem::processFile(fbsdInterface *parent, const TQString &fname, bool binaries, const TQString &dname) {
// Read the file in to a buffer and null terminate it.
struct stat s;
@ -627,11 +627,11 @@ void bsdPortsIndexItem::processFile(fbsdInterface *tqparent, const TQString &fna
// Go through each line and create a new bsdPortsIndexItem.
char *line = strtok(index, "\n");
while (line != 0) {
bsdPortsIndexItem *i = new bsdPortsIndexItem(tqparent, line, binaries, dname + "/All");
bsdPortsIndexItem *i = new bsdPortsIndexItem(parent, line, binaries, dname + "/All");
if (i->fields[NAME].isEmpty()) {
delete i;
} else {
tqparent->ports.insert(i->fields[NAME] , i);
parent->ports.insert(i->fields[NAME] , i);
}
line = strtok(0, "\n");
}

4
kpackage/fbsdInterface.h
Unescape Escape View File

@ -118,7 +118,7 @@ public:
*
* dname is the name of the base directory of this ports/packages tree.
*/
bsdPortsIndexItem(fbsdInterface *tqparent, char *desc, bool binaries, const TQString &dname);
bsdPortsIndexItem(fbsdInterface *parent, char *desc, bool binaries, const TQString &dname);
/** @short true if this has a binary packages. */
bool bin;
@ -146,7 +146,7 @@ public:
* binaries should be true if the file is an index for packages, false for ports.
* dname is the base directory.
*/
static void processFile(fbsdInterface *tqparent, const TQString &fname, bool binaries, const TQString &dname);
static void processFile(fbsdInterface *parent, const TQString &fname, bool binaries, const TQString &dname);
private:
unsigned int name_hash;

4
kpackage/findf.cpp
Unescape Escape View File

@ -43,8 +43,8 @@
extern pkgInterface *kpinterface[];
extern Opts *opts;
FindF::FindF(TQWidget *tqparent)
: KDialogBase(tqparent, "find_file", false,
FindF::FindF(TQWidget *parent)
: KDialogBase(parent, "find_file", false,
i18n("Find File"),
User1 | Close, User1, true,
KGuiItem(i18n("&Find"),"filefind"))

2
kpackage/findf.h
Unescape Escape View File

@ -56,7 +56,7 @@ class FindF : public KDialogBase
public:
FindF ( TQWidget *tqparent = 0);
FindF ( TQWidget *parent = 0);
~FindF();
void resizeEvent(TQResizeEvent *);
void dropEvent(TQDropEvent *);

4
kpackage/gentooInterface.cpp
Unescape Escape View File

@ -39,7 +39,7 @@
Should we care about the world-file?
Read masked packages from /usr/portage/profiles/package.tqmask
Read masked packages from /usr/portage/profiles/package.mask
Use flags and CFLAGS?
@ -69,7 +69,7 @@ Gentoo::Gentoo()
archesPossible << "~x86" << "x86";
portageDir="/usr/portage/";
TQFile f(portageDir+"profiles/package.tqmask");
TQFile f(portageDir+"profiles/package.mask");
if (f.open(IO_ReadOnly))
{
TQTextStream stream( &f );

8
kpackage/kpTerm.cpp
Unescape Escape View File

@ -38,8 +38,8 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
kpTerm::kpTerm(kpPty *pt, TQWidget * tqparent, const char * name ) :
TQTextEdit(tqparent,name)
kpTerm::kpTerm(kpPty *pt, TQWidget * parent, const char * name ) :
TQTextEdit(parent,name)
{
pty = pt;
setFont(KGlobalSettings::fixedFont());
@ -169,8 +169,8 @@ void kpTerm::slotResult(TQStringList &rlist, int ret)
// Dialog window for password prompt
//
//////////////////////////////////////////////////////////////////////////////
kpRun::kpRun( TQWidget *tqparent)
: KDialogBase(tqparent, "kpRun", true, TQString(),
kpRun::kpRun( TQWidget *parent)
: KDialogBase(parent, "kpRun", true, TQString(),
Cancel, Cancel, true )
{
TQVBox *page = makeVBoxMainWidget();

4
kpackage/kpTerm.h
Unescape Escape View File

@ -48,7 +48,7 @@ class kpTerm: public TQTextEdit
TQ_OBJECT
public:
kpTerm(kpPty *pt, TQWidget * tqparent=0, const char * name=0);
kpTerm(kpPty *pt, TQWidget * parent=0, const char * name=0);
void keyPressEvent ( TQKeyEvent * e );
bool run(const TQString &cmd, TQStringList &r);
void doConnect();
@ -76,7 +76,7 @@ class kpRun: public KDialogBase
TQ_OBJECT
public:
kpRun(TQWidget *tqparent = 0);
kpRun(TQWidget *parent = 0);
bool run(TQString cmd, TQString title);
void addText(const TQStringList &ret);

4
kpackage/kpackage.cpp
Unescape Escape View File

@ -302,8 +302,8 @@ bool KPKG::queryClose() {
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *tqparent)
: TQWidget(tqparent)
KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *parent)
: TQWidget(parent)
{
// Save copy of config

2
kpackage/kpackage.h
Unescape Escape View File

@ -67,7 +67,7 @@ class KPACKAGE : public TQWidget
///////////// METHODS ------------------------------------------------------
public:
KPACKAGE(KConfig *_config, TQWidget *tqparent);
KPACKAGE(KConfig *_config, TQWidget *parent);
// Constructor
~KPACKAGE();

14
kpackage/kplview.cpp
Unescape Escape View File

@ -43,8 +43,8 @@
#define MPOS 1
KpTreeList::KpTreeList( TQWidget *tqparent ) :
KListView (tqparent)
KpTreeList::KpTreeList( TQWidget *parent ) :
KListView (parent)
{
markPkg = 0;
setShowSortIndicator(true);
@ -458,7 +458,7 @@ KpTreeListItem *KpTreeList::changePack(KpTreeListItem *searchResult, bool push)
TQListViewItem *i;
i = searchResult;
while ((i = i->tqparent())) {
while ((i = i->parent())) {
i->setOpen(TRUE);
}
if (push) {
@ -571,14 +571,14 @@ void KpTreeList::readTreeConfig()
//////////////////////////////////////////////////////////////////////////////
KpTreeListItem::KpTreeListItem( TQListViewItem *tqparent, packageInfo* pinfo,
KpTreeListItem::KpTreeListItem( TQListViewItem *parent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1, TQString label2 ,
TQString label3 , TQString label4 ,
TQString label5 , TQString label6 ,
TQString label7 , TQString label8
) : TQListViewItem(tqparent, label1, label2, label3, label4, label5,
) : TQListViewItem(parent, label1, label2, label3, label4, label5,
label6, label7, label8)
{
info = pinfo;
@ -588,13 +588,13 @@ KpTreeListItem::KpTreeListItem( TQListViewItem *tqparent, packageInfo* pinfo,
setPixmap(1,info->interface->markUnInst);
}
KpTreeListItem::KpTreeListItem( KListView *tqparent, packageInfo* pinfo,
KpTreeListItem::KpTreeListItem( KListView *parent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1, TQString label2 ,
TQString label3 , TQString label4 ,
TQString label5 , TQString label6 ,
TQString label7 , TQString label8
) : TQListViewItem(tqparent, label1, label2, label3, label4, label5,
) : TQListViewItem(parent, label1, label2, label3, label4, label5,
label6, label7, label8)
{
info = pinfo;

6
kpackage/kplview.h
Unescape Escape View File

@ -53,7 +53,7 @@ class KpTreeList: public KListView
TQ_OBJECT
public:
KpTreeList ( TQWidget * tqparent = 0);
KpTreeList ( TQWidget * parent = 0);
void contentsMousePressEvent ( TQMouseEvent * e );
@ -156,7 +156,7 @@ signals:
class KpTreeListItem : public TQListViewItem
{
public:
KpTreeListItem( TQListViewItem *tqparent, packageInfo* pinfo,
KpTreeListItem( TQListViewItem *parent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1 = 0, TQString label2 = 0,
TQString label3 = 0, TQString label4 = 0,
@ -164,7 +164,7 @@ public:
TQString label7 = 0, TQString label8 = 0);
KpTreeListItem( KListView *tqparent, packageInfo* pinfo,
KpTreeListItem( KListView *parent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1 = 0, TQString label2 = 0,
TQString label3 = 0, TQString label4 = 0,

8
kpackage/managementWidget.cpp
Unescape Escape View File

@ -52,8 +52,8 @@
extern Opts *opts;
KpListViewSearchLine::KpListViewSearchLine(TQWidget *tqparent, KpTreeList *listView)
:KListViewSearchLine(tqparent, listView)
KpListViewSearchLine::KpListViewSearchLine(TQWidget *parent, KpTreeList *listView)
:KListViewSearchLine(parent, listView)
{
list = listView;
}
@ -72,8 +72,8 @@ void KpListViewSearchLine::updateSearch(const TQString &s)
// constructor -- initialise variables
managementWidget::managementWidget(TQWidget *tqparent)
: TQFrame(tqparent)
managementWidget::managementWidget(TQWidget *parent)
: TQFrame(parent)
{
install_action = 0;
uninstall_action = 0;

4
kpackage/managementWidget.h
Unescape Escape View File

@ -75,7 +75,7 @@ class KpListViewSearchLine : public KListViewSearchLine
public:
KpListViewSearchLine(TQWidget *tqparent, KpTreeList *listView);
KpListViewSearchLine(TQWidget *parent, KpTreeList *listView);
~KpListViewSearchLine();
@ -94,7 +94,7 @@ class managementWidget : public TQFrame
///////////// METHODS ------------------------------------------------------
public:
managementWidget(TQWidget *tqparent);
managementWidget(TQWidget *parent);
// Constructor
~managementWidget();

4
kpackage/options.cpp
Unescape Escape View File

@ -53,8 +53,8 @@
extern Opts *opts;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
Options::Options(TQWidget *tqparent)
: KDialogBase(Tabbed, i18n("Options"), Ok | Cancel, Ok, tqparent, 0, false){
Options::Options(TQWidget *parent)
: KDialogBase(Tabbed, i18n("Options"), Ok | Cancel, Ok, parent, 0, false){
fRemote = false;

2
kpackage/options.h
Unescape Escape View File

@ -66,7 +66,7 @@ class Options : public KDialogBase
public:
Options ( TQWidget *tqparent = 0);
Options ( TQWidget *parent = 0);
~Options();
void restore();

10
kpackage/packageDisplay.cpp
Unescape Escape View File

@ -55,8 +55,8 @@
extern Opts *opts;
// constructor
packageDisplayWidget::packageDisplayWidget(TQWidget *tqparent)
: TQTabWidget(tqparent)
packageDisplayWidget::packageDisplayWidget(TQWidget *parent)
: TQTabWidget(parent)
{
// Initially we're not dealing with any package
package=NULL;
@ -363,7 +363,7 @@ void packageDisplayWidget::updateFileList()
kpackage->setPercent(100);
}
kpFileList::kpFileList(TQWidget* tqparent, packageDisplayWidget* tqparent2) : KListView(tqparent)
kpFileList::kpFileList(TQWidget* parent, packageDisplayWidget* parent2) : KListView(parent)
{
hide();
addColumn("name");
@ -372,9 +372,9 @@ void packageDisplayWidget::updateFileList()
this, TQT_SLOT( openContext(KListView *, TQListViewItem *, const TQPoint &)) );
FileListMenu = new KPopupMenu();
openwith = FileListMenu->insertItem(i18n("&Open With..."),tqparent2,TQT_SLOT(__openBindingWith()));
openwith = FileListMenu->insertItem(i18n("&Open With..."),parent2,TQT_SLOT(__openBindingWith()));
pkDisplay = tqparent2;
pkDisplay = parent2;
}

4
kpackage/packageDisplay.h
Unescape Escape View File

@ -61,7 +61,7 @@ class kpFileList : public KListView
public:
kpFileList(TQWidget* tqparent, packageDisplayWidget* tqparent2);
kpFileList(TQWidget* parent, packageDisplayWidget* parent2);
TQString item2Path(TQListViewItem *it);
@ -91,7 +91,7 @@ class packageDisplayWidget : public TQTabWidget
friend class kpFileList;
///////////// METHODS ------------------------------------------------------
public:
packageDisplayWidget(TQWidget *tqparent=0);
packageDisplayWidget(TQWidget *parent=0);
// Constructor
~packageDisplayWidget();

20
kpackage/packageInfo.cpp
Unescape Escape View File

@ -391,7 +391,7 @@ bool packageInfo::display(int treeType)
KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
{
KpTreeListItem *search = tree->firstChild(), *tqparent=NULL, *child=NULL;
KpTreeListItem *search = tree->firstChild(), *parent=NULL, *child=NULL;
TQString qtmp, tmp;
bool doit = FALSE;
@ -410,17 +410,17 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
KpTreeListItem *group;
if( search && (group=findGroup(*it, search)) ) {
tqparent = group;
tqparent->setOpen(TRUE);
parent = group;
parent->setOpen(TRUE);
search = group->firstChild();
} else {
if (tqparent) {
group = new KpTreeListItem(tqparent, 0, interface->folder, *it);
if (parent) {
group = new KpTreeListItem(parent, 0, interface->folder, *it);
} else {
group = new KpTreeListItem(tree, 0, interface->folder, *it);
}
tqparent = group;
tqparent->setOpen(TRUE);
parent = group;
parent->setOpen(TRUE);
search = NULL;
}
cnt++;
@ -480,13 +480,13 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
if (child) {
item = new KpTreeListItem(child, this, pic, tmp, "", summary, sz, ver, over);
} else {
item = new KpTreeListItem(tqparent, this, pic, tmp, "", summary, sz, ver, over);
item = new KpTreeListItem(parent, this, pic, tmp, "", summary, sz, ver, over);
}
if (insertI) {
tqparent->setOpen(TRUE);
parent->setOpen(TRUE);
} else {
tqparent->setOpen(FALSE);
parent->setOpen(FALSE);
}
return item;

4
kpackage/packageProperties.cpp
Unescape Escape View File

@ -37,8 +37,8 @@
#include "managementWidget.h"
packagePropertiesWidget::packagePropertiesWidget
(TQWidget *tqparent)
: KTextBrowser(tqparent)
(TQWidget *parent)
: KTextBrowser(parent)
{
TQDict<TQString> trl(53);
TQStringList pList();

2
kpackage/packageProperties.h
Unescape Escape View File

@ -56,7 +56,7 @@ class packagePropertiesWidget : public KTextBrowser
///////////// METHODS ------------------------------------------------------
public:
packagePropertiesWidget(TQWidget *tqparent=0);
packagePropertiesWidget(TQWidget *parent=0);
// constructor
~packagePropertiesWidget();

4
kpackage/pkgInterface.cpp
Unescape Escape View File

@ -166,11 +166,11 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
if ( fi->fileName() != TQString::tqfromLatin1(".") &&
fi->fileName() != TQString::tqfromLatin1("..") )
{
// not current dir and not tqparent dir
// not current dir and not parent dir
// -> recursive call:
listDir( pki, dir + "/" + fi->fileName(), dir + "/" + fi->fileName(), subdirs );
} else {
// current dir or tqparent dir
// current dir or parent dir
// -> notihng to do
;
}

12
kpackage/pkgOptions.cpp
Unescape Escape View File

@ -47,8 +47,8 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *tqparent, const TQString &caption)
: KDialog(tqparent,0,TRUE)
pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *parent, const TQString &caption)
: KDialog(parent,0,TRUE)
{
// setFrameStyle(TQFrame::Raised | TQFrame::Panel);
@ -342,8 +342,8 @@ void pkgOptions::getKeep()
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
pkgOptionsI::pkgOptionsI(pkgInterface *pkg, TQWidget *tqparent):
pkgOptions(pkg, tqparent, i18n("Install"))
pkgOptionsI::pkgOptionsI(pkgInterface *pkg, TQWidget *parent):
pkgOptions(pkg, parent, i18n("Install"))
{
insType = i18n("Install");
installer = TRUE;
@ -357,8 +357,8 @@ TQString pkgOptionsI::doPackages(int installFlags, TQPtrList<packageInfo> *p, bo
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
pkgOptionsU::pkgOptionsU(pkgInterface *pkg, TQWidget *tqparent):
pkgOptions(pkg, tqparent, i18n("Uninstall"))
pkgOptionsU::pkgOptionsU(pkgInterface *pkg, TQWidget *parent):
pkgOptions(pkg, parent, i18n("Uninstall"))
{
insType = i18n("Uninstall");
installer = FALSE;

6
kpackage/pkgOptions.h
Unescape Escape View File

@ -54,7 +54,7 @@ class pkgOptions : public KDialog
Q_OBJECT
TQ_OBJECT
public:
pkgOptions( pkgInterface *pki, TQWidget *tqparent=0, const TQString &caption=TQString());
pkgOptions( pkgInterface *pki, TQWidget *parent=0, const TQString &caption=TQString());
~pkgOptions();
bool setup(TQPtrList<packageInfo> *pl, const TQString &type);
@ -136,7 +136,7 @@ class pkgOptionsI: public pkgOptions
Q_OBJECT
TQ_OBJECT
public:
pkgOptionsI(pkgInterface *pkg, TQWidget *tqparent = 0);
pkgOptionsI(pkgInterface *pkg, TQWidget *parent = 0);
TQString doPackages(int installFlags, TQPtrList<packageInfo> *p, bool &test);
};
@ -147,7 +147,7 @@ class pkgOptionsU: public pkgOptions
Q_OBJECT
TQ_OBJECT
public:
pkgOptionsU(pkgInterface *pkg, TQWidget *tqparent = 0);
pkgOptionsU(pkgInterface *pkg, TQWidget *parent = 0);
TQString doPackages(int installFlags, TQPtrList<packageInfo> *p, bool &test);
};

4
kpackage/procbuf.cpp
Unescape Escape View File

@ -32,8 +32,8 @@
#include <tqlabel.h>
#include <kdebug.h>
Modal::Modal(TQString msg, TQWidget *tqparent, const char * name )
: KDialog( tqparent, name, TRUE )
Modal::Modal(TQString msg, TQWidget *parent, const char * name )
: KDialog( parent, name, TRUE )
{
TQLabel *line1 = new TQLabel(msg,this);
line1->tqsetAlignment(AlignCenter);

2
kpackage/procbuf.h
Unescape Escape View File

@ -39,7 +39,7 @@ class Modal : public KDialog {
Q_OBJECT
TQ_OBJECT
public:
Modal(TQString msg, TQWidget *tqparent, const char * name );
Modal(TQString msg, TQWidget *parent, const char * name );
void terminate();
};

4
kpackage/search.cpp
Unescape Escape View File

@ -35,8 +35,8 @@
#include <tqframe.h>
#include <tqgroupbox.h>
Search::Search(TQWidget *tqparent, const char * name)
: KDialogBase(tqparent, name, false,
Search::Search(TQWidget *parent, const char * name)
: KDialogBase(parent, name, false,
i18n("Find Package"),
User1 | Close, User1, true,
KGuiItem( i18n("&Find"), "find"))

2
kpackage/search.h
Unescape Escape View File

@ -50,7 +50,7 @@ class Search : public KDialogBase
public:
Search ( TQWidget *tqparent = 0, const char * name=0);
Search ( TQWidget *parent = 0, const char * name=0);
~Search();
private:

12
kpackage/updateLoc.cpp
Unescape Escape View File

@ -40,9 +40,9 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
apanel::apanel( TQWidget *tqparent,
apanel::apanel( TQWidget *parent,
const char * name )
: TQWidget( tqparent, name )
: TQWidget( parent, name )
{
puse = 0;
@ -99,8 +99,8 @@ void apanel::clear()
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
dpanel::dpanel( TQWidget *tqparent, const char * name )
: TQWidget( tqparent, name )
dpanel::dpanel( TQWidget *parent, const char * name )
: TQWidget( parent, name )
{
puse = 0;
psubdirs = 0;
@ -120,8 +120,8 @@ dpanel::dpanel( TQWidget *tqparent, const char * name )
}
dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
TQWidget *tqparent, const char * name )
: TQWidget( tqparent, name )
TQWidget *parent, const char * name )
: TQWidget( parent, name )
{
filter = Pfilter;
puse = 0;

6
kpackage/updateLoc.h
Unescape Escape View File

@ -63,9 +63,9 @@ class dpanel : public TQWidget
TQ_OBJECT
public:
dpanel(TQWidget *tqparent, const char * name = 0);
dpanel(TQWidget *parent, const char * name = 0);
dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
TQWidget *tqparent, const char * name = 0);
TQWidget *parent, const char * name = 0);
~dpanel();
@ -101,7 +101,7 @@ class apanel : public TQWidget
TQ_OBJECT
public:
apanel( TQWidget *tqparent, const char * name = 0 );
apanel( TQWidget *parent, const char * name = 0 );
~apanel();

4
ksysv/ActionList.cpp
Unescape Escape View File

@ -147,8 +147,8 @@ void CompoundAction::undo()
// ActionList //
//////////////////////////////////
ActionList::ActionList (TQObject* tqparent, const char* name)
: TQObject(tqparent, name)
ActionList::ActionList (TQObject* parent, const char* name)
: TQObject(parent, name)
{
setAutoDelete(false);
}

2
ksysv/ActionList.h
Unescape Escape View File

@ -109,7 +109,7 @@ class ActionList : public TQObject, private TQPtrStack<KSVAction>
TQ_OBJECT
public:
ActionList (TQObject* tqparent, const char* name);
ActionList (TQObject* parent, const char* name);
virtual ~ActionList ();
KSVAction* top () const { return TQPtrStack<KSVAction>::top(); }

18
ksysv/OldView.cpp
Unescape Escape View File

@ -72,8 +72,8 @@
#include "ActionList.h"
#include "TopWidget.h"
KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* tqparent, const char* name)
: TQSplitter (Qt::Vertical, tqparent, name),
KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* parent, const char* name)
: TQSplitter (Qt::Vertical, parent, name),
startRL (new KSVDragList*[ksv::runlevelNumber]),
stopRL (new KSVDragList*[ksv::runlevelNumber]),
conf(KSVConfig::self()),
@ -84,12 +84,12 @@ KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* tqparent, const c
{
setOpaqueResize( KGlobalSettings::opaqueResize() );
KXMLGUIFactory* factory = tqparent->factory();
mItemMenu = static_cast<KPopupMenu*> (factory->container ("item_menu", tqparent));
KXMLGUIFactory* factory = parent->factory();
mItemMenu = static_cast<KPopupMenu*> (factory->container ("item_menu", parent));
mItemMenu->insertTitle (i18n ("Runlevel Menu"), -1, 0);
mContextMenu = static_cast<KPopupMenu*> (factory->container ("list_menu", tqparent));
mContextMenu = static_cast<KPopupMenu*> (factory->container ("list_menu", parent));
mContextMenu->insertTitle (i18n ("Runlevel Menu"), -1, 0);
mScriptMenu = static_cast<KPopupMenu*> (factory->container ("script_menu", tqparent));
mScriptMenu = static_cast<KPopupMenu*> (factory->container ("script_menu", parent));
mScriptMenu->insertTitle (i18n ("Services Menu"), -1, 0);
mScroller = new KScroller (this);
@ -618,7 +618,7 @@ void KSVContent::stopService (const TQString& path)
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
// notify tqparent
// notify parent
emit sigRun(path + i18n(" stop"));
}
@ -644,7 +644,7 @@ void KSVContent::startService (const TQString& path)
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
// notify tqparent
// notify parent
emit sigRun(path + i18n(" start"));
}
@ -684,7 +684,7 @@ void KSVContent::restartService (const TQString& path)
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
// notify tqparent
// notify parent
emit sigRun(path + i18n(" restart"));
}

2
ksysv/OldView.h
Unescape Escape View File

@ -50,7 +50,7 @@ class KSVContent : public TQSplitter
TQ_OBJECT
public:
KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* tqparent = 0, const char* name = 0);
KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* parent = 0, const char* name = 0);
~KSVContent();
KSVDragList* getOrigin();

4
ksysv/PreferencesDialog.cpp
Unescape Escape View File

@ -28,9 +28,9 @@
#include "PreferencesDialog.h"
KSVPreferences::KSVPreferences (TQWidget* tqparent)
KSVPreferences::KSVPreferences (TQWidget* parent)
: KDialogBase (IconList, i18n("Configure"), Help|Ok|Apply|Cancel, Ok,
tqparent, "KSysV Preferences", true, true),
parent, "KSysV Preferences", true, true),
mConfig (KSVConfig::self())
{
setMinimumSize (tqsizeHint ());

2
ksysv/PreferencesDialog.h
Unescape Escape View File

@ -53,7 +53,7 @@ private slots:
private:
friend class KSVTopLevel;
KSVPreferences (TQWidget* tqparent);
KSVPreferences (TQWidget* parent);
void setConfig ();
bool checkPaths();
void reReadMessages();

8
ksysv/Properties.cpp
Unescape Escape View File

@ -21,9 +21,9 @@
#include "Data.h"
#include "Properties.h"
KSVServicePropertiesDialog::KSVServicePropertiesDialog (KSVData& data, TQWidget* tqparent)
KSVServicePropertiesDialog::KSVServicePropertiesDialog (KSVData& data, TQWidget* parent)
: KPropertiesDialog (KURL(data.filenameAndPath()),
tqparent, "KSVServicePropertiesDialog", true, false),
parent, "KSVServicePropertiesDialog", true, false),
mData (data)
{
KSVServicesPage* page = new KSVServicesPage (data, this);
@ -100,8 +100,8 @@ void KSVServicePropertiesDialog::doRestart ()
}
KSVEntryPropertiesDialog::KSVEntryPropertiesDialog (KSVData& data, TQWidget* tqparent)
: KPropertiesDialog (data.label(), tqparent, "KSVEntryPropertiesDialog", true),
KSVEntryPropertiesDialog::KSVEntryPropertiesDialog (KSVData& data, TQWidget* parent)
: KPropertiesDialog (data.label(), parent, "KSVEntryPropertiesDialog", true),
mData (data)
{
KSVEntryPage* page1 = new KSVEntryPage (data, this);

4
ksysv/Properties.h
Unescape Escape View File

@ -20,7 +20,7 @@ class KSVServicePropertiesDialog : public KPropertiesDialog
TQ_OBJECT
public:
KSVServicePropertiesDialog (KSVData& data, TQWidget* tqparent);
KSVServicePropertiesDialog (KSVData& data, TQWidget* parent);
virtual ~KSVServicePropertiesDialog ();
signals:
@ -46,7 +46,7 @@ class KSVEntryPropertiesDialog : public KPropertiesDialog
TQ_OBJECT
public:
KSVEntryPropertiesDialog (KSVData& data, TQWidget* tqparent);
KSVEntryPropertiesDialog (KSVData& data, TQWidget* parent);
virtual ~KSVEntryPropertiesDialog ();
signals:

4
ksysv/RunlevelAuthIcon.cpp
Unescape Escape View File

@ -15,8 +15,8 @@
#include <tqlabel.h>
RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString& runlevelPath,
TQWidget* tqparent, const char* name)
: KAuthIcon (tqparent, name),
TQWidget* parent, const char* name)
: KAuthIcon (parent, name),
mTimer (new TQTimer (this)),
mServicesInfo (new TQFileInfo (servicesPath)),
mRLInfo (new TQFileInfo* [ksv::runlevelNumber]),

2
ksysv/RunlevelAuthIcon.h
Unescape Escape View File

@ -15,7 +15,7 @@ class RunlevelAuthIcon : public KAuthIcon
public:
RunlevelAuthIcon (const TQString& scriptPath, const TQString& runlevelPath,
TQWidget* tqparent = 0L, const char* name = 0L);
TQWidget* parent = 0L, const char* name = 0L);
virtual ~RunlevelAuthIcon ();

4
ksysv/ServiceDlg.cpp
Unescape Escape View File

@ -28,8 +28,8 @@
#define MIN_SIZE(A) A->setMinimumSize(A->tqsizeHint())
ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
TQWidget* tqparent, const char* name)
: KDialogBase (tqparent, name, false, action, Apply|Close, Apply, true)
TQWidget* parent, const char* name)
: KDialogBase (parent, name, false, action, Apply|Close, Apply, true)
{
TQWidget* page = new TQWidget (this);

2
ksysv/ServiceDlg.h
Unescape Escape View File

@ -30,7 +30,7 @@ class ServiceDlg : public KDialogBase
public:
ServiceDlg (const TQString& action, const TQString& label,
TQWidget* tqparent = 0, const char* name = 0);
TQWidget* parent = 0, const char* name = 0);
virtual ~ServiceDlg();
int count() const;

4
ksysv/SpinBox.cpp
Unescape Escape View File

@ -7,8 +7,8 @@
#include "ksv_core.h"
#include "SpinBox.h"
KSVSpinBox::KSVSpinBox (TQWidget* tqparent, const char* name)
: TQSpinBox (0, 99, 1, tqparent, name),
KSVSpinBox::KSVSpinBox (TQWidget* parent, const char* name)
: TQSpinBox (0, 99, 1, parent, name),
KCompletionBase (),
mClearedSelection (false)
{

2
ksysv/SpinBox.h
Unescape Escape View File

@ -13,7 +13,7 @@ class KSVSpinBox : public TQSpinBox, public KCompletionBase
TQ_OBJECT
public:
KSVSpinBox (TQWidget* tqparent, const char* name = 0L);
KSVSpinBox (TQWidget* parent, const char* name = 0L);
virtual ~KSVSpinBox ();
virtual bool eventFilter (TQObject*, TQEvent*);

6
ksysv/kdltooltip.cpp
Unescape Escape View File

@ -21,9 +21,9 @@
#include "ksvdraglist.h"
#include "kdltooltip.h"
KDLToolTip::KDLToolTip (KSVDragList *tqparent, TQToolTipGroup* group)
: TQToolTip(tqparent, group),
mParent (tqparent)
KDLToolTip::KDLToolTip (KSVDragList *parent, TQToolTipGroup* group)
: TQToolTip(parent, group),
mParent (parent)
{
}

2
ksysv/kdltooltip.h
Unescape Escape View File

@ -26,7 +26,7 @@ class KSVDragList;
class KDLToolTip : public TQToolTip
{
public:
KDLToolTip (KSVDragList *tqparent, TQToolTipGroup* group = 0L);
KDLToolTip (KSVDragList *parent, TQToolTipGroup* group = 0L);
virtual ~KDLToolTip();
protected:

4
ksysv/kscroller.cpp
Unescape Escape View File

@ -23,8 +23,8 @@ public:
TQWidget* setCornerWidget;
};
KScroller::KScroller (TQWidget* tqparent, const char* name)
: TQFrame (tqparent, name),
KScroller::KScroller (TQWidget* parent, const char* name)
: TQFrame (parent, name),
d (new KScrollerPrivate()),
mVertical (new TQScrollBar (Qt::Vertical, this)),
mHorizontal (new TQScrollBar (Qt::Horizontal, this)),

4
ksysv/kscroller.h
Unescape Escape View File

@ -22,10 +22,10 @@ public:
/**
* Constructor.
*
* @param tqparent the tqparent of this widget (passed on as ususal).
* @param parent the parent of this widget (passed on as ususal).
* @param name the name of this widget (as above).
*/
KScroller (TQWidget* tqparent = 0L, const char* name = 0L);
KScroller (TQWidget* parent = 0L, const char* name = 0L);
/**
* Destructor.

6
ksysv/ksvconfigwizard.cpp
Unescape Escape View File

@ -33,14 +33,14 @@
#include <tqpushbutton.h>
/*
* Constructs a KSVConfigWizard which is a child of 'tqparent', with the
* Constructs a KSVConfigWizard which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The wizard will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal wizard.
*/
KSVConfigWizard::KSVConfigWizard (TQWidget* tqparent, const char* name, bool modal, WFlags fl)
: ConfigWizard (tqparent, name, modal, fl),
KSVConfigWizard::KSVConfigWizard (TQWidget* parent, const char* name, bool modal, WFlags fl)
: ConfigWizard (parent, name, modal, fl),
mChosenDistribution (Debian)
{
mDistributionBoxLayout->setSpacing (KDialog::spacingHint());

2
ksysv/ksvconfigwizard.h
Unescape Escape View File

@ -35,7 +35,7 @@ class KSVConfigWizard : public ConfigWizard
TQ_OBJECT
public:
KSVConfigWizard( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
KSVConfigWizard( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~KSVConfigWizard();
public:

14
ksysv/ksvdraglist.cpp
Unescape Escape View File

@ -214,8 +214,8 @@ TQPixmap KSVItem::paintDragIcon (const TQFont& font, const TQColorGroup&) const
label());
p.end();
TQBitmap tqmask (width, height);
p.begin (&tqmask);
TQBitmap mask (width, height);
p.begin (&mask);
p.setFont (font);
p.fillRect (0, 0, width, height, color0);
@ -234,7 +234,7 @@ TQPixmap KSVItem::paintDragIcon (const TQFont& font, const TQColorGroup&) const
p.end();
result.setMask(tqmask);
result.setMask(mask);
result.setOptimization(TQPixmap::BestOptim);
return result;
}
@ -309,8 +309,8 @@ void KSVItem::setOriginalRunlevel (const TQString& rl)
// KSVDragList
//-----------------------
KSVDragList::KSVDragList ( TQWidget* tqparent, const char* name )
: KListView (tqparent, name),
KSVDragList::KSVDragList ( TQWidget* parent, const char* name )
: KListView (parent, name),
mItemToDrag (0L),
mDragMenu (new KPopupMenu (this)),
mDragCopyMenu (new KPopupMenu (this)),
@ -776,8 +776,8 @@ void KSVDragList::setEnabled (bool enable)
// KServiceDragList
KServiceDragList::KServiceDragList (TQWidget* tqparent, const char* name)
: KSVDragList (tqparent, name)
KServiceDragList::KServiceDragList (TQWidget* parent, const char* name)
: KSVDragList (parent, name)
{
}

4
ksysv/ksvdraglist.h
Unescape Escape View File

@ -155,7 +155,7 @@ class KSVDragList : public KListView
TQ_OBJECT
public:
KSVDragList ( TQWidget* tqparent = 0, const char* name = 0 );
KSVDragList ( TQWidget* parent = 0, const char* name = 0 );
virtual ~KSVDragList();
virtual void clear();
@ -268,7 +268,7 @@ signals:
class KServiceDragList : public KSVDragList
{
public:
KServiceDragList (TQWidget* tqparent = 0L, const char* name = 0L);
KServiceDragList (TQWidget* parent = 0L, const char* name = 0L);
virtual ~KServiceDragList ();
protected:

6
ksysv/ksvlookandfeel.cpp
Unescape Escape View File

@ -32,11 +32,11 @@
#include <kfontdialog.h>
/*
* Constructs a KSVLookAndFeel which is a child of 'tqparent', with the
* Constructs a KSVLookAndFeel which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
KSVLookAndFeel::KSVLookAndFeel( TQWidget* tqparent, const char* name, WFlags fl )
: LookAndFeel( tqparent, name, fl )
KSVLookAndFeel::KSVLookAndFeel( TQWidget* parent, const char* name, WFlags fl )
: LookAndFeel( parent, name, fl )
{
mTopLayout->setSpacing (KDialog::spacingHint());
mColorGrid->setSpacing (KDialog::spacingHint());

2
ksysv/ksvlookandfeel.h
Unescape Escape View File

@ -15,7 +15,7 @@ class KSVLookAndFeel : public LookAndFeel
TQ_OBJECT
public:
KSVLookAndFeel( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
KSVLookAndFeel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~KSVLookAndFeel();
inline const TQFont& serviceFont() const { return mServiceFont; }

6
ksysv/ksvmiscconfig.cpp
Unescape Escape View File

@ -31,11 +31,11 @@
#include <kdialog.h>
/*
* Constructs a KSVMiscConfig which is a child of 'tqparent', with the
* Constructs a KSVMiscConfig which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
KSVMiscConfig::KSVMiscConfig( TQWidget* tqparent, const char* name, WFlags fl )
: MiscConfiguration( tqparent, name, fl )
KSVMiscConfig::KSVMiscConfig( TQWidget* parent, const char* name, WFlags fl )
: MiscConfiguration( parent, name, fl )
{
mSpacer->setFixedHeight (KDialog::spacingHint());

2
ksysv/ksvmiscconfig.h
Unescape Escape View File

@ -33,7 +33,7 @@ class KSVMiscConfig : public MiscConfiguration
TQ_OBJECT
public:
KSVMiscConfig( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
KSVMiscConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~KSVMiscConfig();
signals:

6
ksysv/ksvpathconfig.cpp
Unescape Escape View File

@ -29,11 +29,11 @@
#include <kfiledialog.h>
/*
* Constructs a KSVPathConfig which is a child of 'tqparent', with the
* Constructs a KSVPathConfig which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
KSVPathConfig::KSVPathConfig( TQWidget* tqparent, const char* name, WFlags fl )
: PathConfiguration( tqparent, name, fl )
KSVPathConfig::KSVPathConfig( TQWidget* parent, const char* name, WFlags fl )
: PathConfiguration( parent, name, fl )
{
mSpacer->setFixedHeight (KDialog::spacingHint());
}

2
ksysv/ksvpathconfig.h
Unescape Escape View File

@ -33,7 +33,7 @@ class KSVPathConfig : public PathConfiguration
TQ_OBJECT
public:
KSVPathConfig( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
KSVPathConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~KSVPathConfig();
signals:

4
ksysv/trash.cpp
Unescape Escape View File

@ -29,8 +29,8 @@
#include "ActionList.h"
#include "trash.h"
KSVTrash::KSVTrash (TQWidget* tqparent, const char* name)
: TQFrame (tqparent, name),
KSVTrash::KSVTrash (TQWidget* parent, const char* name)
: TQFrame (parent, name),
mKIL (KGlobal::iconLoader()),
mLabel (new TQLabel(this)),
mOpen (false)

2
ksysv/trash.h
Unescape Escape View File

@ -31,7 +31,7 @@ class KSVTrash : public TQFrame
TQ_OBJECT
public:
KSVTrash (TQWidget* tqparent = 0, const char* name = 0);
KSVTrash (TQWidget* parent = 0, const char* name = 0);
virtual ~KSVTrash();
virtual TQSize tqsizeHint() const;

4
kuser/addUser.cpp
Unescape Escape View File

@ -38,8 +38,8 @@
#include <kmessagebox.h>
addUser::addUser( KU::KUser *AUser, bool useprivategroup,
TQWidget *tqparent, const char *name ) :
propdlg( AUser, useprivategroup, tqparent, name )
TQWidget *parent, const char *name ) :
propdlg( AUser, useprivategroup, parent, name )
{
TQGroupBox *group = new TQGroupBox(frontpage);
group->setTitle(i18n("New Account Options"));

2
kuser/addUser.h
Unescape Escape View File

@ -29,7 +29,7 @@ class addUser: public propdlg {
TQ_OBJECT
public:
addUser(KU::KUser *AUser, bool useprivategroup,
TQWidget *tqparent = 0, const char *name = 0 );
TQWidget *parent = 0, const char *name = 0 );
void setCreateHomeDir(bool b)
{ createhome->setChecked(b); }

4
kuser/delUser.cpp
Unescape Escape View File

@ -24,8 +24,8 @@
#include <klocale.h>
delUser::delUser(KU::KUser *AUser, TQWidget *tqparent, const char *name)
: KDialogBase( tqparent, name, true, i18n("Delete User"),
delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name)
: KDialogBase( parent, name, true, i18n("Delete User"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true )
{
TQVBox *page = makeVBoxMainWidget();

2
kuser/delUser.h
Unescape Escape View File

@ -29,7 +29,7 @@ class delUser: public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
delUser(KU::KUser *AUser, TQWidget *tqparent = 0, const char *name = 0);
delUser(KU::KUser *AUser, TQWidget *parent = 0, const char *name = 0);
bool getDeleteHomeDir()
{ return m_deleteHomeDir->isChecked(); }

4
kuser/editDefaults.cpp
Unescape Escape View File

@ -37,8 +37,8 @@
#include "passwordpolicy.h"
#include "misc.h"
editDefaults::editDefaults( KConfigSkeleton *config, TQWidget *tqparent, const char *name ) :
KConfigDialog( tqparent, name, config, IconList,
editDefaults::editDefaults( KConfigSkeleton *config, TQWidget *parent, const char *name ) :
KConfigDialog( parent, name, config, IconList,
Default|Ok|Apply|Cancel|Help, Ok, true )
{
KTabWidget *page1 = new KTabWidget( this );

2
kuser/editDefaults.h
Unescape Escape View File

@ -41,7 +41,7 @@ class editDefaults : public KConfigDialog {
Q_OBJECT
TQ_OBJECT
public:
editDefaults( KConfigSkeleton *config, TQWidget* tqparent, const char * name = 0 );
editDefaults( KConfigSkeleton *config, TQWidget* parent, const char * name = 0 );
private:
KProgressDialog *mProg;
LdapSamba *page3c;

4
kuser/editGroup.cpp
Unescape Escape View File

@ -35,8 +35,8 @@
#include "editGroup.h"
editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
TQWidget* tqparent, const char* name)
: KDialogBase(tqparent, name, true, i18n("Group Properties"), Ok | Cancel, Ok, true)
TQWidget* parent, const char* name)
: KDialogBase(parent, name, true, i18n("Group Properties"), Ok | Cancel, Ok, true)
{
kg = akg;
mAdd = add;

2
kuser/editGroup.h
Unescape Escape View File

@ -37,7 +37,7 @@ class editGroup : public KDialogBase
public:
editGroup(KU::KGroup *akg, bool samba, bool add,
TQWidget* tqparent = NULL, const char* name = NULL);
TQWidget* parent = NULL, const char* name = NULL);
virtual ~editGroup();

8
kuser/kgroupvw.cpp
Unescape Escape View File

@ -24,8 +24,8 @@
#include "kgroupvw.h"
KGroupViewItem::KGroupViewItem(KListView *tqparent, KU::KGroup *aku)
: KListViewItem(tqparent), mGroup(aku)
KGroupViewItem::KGroupViewItem(KListView *parent, KU::KGroup *aku)
: KListViewItem(parent), mGroup(aku)
{
}
@ -82,8 +82,8 @@ TQString KGroupViewItem::text(int num) const
}
KGroupView::KGroupView(TQWidget *tqparent, const char *name)
: KListView( tqparent, name )
KGroupView::KGroupView(TQWidget *parent, const char *name)
: KListView( parent, name )
{
setSelectionMode( TQListView::Extended );
}

4
kuser/kgroupvw.h
Unescape Escape View File

@ -30,7 +30,7 @@
class KGroupViewItem : public KListViewItem
{
public:
KGroupViewItem(KListView *tqparent, KU::KGroup *aku);
KGroupViewItem(KListView *parent, KU::KGroup *aku);
KU::KGroup *group() { return mGroup; }
private:
virtual TQString text ( int ) const;
@ -45,7 +45,7 @@ class KGroupView : public KListView
TQ_OBJECT
public:
KGroupView( TQWidget* tqparent = 0, const char* name = 0 );
KGroupView( TQWidget* parent = 0, const char* name = 0 );
virtual ~KGroupView();

8
kuser/kuservw.cpp
Unescape Escape View File

@ -24,8 +24,8 @@
#include "kuservw.h"
KUserViewItem::KUserViewItem(KListView *tqparent, KU::KUser *aku)
: KListViewItem(tqparent), mUser(aku)
KUserViewItem::KUserViewItem(KListView *parent, KU::KUser *aku)
: KListViewItem(parent), mUser(aku)
{
}
@ -80,8 +80,8 @@ TQString KUserViewItem::text(int num) const
return TQString();
}
KUserView::KUserView(TQWidget *tqparent, const char *name)
: KListView( tqparent, name )
KUserView::KUserView(TQWidget *parent, const char *name)
: KListView( parent, name )
{
setSelectionMode( TQListView::Extended );
}

4
kuser/kuservw.h
Unescape Escape View File

@ -30,7 +30,7 @@
class KUserViewItem : public KListViewItem
{
public:
KUserViewItem(KListView *tqparent, KU::KUser *aku);
KUserViewItem(KListView *parent, KU::KUser *aku);
KU::KUser *user() { return mUser; }
private:
virtual TQString text ( int ) const;
@ -46,7 +46,7 @@ class KUserView : public KListView
TQ_OBJECT
public:
KUserView( TQWidget* tqparent = 0, const char* name = 0 );
KUserView( TQWidget* parent = 0, const char* name = 0 );
virtual ~KUserView();

2
kuser/mainView.cpp
Unescape Escape View File

@ -39,7 +39,7 @@
#include "pwddlg.h"
#include "editGroup.h"
mainView::mainView(TQWidget *tqparent) : TQTabWidget(tqparent)
mainView::mainView(TQWidget *parent) : TQTabWidget(parent)
{
init();
}

2
kuser/mainView.h
Unescape Escape View File

@ -36,7 +36,7 @@ class mainView : public TQTabWidget {
Q_OBJECT
TQ_OBJECT
public:
mainView(TQWidget *tqparent = 0);
mainView(TQWidget *parent = 0);
~mainView();
void init();

22
kuser/propdlg.cpp
Unescape Escape View File

@ -38,11 +38,11 @@
#include "kglobal_.h"
#include "misc.h"
void propdlg::addRow(TQWidget *tqparent, TQGridLayout *tqlayout, int row,
void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, int row,
TQWidget *widget, const TQString &label, const TQString &what,
bool two_column, bool nochange)
{
TQLabel *lab = new TQLabel(widget, label, tqparent);
TQLabel *lab = new TQLabel(widget, label, parent);
lab->setMinimumSize(lab->tqsizeHint());
widget->setMinimumSize(widget->tqsizeHint());
tqlayout->addWidget(lab, row, 0);
@ -57,21 +57,21 @@ void propdlg::addRow(TQWidget *tqparent, TQGridLayout *tqlayout, int row,
tqlayout->addWidget(widget, row, 1);
if ( !nochange || ro ) return;
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), tqparent );
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
tqlayout->addWidget( nc, row, 3 );
nc->hide();
mNoChanges[ widget ] = nc;
}
KIntSpinBox *propdlg::addDaysGroup(TQWidget *tqparent, TQGridLayout *tqlayout, int row,
KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int row,
const TQString &title, bool never)
{
KIntSpinBox *days;
TQLabel *label = new TQLabel( title, tqparent );
TQLabel *label = new TQLabel( title, parent );
tqlayout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
days = new KIntSpinBox( tqparent );
days = new KIntSpinBox( parent );
label->setBuddy( days );
days->setSuffix( i18n(" days") );
days->setMaxValue( 99999 );
@ -88,7 +88,7 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *tqparent, TQGridLayout *tqlayout, i
connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), tqparent );
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
tqlayout->addWidget( nc, row, 3 );
nc->hide();
mNoChanges[ days ] = nc;
@ -340,8 +340,8 @@ void propdlg::initDlg()
}
propdlg::propdlg( const TQPtrList<KU::KUser> &users,
TQWidget *tqparent, const char *name ) :
KDialogBase(Tabbed, i18n("User Properties"), Ok | Cancel, Ok, tqparent, name, true)
TQWidget *parent, const char *name ) :
KDialogBase(Tabbed, i18n("User Properties"), Ok | Cancel, Ok, parent, name, true)
{
mUsers = users;
@ -355,8 +355,8 @@ propdlg::propdlg( const TQPtrList<KU::KUser> &users,
}
propdlg::propdlg( KU::KUser *AUser, bool fixedprivgroup,
TQWidget *tqparent, const char *name ) :
KDialogBase(Tabbed, i18n("User Properties"), Ok | Cancel, Ok, tqparent, name, true)
TQWidget *parent, const char *name ) :
KDialogBase(Tabbed, i18n("User Properties"), Ok | Cancel, Ok, parent, name, true)
{
mUsers.append( AUser );

8
kuser/propdlg.h
Unescape Escape View File

@ -46,9 +46,9 @@ class propdlg : public KDialogBase
public:
propdlg( const TQPtrList<KU::KUser> &users,
TQWidget *tqparent = 0, const char *name = 0 );
TQWidget *parent = 0, const char *name = 0 );
propdlg( KU::KUser *AUser, bool fixedprivgroup,
TQWidget *tqparent = 0, const char *name = 0 );
TQWidget *parent = 0, const char *name = 0 );
~propdlg();
void mergeUser( KU::KUser *user, KU::KUser *newuser );
@ -70,7 +70,7 @@ protected:
bool check();
void loadgroups( bool fixedprivgroup );
bool checkShell(const TQString &shell);
void addRow( TQWidget *tqparent, TQGridLayout *tqlayout, int row,
void addRow( TQWidget *parent, TQGridLayout *tqlayout, int row,
TQWidget *widget, const TQString &label, const TQString &what,
bool two_column=true, bool nochange=true );
void setLE( KLineEdit *le, const TQString &val, bool first );
@ -79,7 +79,7 @@ protected:
TQString mergeLE( KLineEdit *le, const TQString &val, bool one );
int mergeSB( KIntSpinBox *sb, int val, bool one );
KIntSpinBox *addDaysGroup( TQWidget *tqparent, TQGridLayout *tqlayout, int row,
KIntSpinBox *addDaysGroup( TQWidget *parent, TQGridLayout *tqlayout, int row,
const TQString &title, bool never=true );
TQFrame *frontpage;

4
kuser/pwddlg.cpp
Unescape Escape View File

@ -25,8 +25,8 @@
#include "pwddlg.h"
#include "misc.h"
pwddlg::pwddlg( TQWidget* tqparent, const char* name )
: KDialogBase(tqparent, name, true, i18n("Enter Password"), Ok | Cancel, Ok, true)
pwddlg::pwddlg( TQWidget* parent, const char* name )
: KDialogBase(parent, name, true, i18n("Enter Password"), Ok | Cancel, Ok, true)
{
TQGrid *page = makeGridMainWidget(2, Qt::Horizontal);

2
kuser/pwddlg.h
Unescape Escape View File

@ -30,7 +30,7 @@ class pwddlg : public KDialogBase {
TQ_OBJECT
public:
pwddlg( TQWidget* tqparent = NULL, const char* name = NULL );
pwddlg( TQWidget* parent = NULL, const char* name = NULL );
~pwddlg();
TQString getPassword() const;

4
kuser/selectconn.cpp
Unescape Escape View File

@ -33,8 +33,8 @@
#include "selectconn.h"
#include "editDefaults.h"
SelectConn::SelectConn(const TQString &selected, TQWidget* tqparent, const char * name) :
KDialogBase( Plain, WStyle_DialogBorder, tqparent, name, true,
SelectConn::SelectConn(const TQString &selected, TQWidget* parent, const char * name) :
KDialogBase( Plain, WStyle_DialogBorder, parent, name, true,
i18n("Connection Selection"), Ok | Apply | Cancel | User1 | User2 | User3 )
{
TQStringList conns;

2
kuser/selectconn.h
Unescape Escape View File

@ -26,7 +26,7 @@ class SelectConn : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
SelectConn( const TQString &selected, TQWidget* tqparent, const char * name);
SelectConn( const TQString &selected, TQWidget* parent, const char * name);
TQString connSelected();
protected slots:
void slotUser1();

2
lilo-config/kde-qt-common/EditWidget.cpp
Unescape Escape View File

@ -28,7 +28,7 @@
*/
#include "EditWidget.moc"
#include "ui.h"
EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *tqparent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, tqparent, name, f)
EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *parent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, parent, name, f)
{
setMargin(SPACE_MARGIN);
setSpacing(SPACE_INSIDE);

2
lilo-config/kde-qt-common/EditWidget.h
Unescape Escape View File

@ -37,7 +37,7 @@ class EditWidget:public TQHBox
Q_OBJECT
TQ_OBJECT
public:
EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *tqparent=0, const char *name=0, WFlags f=0, bool allowLines=true);
EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=0, const char *name=0, WFlags f=0, bool allowLines=true);
void setLabel(TQString const &label) { lbl->setText(label); };
TQString text() const { return line->text(); };
TQString displayText() const { return line->displayText(); };

2
lilo-config/kde-qt-common/expert.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include <tqwhatsthis.h>
#include <String.h>
#include <strstream>
Expert::Expert(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
{
lilo=l;
tqlayout=new TQHBoxLayout(this);

2
lilo-config/kde-qt-common/expert.h
Unescape Escape View File

@ -37,7 +37,7 @@ class Expert:public TQWidget
Q_OBJECT
TQ_OBJECT
public:
Expert(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
Expert(liloconf *l=0, TQWidget *parent=0, const char *name=0);
~Expert();
void setCfg(liloconf *l) { lilo=l; };
void makeReadOnly();

2
lilo-config/kde-qt-common/general.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
#include <stdlib.h>
General::General(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
{
lilo=l;
TQVBoxLayout *tqlayout=new TQVBoxLayout(this);

2
lilo-config/kde-qt-common/general.h
Unescape Escape View File

@ -38,7 +38,7 @@ class General:public TQWidget
Q_OBJECT
TQ_OBJECT
public:
General(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
General(liloconf *l=0, TQWidget *parent=0, const char *name=0);
void makeReadOnly();
signals:
void configChanged();

2
lilo-config/kde-qt-common/images.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
#include "tqt/Details.h"
#endif
Images::Images(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
{
current=""; previous=""; // Using TQString() gives problems!
lilo=l;

2
lilo-config/kde-qt-common/images.h
Unescape Escape View File

@ -41,7 +41,7 @@ class Images:public TQWidget
Q_OBJECT
TQ_OBJECT
public:
Images(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
Images(liloconf *l=0, TQWidget *parent=0, const char *name=0);
~Images();
void setCfg(liloconf *l) { lilo=l; };
void makeReadOnly();

4
lilo-config/kde-qt-common/mainwidget.cpp
Unescape Escape View File

@ -29,8 +29,8 @@
#include "mainwidget.moc"
#include "ui.h"
MainWidget::MainWidget(TQWidget *tqparent, const char *name)
: TQTabWidget(tqparent, name)
MainWidget::MainWidget(TQWidget *parent, const char *name)
: TQTabWidget(parent, name)
{
l=new liloconf();
general=new General(l, this);

2
lilo-config/kde-qt-common/mainwidget.h
Unescape Escape View File

@ -40,7 +40,7 @@ class MainWidget: public TQTabWidget {
Q_OBJECT
TQ_OBJECT
public:
MainWidget(TQWidget *tqparent, const char *name=0);
MainWidget(TQWidget *parent, const char *name=0);
void arrangeWidgets();
void makeReadOnly();
public slots:

32
lilo-config/kde-qt-common/ui.h
Unescape Escape View File

@ -39,14 +39,14 @@
#include <kdialog.h>
#include <kfiledialog.h>
#define _(x) i18n(x)
#define WarningYesNo(tqparent, caption, text) \
KMessageBox::warningYesNo(tqparent, text, caption)
#define ErrorOK(tqparent, caption, text) \
KMessageBox::sorry(tqparent, text, caption)
#define InformationOK(tqparent, text, caption, dontShowAgainName) \
KMessageBox::information(tqparent, text, caption, dontShowAgainName)
#define CriticalErrorOK(tqparent, text, caption) \
KMessageBox::error(tqparent, text, caption)
#define WarningYesNo(parent, caption, text) \
KMessageBox::warningYesNo(parent, text, caption)
#define ErrorOK(parent, caption, text) \
KMessageBox::sorry(parent, text, caption)
#define InformationOK(parent, text, caption, dontShowAgainName) \
KMessageBox::information(parent, text, caption, dontShowAgainName)
#define CriticalErrorOK(parent, text, caption) \
KMessageBox::error(parent, text, caption)
#define TabBar KTabCtl
#define FileDlg KFileDialog
#define SPACE_MARGIN KDialog::marginHint()
@ -57,14 +57,14 @@
#include <tqdialog.h>
#include <tqfiledialog.h>
#define _(x) tr(x)
#define WarningYesNo(tqparent, caption, text) \
TQMessageBox::warning(tqparent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
#define ErrorOK(tqparent, caption, text) \
TQMessageBox::information(tqparent, caption, text)
#define InformationOK(tqparent, text, caption, dontShowAgainName) \
TQMessageBox::information(tqparent, caption, text)
#define CriticalErrorOK(tqparent, text, caption) \
TQMessageBox::critical(tqparent, caption, text)
#define WarningYesNo(parent, caption, text) \
TQMessageBox::warning(parent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
#define ErrorOK(parent, caption, text) \
TQMessageBox::information(parent, caption, text)
#define InformationOK(parent, text, caption, dontShowAgainName) \
TQMessageBox::information(parent, caption, text)
#define CriticalErrorOK(parent, text, caption) \
TQMessageBox::critical(parent, caption, text)
#define TabBar TQTabWidget
#define FileDlg TQFileDialog
#define SPACE_MARGIN 5

4
lilo-config/kde/Details.cpp
Unescape Escape View File

@ -33,8 +33,8 @@
#include <tqlabel.h>
#include <ui.h>
Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags /* f */)
: KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok, true)
Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags /* f */)
: KDialogBase(parent, name, true, TQString(), Ok|Cancel, Ok, true)
{
l=lilo;

2
lilo-config/kde/Details.h
Unescape Escape View File

@ -39,7 +39,7 @@ class Details:public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
Details(liloimage *lilo, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0);
bool isReadOnly() const { return readonly->isChecked(); };
TQString vgaMode() const;
bool isUnsafe() const { return unsafe->isChecked(); };

4
lilo-config/kde/InputBox.cpp
Unescape Escape View File

@ -31,8 +31,8 @@
#include <tqwhatsthis.h>
#include <ui.h>
InputBox::InputBox(entries e, TQWidget *tqparent, const char *name, bool hasCancel, WFlags f)
: KDialogBase(tqparent, name, true, TQString(), hasCancel ? Ok | Cancel : Ok, Ok, true )
InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f)
: KDialogBase(parent, name, true, TQString(), hasCancel ? Ok | Cancel : Ok, Ok, true )
{
TQVBox *page = makeVBoxMainWidget();
for(entries::iterator it=e.begin(); it!=e.end(); it++) {

2
lilo-config/kde/InputBox.h
Unescape Escape View File

@ -43,7 +43,7 @@ class InputBox:public KDialogBase
public:
typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry;
typedef std::list<entry> entries;
InputBox(entries e, TQWidget *tqparent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
TQStringList const text() const { TQStringList s; for(std::list<EditWidget*>::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; };
private:
std::list<EditWidget*> edit;

8
lilo-config/kde/kcontrol.cpp
Unescape Escape View File

@ -35,8 +35,8 @@
#include <kaboutdata.h>
#include <unistd.h>
KControl::KControl(TQWidget *tqparent, const char *name)
: KCModule(tqparent, name)
KControl::KControl(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
m=new MainWidget(this, name);
@ -79,9 +79,9 @@ void KControl::configChanged() // SLOT
extern "C"
{
KDE_EXPORT KCModule *create_lilo(TQWidget *tqparent, const char *name)
KDE_EXPORT KCModule *create_lilo(TQWidget *parent, const char *name)
{
return new KControl(tqparent, "kcmlilo");
return new KControl(parent, "kcmlilo");
}
}

2
lilo-config/kde/kcontrol.h
Unescape Escape View File

@ -40,7 +40,7 @@ class KControl: public KCModule {
Q_OBJECT
TQ_OBJECT
public:
KControl(TQWidget *tqparent, const char *name);
KControl(TQWidget *parent, const char *name);
void load();
void save();
void defaults();

2
lilo-config/qt/Details.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include <tqlabel.h>
#include <ui.h>
Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags f):TQDialog(tqparent, name, true, f)
Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):TQDialog(parent, name, true, f)
{
l=lilo;

2
lilo-config/qt/Details.h
Unescape Escape View File

@ -37,7 +37,7 @@ class Details:public TQDialog
Q_OBJECT
TQ_OBJECT
public:
Details(liloimage *lilo, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0);
bool isReadOnly() const { return readonly->isChecked(); };
TQString vgaMode() const;
bool isUnsafe() const { return unsafe->isChecked(); };

2
lilo-config/qt/InputBox.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include <tqwhatsthis.h>
#include <ui.h>
InputBox::InputBox(entries e, TQWidget *tqparent, const char *name, bool hasCancel, WFlags f):TQDialog(tqparent, name, true, f)
InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f):TQDialog(parent, name, true, f)
{
TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
tqlayout->setMargin(SPACE_MARGIN);

2
lilo-config/qt/InputBox.h
Unescape Escape View File

@ -40,7 +40,7 @@ class InputBox:public TQDialog
public:
typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry;
typedef std::list<entry> entries;
InputBox(entries e, TQWidget *tqparent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
TQStringList const text() const { TQStringList s; for(std::list<EditWidget*>::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; };
private:
std::list<EditWidget*> edit;

2
lilo-config/qt/standalone.cpp
Unescape Escape View File

@ -33,7 +33,7 @@
#include <ui.h>
#include "standalone.moc"
Standalone::Standalone(TQWidget *tqparent, const char *name):TQWidget(tqparent,name)
Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
{
m=new MainWidget(this);
connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));

2
lilo-config/qt/standalone.h
Unescape Escape View File

@ -37,7 +37,7 @@ class Standalone: public TQWidget
Q_OBJECT
TQ_OBJECT
public:
Standalone(TQWidget *tqparent=0, const char *name=0);
Standalone(TQWidget *parent=0, const char *name=0);
void resizeEvent(TQResizeEvent *e);
public slots:
void whatsthis();

4
secpolicy/pamview.cpp
Unescape Escape View File

@ -40,8 +40,8 @@
#include <stdlib.h>
PamView::PamView(TQWidget *tqparent, const char *name)
: TQWidget(tqparent, name)
PamView::PamView(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
TQHBoxLayout *topl = new TQHBoxLayout(this);

2
secpolicy/pamview.h
Unescape Escape View File

@ -35,7 +35,7 @@ class PamView : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
PamView(TQWidget *tqparent = 0, const char *name = 0);
PamView(TQWidget *parent = 0, const char *name = 0);
virtual ~PamView();
protected:

4
secpolicy/ppitem.cpp
Unescape Escape View File

@ -27,8 +27,8 @@
PamPropertiesItem::PamPropertiesItem(TQString fileName,
TQStringList properties,
TQListView *tqparent)
: TQListViewItem(tqparent)
TQListView *parent)
: TQListViewItem(parent)
{
int i = properties.count();
if (i > 0)

2
secpolicy/ppitem.h
Unescape Escape View File

@ -31,7 +31,7 @@ class PamPropertiesItem : public TQListViewItem
{
public:
PamPropertiesItem(TQString fileName, TQStringList properties,
TQListView *tqparent);
TQListView *parent);
private:
TQString category, level, lib;

Write Preview
Loading…
Cancel
Save