diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 0568de5..7706644 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -269,7 +269,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
v4->addSpacing( 2 * KDialogBase::spacingHint() );
labAM = new TQLabel( i18n("AM"), bgHour, "labAM");
- labAM->tqsetAlignment(AlignRight | AlignVCenter);
+ labAM->setAlignment(AlignRight | AlignVCenter);
v4->addWidget( labAM );
@@ -292,7 +292,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
}
labPM = new TQLabel( i18n("PM"), bgHour, "labPM");
- labPM->tqsetAlignment(AlignRight | AlignVCenter);
+ labPM->setAlignment(AlignRight | AlignVCenter);
v4->addWidget( labPM );
hhours = new TQHBoxLayout( v4, KDialogBase::spacingHint() );
@@ -403,7 +403,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
key_accel->insert(KStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()));
key_accel->readSettings();
- setFixedSize( tqminimumSize() );
+ setFixedSize( minimumSize() );
slotDailyChanged();
slotMonthChanged();
slotDayOfMonthChanged();
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index 7422aa5..af2b780 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -266,7 +266,7 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const
{
TQFont stnd;
TQString logonInfo;
- TQDateTime now (TQDateTime::tqcurrentDateTime());
+ TQDateTime now (TQDateTime::currentDateTime());
char hostName[20];
gethostname(hostName, 20);
diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index 875c21d..c3838d4 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -43,25 +43,25 @@ ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this );
TQLabel* lbl3 = new TQLabel( i18n( "Size:" ), this );
- int max = lbl1->tqsizeHint().width();
- if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
- if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
+ int max = lbl1->sizeHint().width();
+ if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+ if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
- lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
- lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
- lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->sizeHint().height() );
_archiveName = new TQLineEdit( this );
- _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() );
+ _archiveName->setFixedHeight( _archiveName->sizeHint().height() );
_ctime = new TQLabel( "???", this );
- _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
+ _ctime->setFixedHeight( _ctime->sizeHint().height() );
_size = new TQLabel( "???", this );
- _size->setFixedHeight( _size->tqsizeHint().height() );
+ _size->setFixedHeight( _size->sizeHint().height() );
_apply = new KPushButton( KStdGuiItem::apply(), this );
- _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
+ _apply->setFixedSize( 80, _apply->sizeHint().height() );
_apply->setEnabled( FALSE );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index 93bf65d..bd47226 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -93,55 +93,55 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir,
f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
- lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
+ lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
_elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
- _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
+ _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
- lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
+ lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
_timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
- _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
+ _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
- lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
+ lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( archiveSize ), f1 );
- totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
+ totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
TQLabel* lbl4 = new TQLabel( i18n( "KB written:" ), f2 );
- lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
+ lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
_kbytesWritten = new TQLabel( i18n( "0KB" ), f2 );
- _kbytesWritten->setFixedHeight( _kbytesWritten->tqsizeHint().height() );
+ _kbytesWritten->setFixedHeight( _kbytesWritten->sizeHint().height() );
TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
- lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
+ lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
_transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
- _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
+ _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
TQLabel* lbl6 = new TQLabel( i18n( "Files:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
_fileCount = new TQLabel( i18n( "0" ), f2 );
- _fileCount->setFixedHeight( _fileCount->tqsizeHint().height() );
+ _fileCount->setFixedHeight( _fileCount->sizeHint().height() );
_log = new LoggerWidget( i18n( "Backup log:" ), this );
_ok = new KPushButton( KStdGuiItem::ok(), this );
- _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
+ _ok->setFixedSize( 80, _ok->sizeHint().height() );
connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
_ok->setEnabled( FALSE );
_save = new TQPushButton( i18n( "Save Log..." ), this );
- _save->setFixedSize( 80, _save->tqsizeHint().height() );
+ _save->setFixedSize( 80, _save->sizeHint().height() );
connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
_save->setEnabled( FALSE );
_abort = new KPushButton( KStdGuiItem::cancel(), this );
- _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
+ _abort->setFixedSize( 80, _abort->sizeHint().height() );
connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h
index d98d91c..092f7c0 100644
--- a/kdat/BackupDlg.h
+++ b/kdat/BackupDlg.h
@@ -33,7 +33,7 @@ class Tape;
class TarParser;
/**
- * @short tqStatus dialog for backing up files.
+ * @short Status dialog for backing up files.
*/
class BackupDlg : public TQDialog {
Q_OBJECT
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index 58ae673..b5311ac 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -42,10 +42,10 @@ BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, cons
_profile->setBackupProfile( backupProfile );
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
- ok->setFixedSize( 80, ok->tqsizeHint().height() );
+ ok->setFixedSize( 80, ok->sizeHint().height() );
connect( ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
- cancel->setFixedSize( 80, ok->tqsizeHint().height() );
+ cancel->setFixedSize( 80, ok->sizeHint().height() );
connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index a40b94c..7e4a918 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -42,23 +42,23 @@ BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char*
{
TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this );
- int max = lbl1->tqsizeHint().width();
+ int max = lbl1->sizeHint().width();
- lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->sizeHint().height() );
_name = new TQLineEdit( this );
- _name->setFixedHeight( _name->tqsizeHint().height() );
+ _name->setFixedHeight( _name->sizeHint().height() );
_profile = new BackupProfileWidget( this );
TQPushButton* getSelection = new TQPushButton( i18n( "Files >>" ), this );
- getSelection->setFixedSize( 80, getSelection->tqsizeHint().height() );
+ getSelection->setFixedSize( 80, getSelection->sizeHint().height() );
TQPushButton* setSelection = new TQPushButton( i18n( "<< Files" ), this );
- setSelection->setFixedSize( 80, setSelection->tqsizeHint().height() );
+ setSelection->setFixedSize( 80, setSelection->sizeHint().height() );
_apply = new KPushButton( KStdGuiItem::apply(), this );
- _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
+ _apply->setFixedSize( 80, _apply->sizeHint().height() );
_apply->setEnabled( FALSE );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index 773a8bd..45acb56 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -40,19 +40,19 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
addTab( one, i18n( "Backup" ) );
TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), one );
- lbl1->setFixedSize( lbl1->tqsizeHint() );
+ lbl1->setFixedSize( lbl1->sizeHint() );
_archiveName = new TQLineEdit( one );
- _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() );
+ _archiveName->setFixedHeight( _archiveName->sizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Working folder:" ), one );
- lbl2->setFixedSize( lbl2->tqsizeHint() );
+ lbl2->setFixedSize( lbl2->sizeHint() );
_workingDir = new TQComboBox( FALSE, one );
- _workingDir->setFixedHeight( _workingDir->tqsizeHint().height() );
+ _workingDir->setFixedHeight( _workingDir->sizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "Backup files:" ), one );
- lbl3->setFixedHeight( lbl3->tqsizeHint().height() );
+ lbl3->setFixedHeight( lbl3->sizeHint().height() );
_files = new TQListBox( one );
@@ -60,20 +60,20 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
addTab( two, i18n( "Tar Options" ) );
_oneFilesystem = new TQCheckBox( i18n( "Stay on one filesystem" ), two );
- _oneFilesystem->setFixedHeight( _oneFilesystem->tqsizeHint().height() );
+ _oneFilesystem->setFixedHeight( _oneFilesystem->sizeHint().height() );
_incremental = new TQCheckBox( i18n( "GNU listed incremental" ), two );
- _incremental->setFixedHeight( _incremental->tqsizeHint().height() );
+ _incremental->setFixedHeight( _incremental->sizeHint().height() );
connect( _incremental, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIncrementalToggled( bool ) ) );
_snapshotLabel = new TQLabel( i18n( "Snapshot file:" ), two );
- _snapshotLabel->setFixedSize( _snapshotLabel->tqsizeHint() );
+ _snapshotLabel->setFixedSize( _snapshotLabel->sizeHint() );
_snapshotFile = new TQLineEdit( two );
- _snapshotFile->setFixedHeight( _snapshotFile->tqsizeHint().height() );
+ _snapshotFile->setFixedHeight( _snapshotFile->sizeHint().height() );
_removeSnapshot = new TQCheckBox( i18n( "Remove snapshot file before backup" ), two );
- _removeSnapshot->setFixedHeight( _removeSnapshot->tqsizeHint().height() );
+ _removeSnapshot->setFixedHeight( _removeSnapshot->sizeHint().height() );
slotIncrementalToggled( FALSE );
diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp
index e8991a8..5b75cf7 100644
--- a/kdat/FileInfoWidget.cpp
+++ b/kdat/FileInfoWidget.cpp
@@ -47,42 +47,42 @@ FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl6 = new TQLabel( i18n( "Owner:" ), this );
TQLabel* lbl7 = new TQLabel( i18n( "Group:" ), this );
- int max = lbl1->tqsizeHint().width();
- if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
- if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
- if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
- if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
- if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width();
- if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width();
-
- lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
- lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
- lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
- lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
- lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
- lbl6->setFixedSize( max, lbl6->tqsizeHint().height() );
- lbl7->setFixedSize( max, lbl7->tqsizeHint().height() );
+ int max = lbl1->sizeHint().width();
+ if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+ if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+ if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
+ if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
+ if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width();
+ if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width();
+
+ lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+ lbl4->setFixedSize( max, lbl4->sizeHint().height() );
+ lbl5->setFixedSize( max, lbl5->sizeHint().height() );
+ lbl6->setFixedSize( max, lbl6->sizeHint().height() );
+ lbl7->setFixedSize( max, lbl7->sizeHint().height() );
_fileName = new TQLabel( "???", this );
- _fileName->setFixedHeight( _fileName->tqsizeHint().height() );
+ _fileName->setFixedHeight( _fileName->sizeHint().height() );
_ctime = new TQLabel( "???", this );
- _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
+ _ctime->setFixedHeight( _ctime->sizeHint().height() );
_mtime = new TQLabel( "???", this );
- _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
+ _mtime->setFixedHeight( _mtime->sizeHint().height() );
_atime = new TQLabel( "???", this );
- _atime->setFixedHeight( _atime->tqsizeHint().height() );
+ _atime->setFixedHeight( _atime->sizeHint().height() );
_size = new TQLabel( "???", this );
- _size->setFixedHeight( _size->tqsizeHint().height() );
+ _size->setFixedHeight( _size->sizeHint().height() );
_owner = new TQLabel( "???", this );
- _owner->setFixedHeight( _owner->tqsizeHint().height() );
+ _owner->setFixedHeight( _owner->sizeHint().height() );
_group = new TQLabel( "???", this );
- _group->setFixedHeight( _group->tqsizeHint().height() );
+ _group->setFixedHeight( _group->sizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index f6084de..81a74f4 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -43,28 +43,28 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char*
TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Tape size:" ), this );
- int max = lbl1->tqsizeHint().width();
- if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
+ int max = lbl1->sizeHint().width();
+ if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
- lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
- lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->sizeHint().height() );
_entry = new TQLineEdit( this );
_entry->setText( def );
- _entry->setFixedHeight( _entry->tqsizeHint().height() );
+ _entry->setFixedHeight( _entry->sizeHint().height() );
_tapeSize = new TQLineEdit( this );
- _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() );
+ _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() );
_tapeSizeUnits = new TQComboBox( this );
- _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() );
+ _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() );
_tapeSizeUnits->insertItem( "MB" );
_tapeSizeUnits->insertItem( "GB" );
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
- ok->setFixedSize( 80, ok->tqsizeHint().height() );
+ ok->setFixedSize( 80, ok->sizeHint().height() );
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
- cancel->setFixedSize( 80, cancel->tqsizeHint().height() );
+ cancel->setFixedSize( 80, cancel->sizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
TQHBoxLayout* l2 = new TQHBoxLayout();
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index bd1f62c..92621b6 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -70,55 +70,55 @@ IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
- lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
+ lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
_elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
- _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
+ _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Archives:" ), f2 );
- lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
+ lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
_archives = new TQLabel( i18n( "0" ), f2 );
- _archives->setFixedHeight( _archives->tqsizeHint().height() );
+ _archives->setFixedHeight( _archives->sizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "KB read:" ), f1 );
- lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
+ lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
_kbytesRead = new TQLabel( i18n( "0KB" ), f1 );
- _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
+ _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
TQLabel* lbl4 = new TQLabel( i18n( "Files:" ), f2 );
- lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
+ lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
_files = new TQLabel( i18n( "0" ), f2 );
- _files->setFixedHeight( _kbytesRead->tqsizeHint().height() );
+ _files->setFixedHeight( _kbytesRead->sizeHint().height() );
TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
- lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
+ lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
_transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
- _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
+ _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
TQLabel* lbl6 = new TQLabel( i18n( "Total files:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
_totalFiles = new TQLabel( i18n( "0" ), f2 );
- _totalFiles->setFixedHeight( _totalFiles->tqsizeHint().height() );
+ _totalFiles->setFixedHeight( _totalFiles->sizeHint().height() );
_log = new LoggerWidget( i18n( "Index log:" ), this );
_ok = new KPushButton( KStdGuiItem::ok(), this );
- _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
+ _ok->setFixedSize( 80, _ok->sizeHint().height() );
connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
_ok->setEnabled( FALSE );
_save = new TQPushButton( i18n( "Save Log..." ), this );
- _save->setFixedSize( 80, _save->tqsizeHint().height() );
+ _save->setFixedSize( 80, _save->sizeHint().height() );
connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
_save->setEnabled( FALSE );
_abort = new TQPushButton( i18n( "Abort" ), this );
- _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
+ _abort->setFixedSize( 80, _abort->sizeHint().height() );
connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h
index ffbc505..41a4070 100644
--- a/kdat/IndexDlg.h
+++ b/kdat/IndexDlg.h
@@ -34,7 +34,7 @@ class Tape;
class TarParser;
/**
- * @short tqStatus dialog for recreating a tape index.
+ * @short Status dialog for recreating a tape index.
*/
class IndexDlg : public TQDialog {
Q_OBJECT
diff --git a/kdat/KDat.kdoc b/kdat/KDat.kdoc
index 21b5a50..2bf6349 100644
--- a/kdat/KDat.kdoc
+++ b/kdat/KDat.kdoc
@@ -387,7 +387,7 @@ TapeDrive::seek=TapeDrive.html#seek
TapeDrive::unlock=TapeDrive.html#unlock
TapeDrive::write=TapeDrive.html#write
TapeDrive::slotTapeBlockSize=TapeDrive.html#slotTapeBlockSize
-TapeDrive::slottqStatus=TapeDrive.html#slottqStatus
+TapeDrive::slotStatus=TapeDrive.html#slotStatus
TapeDrive::status=TapeDrive.html#status
TapeInfoDlg=TapeInfoDlg.html
TapeInfoDlg=TapeInfoDlg.html
@@ -475,7 +475,7 @@ KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem
KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem
KTreeViewItem::~KTreeViewItem=KTreeViewItem.html#~KTreeViewItem
KTreeViewItem::appendChild=KTreeViewItem.html#appendChild
-KTreeViewItem::tqchildAt=KTreeViewItem.html#tqchildAt
+KTreeViewItem::childAt=KTreeViewItem.html#childAt
KTreeViewItem::childCount=KTreeViewItem.html#childCount
KTreeViewItem::childIndex=KTreeViewItem.html#childIndex
KTreeViewItem::expandButtonClicked=KTreeViewItem.html#expandButtonClicked
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 3bc2b6d..9a7d776 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -211,7 +211,7 @@ KDatMainWindow::KDatMainWindow()
_tree->insertItem( _backupProfileRootNode = new BackupProfileRootNode() );
_tree->insertItem( new TapeIndexRootNode() );
- connect( TapeDrive::instance(), TQT_SIGNAL( sigtqStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
+ connect( TapeDrive::instance(), TQT_SIGNAL( sigStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
setTapePresent( FALSE );
@@ -446,7 +446,7 @@ void KDatMainWindow::fileBackup()
backupProfile.setRemoveSnapshot( bp->getRemoveSnapshot() );
} else {
TQString name;
- name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
+ name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
name = name.stripWhiteSpace();
TQStringList files;
@@ -556,15 +556,15 @@ void KDatMainWindow::doVerify( bool restore )
Archive* archive = 0;
// Check for marked files first.
for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) {
- if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) ||
- ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) {
- archiveNode = (MountedArchiveNode*)_tapeDriveNode->tqchildAt( i );
+ if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) ||
+ ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) {
+ archiveNode = (MountedArchiveNode*)_tapeDriveNode->childAt( i );
archive = archiveNode->getArchive();
/* 2002-01-30 LEW */
#ifdef DEBUG
printf("KDatMainWindow::doVerify: %d node of %s: ", i,
(SelectableNode*)_tapeDriveNode->getText().latin1() );
- if( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ){
+ if( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ){
printf("is completely selected\n");
} else {
printf("is partially selected\n");
@@ -608,10 +608,10 @@ void KDatMainWindow::doVerify( bool restore )
}
for ( int i = rangeableNode->childCount() - 1; i >= 0; i-- ) {
- if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) {
- files.append( ((MountedTapeDirectoryNode*)rangeableNode->tqchildAt( i ))->getFullPath() );
- } else if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeFileNodeType ) ) {
- files.append( ((MountedTapeFileNode*)rangeableNode->tqchildAt( i ))->getFullPath() );
+ if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) {
+ files.append( ((MountedTapeDirectoryNode*)rangeableNode->childAt( i ))->getFullPath() );
+ } else if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeFileNodeType ) ) {
+ files.append( ((MountedTapeFileNode*)rangeableNode->childAt( i ))->getFullPath() );
} else {
assert( FALSE );
}
@@ -634,7 +634,7 @@ void KDatMainWindow::doVerify( bool restore )
}
for ( int i = archiveNode->childCount() - 1; i >= 0; i-- ) {
- stack.push( (RangeableNode*)archiveNode->tqchildAt( i ) );
+ stack.push( (RangeableNode*)archiveNode->childAt( i ) );
}
RangeableNode* sel = 0;
while ( stack.count() > 0 ) {
@@ -654,7 +654,7 @@ void KDatMainWindow::doVerify( bool restore )
}
} else if ( sel->hasSelectedChildren() ) {
for ( int i = sel->childCount() - 1; i >= 0; i-- ) {
- stack.push( (RangeableNode*)sel->tqchildAt( i ) );
+ stack.push( (RangeableNode*)sel->childAt( i ) );
}
}
}
@@ -865,7 +865,7 @@ void KDatMainWindow::fileFormatTape()
i18n("Format Tape"), i18n("Format"));
if (result == KMessageBox::Continue ) {
TQString name;
- name = i18n( "Tape created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
+ name = i18n( "Tape created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
FormatOptDlg dlg( name.stripWhiteSpace(), this );
if ( dlg.exec() != TQDialog::Accepted ) {
return;
@@ -1165,7 +1165,7 @@ void KDatMainWindow::getBackupFiles( TQStringList& files )
files.append( sel->getFullPath() );
} else if ( sel->hasSelectedChildren() ) {
for ( int i = sel->childCount() - 1; i >= 0; i-- ) {
- stack.push( (ArchiveableNode*)sel->tqchildAt( i ) );
+ stack.push( (ArchiveableNode*)sel->childAt( i ) );
}
}
}
@@ -1192,9 +1192,9 @@ void KDatMainWindow::setBackupFiles( const TQStringList& files )
}
int i;
for ( i = n->childCount() - 1; i >=0; i-- ) {
- tmp = ((ArchiveableNode*)n->tqchildAt( i ))->getFullPath();
+ tmp = ((ArchiveableNode*)n->childAt( i ))->getFullPath();
if ( tmp == (*it).left( tmp.length() ) ) {
- n = (ArchiveableNode*)n->tqchildAt( i );
+ n = (ArchiveableNode*)n->childAt( i );
break;
}
}
@@ -1251,8 +1251,8 @@ void KDatMainWindow::configureUI( Tape* tape )
bool canRestore = ( tape ) && ( sel ) && sel->isType( Node::RangeableNodeType );
if ( !canRestore ) {
for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) {
- if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) ||
- ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) {
+ if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) ||
+ ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) {
canRestore = TRUE;
break;
}
@@ -1348,7 +1348,7 @@ void KDatMainWindow::create_backup_dialog()
_lbl->setGeometry( TQRect( 30, 20, 350, 200 ) );
_cancel = new KPushButton( KStdGuiItem::cancel(), _backupdialog );
- _cancel->setFixedSize( 80, _cancel->tqsizeHint().height() );
+ _cancel->setFixedSize( 80, _cancel->sizeHint().height() );
_cancel->setEnabled( TRUE );
/* 2002-01-24 LEW: looks like we can't increase the button width
to accomodate a wider message :( */
@@ -1357,7 +1357,7 @@ void KDatMainWindow::create_backup_dialog()
connect( _cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupCancel() ) );
_continue = new KPushButton( KStdGuiItem::cont(), _backupdialog );
- _continue->setFixedSize( 80, _continue->tqsizeHint().height() );
+ _continue->setFixedSize( 80, _continue->sizeHint().height() );
_continue->setEnabled( TRUE );
_continue->setDefault( TRUE );
// _continue->setGeometry( TQRect( 200, 170, 0, 0 ) ); /* 2002-01-28 LEW */
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 3505dfb..6adc0f1 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -33,7 +33,7 @@ LoggerWidget::LoggerWidget( const TQString & title, TQWidget* parent, const char
: TQWidget( parent, name )
{
TQLabel* lbl1 = new TQLabel( title, this );
- lbl1->setFixedHeight( lbl1->tqsizeHint().height() );
+ lbl1->setFixedHeight( lbl1->sizeHint().height() );
_mle = new TQMultiLineEdit( this );
_mle->setReadOnly( TRUE );
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 006e978..6e1b174 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -58,7 +58,7 @@ void Node::insertNode( Node* child )
if ( lastParent != this ) {
// Recompute lastDirIndex.
for ( lastDirIndex = 0;
- ( lastDirIndex < childCount() ) && ( ((Node*)tqchildAt( lastDirIndex ))->getType() == TapeDirectoryNodeType );
+ ( lastDirIndex < childCount() ) && ( ((Node*)childAt( lastDirIndex ))->getType() == TapeDirectoryNodeType );
lastDirIndex++ );
lastParent = this;
}
@@ -83,7 +83,7 @@ void Node::insertNode( Node* child )
while ( min < max ) {
mid = ( max - min ) / 2 + min;
//mid = ( min + max ) / 2;
- if ( child->getText().compare( tqchildAt( mid )->getText() ) < 0 ) {
+ if ( child->getText().compare( childAt( mid )->getText() ) < 0 ) {
max = mid - 1;
} else {
min = mid + 1;
@@ -94,8 +94,8 @@ void Node::insertNode( Node* child )
// KLUDGE!
mid -= 5;
if ( mid < smin ) mid = smin;
- if ( ((Node*)tqchildAt( mid ))->getType() != child->getType() ) mid++;
- for ( ; ( mid <= smax ) && ( child->getText().compare( tqchildAt( mid )->getText() ) > 0 ); mid++ );
+ if ( ((Node*)childAt( mid ))->getType() != child->getType() ) mid++;
+ for ( ; ( mid <= smax ) && ( child->getText().compare( childAt( mid )->getText() ) > 0 ); mid++ );
//printf( "index = %d, text = '%s'\n", mid, child->getText().data() );
insertChild( mid, child );
} else {
@@ -181,14 +181,14 @@ bool TapeNode::validate()
// Remove deleted archives.
Archive* a;
for ( uint j = 0; j < childCount(); ) {
- a = ((ArchiveNode*)tqchildAt( j ))->getArchive();
+ a = ((ArchiveNode*)childAt( j ))->getArchive();
for ( i.toFirst(); i.current(); ++i ) {
if ( i.current() == a ) {
break;
}
}
if ( !i.current() ) {
- removeChild( tqchildAt( j ) );
+ removeChild( childAt( j ) );
} else {
j++;
}
@@ -235,8 +235,8 @@ ArchiveNode* TapeNode::findArchiveNode( Archive* archive )
{
ArchiveNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- if ( ((ArchiveNode*)tqchildAt( i ))->getArchive() == archive ) {
- n = (ArchiveNode*)tqchildAt( i );
+ if ( ((ArchiveNode*)childAt( i ))->getArchive() == archive ) {
+ n = (ArchiveNode*)childAt( i );
break;
}
}
@@ -411,7 +411,7 @@ void SelectableNode::doUpdateState()
bool hasSelected = FALSE;
bool allSelected = TRUE;
for ( uint i = 0; i < childCount(); i++ ) {
- switch ( ((SelectableNode*)tqchildAt( i ))->_state ) {
+ switch ( ((SelectableNode*)childAt( i ))->_state ) {
case SelAll:
oneSelected = TRUE;
hasSelected = TRUE;
@@ -446,12 +446,12 @@ void SelectableNode::doSetSelected( bool select )
// All my tqchildren get the same selection state.
for ( uint i = 0; i < childCount(); i++ ) {
if ( select ) {
- if ( !((SelectableNode*)tqchildAt( i ))->isSelected() ) {
- ((SelectableNode*)tqchildAt( i ))->doSetSelected( TRUE );
+ if ( !((SelectableNode*)childAt( i ))->isSelected() ) {
+ ((SelectableNode*)childAt( i ))->doSetSelected( TRUE );
}
} else {
- if ( ((SelectableNode*)tqchildAt( i ))->isSelected() || ((SelectableNode*)tqchildAt( i ))->hasSelectedChildren() ) {
- ((SelectableNode*)tqchildAt( i ))->doSetSelected( FALSE );
+ if ( ((SelectableNode*)childAt( i ))->isSelected() || ((SelectableNode*)childAt( i ))->hasSelectedChildren() ) {
+ ((SelectableNode*)childAt( i ))->doSetSelected( FALSE );
}
}
}
@@ -549,7 +549,7 @@ void SelectableNode::paintText( TQPainter* p, int indent, int cellHeight,
p->fontMetrics().leading()) / 2);
if (highlighted) {
paintHighlight(p, indent, cg, owner->hasFocus(),
- (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
+ (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
p->setPen(cg.base());
p->setBackgroundColor(cg.text());
}
@@ -657,8 +657,8 @@ void MountedArchiveNode::setSelected( bool select )
// Deselect all other archives.
Node* parent = (Node*)getParent();
for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
- if ( parent->tqchildAt( i ) != this ) {
- ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
+ if ( parent->childAt( i ) != this ) {
+ ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
}
}
}
@@ -757,8 +757,8 @@ void MountedTapeDirectoryNode::setSelected( bool select )
parent = (Node*)parent->getParent();
}
for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
- if ( parent->tqchildAt( i ) != arcNode ) {
- ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
+ if ( parent->childAt( i ) != arcNode ) {
+ ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
}
}
}
@@ -863,8 +863,8 @@ void MountedTapeFileNode::setSelected( bool select )
parent = (Node*)parent->getParent();
}
for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
- if ( parent->tqchildAt( i ) != arcNode ) {
- ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
+ if ( parent->childAt( i ) != arcNode ) {
+ ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
}
}
}
@@ -1304,14 +1304,14 @@ void TapeDriveNode::slotTapeModified( Tape* tape )
// Remove deleted archives.
Archive* a;
for ( uint j = 0; j < childCount(); ) {
- a = ((MountedArchiveNode*)tqchildAt( j ))->getArchive();
+ a = ((MountedArchiveNode*)childAt( j ))->getArchive();
for ( i.toFirst(); i.current(); ++i ) {
if ( i.current() == a ) {
break;
}
}
if ( !i.current() ) {
- Node::removeChild( tqchildAt( j ) );
+ Node::removeChild( childAt( j ) );
} else {
j++;
}
@@ -1322,8 +1322,8 @@ MountedArchiveNode* TapeDriveNode::findArchiveNode( Archive* archive )
{
MountedArchiveNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- if ( ((MountedArchiveNode*)tqchildAt( i ))->getArchive() == archive ) {
- n = (MountedArchiveNode*)tqchildAt( i );
+ if ( ((MountedArchiveNode*)childAt( i ))->getArchive() == archive ) {
+ n = (MountedArchiveNode*)childAt( i );
break;
}
}
@@ -1417,7 +1417,7 @@ TapeNode* TapeIndexRootNode::findTapeNode( Tape* tape )
{
TapeNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- n = (TapeNode*)tqchildAt( i );
+ n = (TapeNode*)childAt( i );
if ( n->getTape() == tape ) {
return n;
}
@@ -1575,7 +1575,7 @@ BackupProfileNode* BackupProfileRootNode::findBackupProfileNode( BackupProfile*
{
BackupProfileNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- n = (BackupProfileNode*)tqchildAt( i );
+ n = (BackupProfileNode*)childAt( i );
if ( n->getBackupProfile() == backupProfile ) {
return n;
}
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index aaa9348..f4c96a6 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -43,7 +43,7 @@
_defaultTapeSize
-
+
96
0
@@ -60,7 +60,7 @@
_tapeBlockSize
-
+
96
0
@@ -283,7 +283,7 @@ You must still specify the block size.
Expanding
-
+
20
0
diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp
index 4fbcb25..2e4c59b 100644
--- a/kdat/TapeDrive.cpp
+++ b/kdat/TapeDrive.cpp
@@ -170,15 +170,15 @@ bool TapeDrive::isTapePresent()
}
// Get tape status.
- struct mtget tapetqStatus;
- int ret = ioctl( _fd, MTIOCGET, &tapetqStatus );
+ struct mtget tapeStatus;
+ int ret = ioctl( _fd, MTIOCGET, &tapeStatus );
if ( ret < 0 ) {
return FALSE;
}
// Check for the presence of a tape.
-// if ( !GMT_DR_OPEN( tapetqStatus.mt_gstat ) ) {
- if ( GMT_ONLINE( tapetqStatus.mt_gstat ) ) {
+// if ( !GMT_DR_OPEN( tapeStatus.mt_gstat ) ) {
+ if ( GMT_ONLINE( tapeStatus.mt_gstat ) ) {
// Lock the tape drive door.
//struct mtop tapeOp;
//tapeOp.mt_op = MTLOCK;
@@ -189,9 +189,9 @@ bool TapeDrive::isTapePresent()
//}
if ( _readOnly ) {
- emit sigtqStatus( i18n( "Tape mounted readonly." ) );
+ emit sigStatus( i18n( "Tape mounted readonly." ) );
} else {
- emit sigtqStatus( i18n( "Tape mounted read/write." ) );
+ emit sigStatus( i18n( "Tape mounted read/write." ) );
}
return TRUE;
} else {
@@ -221,14 +221,14 @@ Tape* TapeDrive::readHeader()
_tape = NULL;
// Rewind tape.
- emit sigtqStatus( "Rewinding tape..." );
+ emit sigStatus( "Rewinding tape..." );
if ( !rewind() ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Rewinding tape failed." ));
return NULL;
}
// KDat magic string.
- emit sigtqStatus( i18n( "Reading magic string..." ) );
+ emit sigStatus( i18n( "Reading magic string..." ) );
char magic[9];
if ( read( magic, 9 ) < 9 ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading magic string failed." ));
@@ -240,7 +240,7 @@ Tape* TapeDrive::readHeader()
}
// Read version number.
- emit sigtqStatus( i18n( "Reading version number..." ) );
+ emit sigStatus( i18n( "Reading version number..." ) );
int version;
if ( read( (char*)&version, 4 ) < 4 ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading version number failed." ));
@@ -252,7 +252,7 @@ Tape* TapeDrive::readHeader()
}
// Read tape ID.
- emit sigtqStatus( i18n( "Reading tape ID..." ) );
+ emit sigStatus( i18n( "Reading tape ID..." ) );
int len;
if ( read( (char*)&len, 4 ) < 4 ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading tape ID length failed." ));
@@ -517,12 +517,12 @@ bool TapeDrive::seek( int file, int tarBlock )
flush();
// Go to the desired archive.
- emit sigtqStatus( i18n( "Skipping to archive..." ) );
+ emit sigStatus( i18n( "Skipping to archive..." ) );
int curFile = getFile();
// printf( "TapeDrive::seek() -- curFile = %d\n", curFile );
if ( curFile < 0 ) {
- emit sigtqStatus( i18n( "Rewinding tape..." ) );
+ emit sigStatus( i18n( "Rewinding tape..." ) );
rewind();
curFile = 0;
}
@@ -539,11 +539,11 @@ bool TapeDrive::seek( int file, int tarBlock )
// printf( "TapeDrive::seek() -- desired tapeBlock = %d\n", tapeBlock );
// Go to the desired record within the archive.
- emit sigtqStatus( i18n( "Skipping to block..." ) );
+ emit sigStatus( i18n( "Skipping to block..." ) );
int curBlock = getBlock();
// printf( "TapeDrive::seek() -- curBlock = %d\n", curBlock );
if ( curBlock < 0 ) {
- emit sigtqStatus( i18n( "Rewinding tape..." ) );
+ emit sigStatus( i18n( "Rewinding tape..." ) );
rewind();
nextFile( file );
if ( ( curBlock = getBlock() ) < 0 ) {
@@ -597,13 +597,13 @@ bool TapeDrive::pastEOF()
return FALSE;
}
- struct mtget tapetqStatus;
- if ( ioctl( _fd, MTIOCGET, &tapetqStatus ) < 0 ) {
+ struct mtget tapeStatus;
+ if ( ioctl( _fd, MTIOCGET, &tapeStatus ) < 0 ) {
printf( "TapeDrive::pastEOF() -- ioctl( MTIOCGET ) failed!\n" );
return FALSE;
}
- return GMT_EOF( tapetqStatus.mt_gstat );
+ return GMT_EOF( tapeStatus.mt_gstat );
}
bool TapeDrive::setBlockSize( int blockSize )
diff --git a/kdat/TapeDrive.h b/kdat/TapeDrive.h
index 06a0b82..7e49aa2 100644
--- a/kdat/TapeDrive.h
+++ b/kdat/TapeDrive.h
@@ -242,7 +242,7 @@ signals:
*
* @param msg The informational message.
*/
- void sigtqStatus( const TQString & msg );
+ void sigStatus( const TQString & msg );
};
#endif
diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp
index 2a87862..239d7f1 100644
--- a/kdat/TapeFileInfoWidget.cpp
+++ b/kdat/TapeFileInfoWidget.cpp
@@ -39,32 +39,32 @@ TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl4 = new TQLabel( i18n( "Start record:" ), this );
TQLabel* lbl5 = new TQLabel( i18n( "End record:" ), this );
- int max = lbl1->tqsizeHint().width();
- if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
- if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
- if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
- if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
-
- lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
- lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
- lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
- lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
- lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
+ int max = lbl1->sizeHint().width();
+ if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+ if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+ if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
+ if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
+
+ lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+ lbl4->setFixedSize( max, lbl4->sizeHint().height() );
+ lbl5->setFixedSize( max, lbl5->sizeHint().height() );
_fileName = new TQLabel( "???", this );
- _fileName->setFixedHeight( _fileName->tqsizeHint().height() );
+ _fileName->setFixedHeight( _fileName->sizeHint().height() );
_mtime = new TQLabel( "???", this );
- _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
+ _mtime->setFixedHeight( _mtime->sizeHint().height() );
_size = new TQLabel( "???", this );
- _size->setFixedHeight( _size->tqsizeHint().height() );
+ _size->setFixedHeight( _size->sizeHint().height() );
_startRecord = new TQLabel( "???", this );
- _startRecord->setFixedHeight( _startRecord->tqsizeHint().height() );
+ _startRecord->setFixedHeight( _startRecord->sizeHint().height() );
_endRecord = new TQLabel( "???", this );
- _endRecord->setFixedHeight( _endRecord->tqsizeHint().height() );
+ _endRecord->setFixedHeight( _endRecord->sizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 3e94ae8..9ee819a 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -49,50 +49,50 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl6 = new TQLabel( i18n( "Archive count:" ), this );
TQLabel* lbl7 = new TQLabel( i18n( "Space used:" ), this );
- int max = lbl1->tqsizeHint().width();
- if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
- if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
- if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
- if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
- if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width();
- if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width();
-
- lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
- lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
- lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
- lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
- lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
- lbl6->setFixedSize( max, lbl6->tqsizeHint().height() );
- lbl7->setFixedSize( max, lbl7->tqsizeHint().height() );
+ int max = lbl1->sizeHint().width();
+ if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+ if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+ if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
+ if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
+ if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width();
+ if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width();
+
+ lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+ lbl4->setFixedSize( max, lbl4->sizeHint().height() );
+ lbl5->setFixedSize( max, lbl5->sizeHint().height() );
+ lbl6->setFixedSize( max, lbl6->sizeHint().height() );
+ lbl7->setFixedSize( max, lbl7->sizeHint().height() );
_tapeName = new TQLineEdit( this );
- _tapeName->setFixedHeight( _tapeName->tqsizeHint().height() );
+ _tapeName->setFixedHeight( _tapeName->sizeHint().height() );
_tapeSize = new TQLineEdit( this );
- _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() );
+ _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() );
_tapeSizeUnits = new TQComboBox( this );
- _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() );
+ _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() );
_tapeSizeUnits->insertItem( "MB" );
_tapeSizeUnits->insertItem( "GB" );
_tapeID = new TQLabel( "???", this );
- _tapeID->setFixedHeight( _tapeID->tqsizeHint().height() );
+ _tapeID->setFixedHeight( _tapeID->sizeHint().height() );
_ctime = new TQLabel( "???", this );
- _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
+ _ctime->setFixedHeight( _ctime->sizeHint().height() );
_mtime = new TQLabel( "???", this );
- _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
+ _mtime->setFixedHeight( _mtime->sizeHint().height() );
_archiveCount = new TQLabel( "???", this );
- _archiveCount->setFixedHeight( _archiveCount->tqsizeHint().height() );
+ _archiveCount->setFixedHeight( _archiveCount->sizeHint().height() );
_spaceUsed = new TQLabel( "???", this );
- _spaceUsed->setFixedHeight( _spaceUsed->tqsizeHint().height() );
+ _spaceUsed->setFixedHeight( _spaceUsed->sizeHint().height() );
_apply = new KPushButton( KStdGuiItem::apply(), this );
- _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
+ _apply->setFixedSize( 80, _apply->sizeHint().height() );
_apply->setEnabled( FALSE );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
@@ -202,7 +202,7 @@ void TapeInfoWidget::setTape( Tape* tape )
used *= blockSize / 1024;
}
if ( _tape->getSize() > 0 ) {
- tmp = TQString::tqfromLatin1( "%1 / %2 (%3%)")
+ tmp = TQString::fromLatin1( "%1 / %2 (%3%)")
.tqarg(Util::kbytesToString( used ))
.tqarg(Util::kbytesToString( _tape->getSize() ))
.tqarg(used * 100 / _tape->getSize() );
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 209c177..f15dcff 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -89,46 +89,46 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
- lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
+ lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
_elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
- _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
+ _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
- lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
+ lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
_timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
- _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
+ _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
- lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
+ lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( _archiveSize ), f1 );
- totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
+ totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
TQLabel* lbl4 = new TQLabel( i18n( "KB read:" ), f2 );
- lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
+ lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
_kbytesRead = new TQLabel( i18n( "0KB" ), f2 );
- _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
+ _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
- lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
+ lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
_transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
- _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
+ _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
TQLabel* lbl6;
if ( _restore ) {
lbl6 = new TQLabel( i18n( "Files:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
} else {
lbl6 = new TQLabel( i18n( "Differences:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
}
_files = new TQLabel( "0", f2 );
- _files->setFixedHeight( _files->tqsizeHint().height() );
+ _files->setFixedHeight( _files->sizeHint().height() );
if ( _restore ) {
_log = new LoggerWidget( i18n( "Restore log:" ), this );
@@ -137,17 +137,17 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
}
_ok = new KPushButton( KStdGuiItem::ok(), this );
- _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
+ _ok->setFixedSize( 80, _ok->sizeHint().height() );
connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
_ok->setEnabled( FALSE );
_save = new TQPushButton( i18n( "&Save Log..." ), this );
- _save->setFixedSize( 80, _save->tqsizeHint().height() );
+ _save->setFixedSize( 80, _save->sizeHint().height() );
connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
_save->setEnabled( FALSE );
_abort = new TQPushButton( i18n( "&Abort" ), this );
- _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
+ _abort->setFixedSize( 80, _abort->sizeHint().height() );
connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h
index 41df846..e9b5db6 100644
--- a/kdat/VerifyDlg.h
+++ b/kdat/VerifyDlg.h
@@ -33,7 +33,7 @@ class LoggerWidget;
class TapeDrive;
/**
- * @short tqStatus dialog for verifying/restoring parts of an archive.
+ * @short Status dialog for verifying/restoring parts of an archive.
*/
class VerifyDlg : public TQDialog {
Q_OBJECT
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index a1f1353..f65d41f 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -51,14 +51,14 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
} else {
lbl1 = new TQLabel( i18n( "Verify in folder:" ), this );
}
- lbl1->setFixedSize( lbl1->tqsizeHint() );
+ lbl1->setFixedSize( lbl1->sizeHint() );
_entry = new TQLineEdit( this );
_entry->setText( def );
- _entry->setFixedHeight( _entry->tqsizeHint().height() );
+ _entry->setFixedHeight( _entry->sizeHint().height() );
TQPushButton* browse = new TQPushButton( i18n( "..." ), this );
- browse->setFixedSize( browse->tqsizeHint() );
+ browse->setFixedSize( browse->sizeHint() );
TQLabel* lbl2;
if ( _restore ) {
@@ -66,15 +66,15 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
} else {
lbl2 = new TQLabel( i18n( "Verify files:" ), this );
}
- lbl2->setFixedHeight( lbl2->tqsizeHint().height() );
+ lbl2->setFixedHeight( lbl2->sizeHint().height() );
TQListBox* fileList = new TQListBox( this );
fileList->insertStringList(files);
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
- ok->setFixedSize( 80, ok->tqsizeHint().height() );
+ ok->setFixedSize( 80, ok->sizeHint().height() );
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
- cancel->setFixedSize( 80, cancel->tqsizeHint().height() );
+ cancel->setFixedSize( 80, cancel->sizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp
index 516fb92..9c08c54 100644
--- a/kdat/ktreeview.cpp
+++ b/kdat/ktreeview.cpp
@@ -121,7 +121,7 @@ TQRect KTreeViewItem::boundingRect(int indent) const
}
// returns the child item at the specified index
-KTreeViewItem* KTreeViewItem::tqchildAt(int index) const
+KTreeViewItem* KTreeViewItem::childAt(int index) const
{
if (!hasChild())
return 0;
@@ -333,14 +333,14 @@ void KTreeViewItem::paintExpandButton(TQPainter* p, int indent, int cellHeight)
}
// paint the highlight
-void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& tqcolorGroup,
+void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& colorGroup,
bool hasFocus, TQt::GUIStyle style) const
{
TQColor fc;
if (style == TQt::WindowsStyle)
fc = TQt::darkBlue; /* hardcoded in TQt */
else
- fc = tqcolorGroup.text();
+ fc = colorGroup.text();
TQRect textRect = textBoundingRect(indent);
int t,l,b,r;
textRect.coords(&l, &t, &r, &b);
@@ -372,7 +372,7 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight,
p->fontMetrics().leading()) / 2);
if (highlighted) {
paintHighlight(p, indent, cg, owner->hasFocus(),
- (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
+ (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
p->setPen(cg.base());
p->setBackgroundColor(cg.text());
}
@@ -599,7 +599,7 @@ KTreeView::KTreeView(TQWidget *parent,
//case WindowsStyle:
//case MotifStyle:
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
- setBackgroundColor(tqcolorGroup().base());
+ setBackgroundColor(colorGroup().base());
//break;
/*default:
setFrameStyle(TQFrame::Panel | TQFrame::Plain);
@@ -1649,7 +1649,7 @@ void KTreeView::lowerItem(KTreeViewItem *item)
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
takeItem(item);
- insertItem(itemParent->tqchildAt(itemChildIndex), item, FALSE);
+ insertItem(itemParent->childAt(itemChildIndex), item, FALSE);
if(autoU && isVisible())
tqrepaint();
setAutoUpdate(autoU);
@@ -1859,7 +1859,7 @@ void KTreeView::paintCell(TQPainter* p, int row, int)
return;
p->setClipRect(cellRect(), TQPainter::CoordPainter );
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
int indent = indentation(item);
item->paint(p, indent, cg,
current == row); /* highlighted */
@@ -1875,7 +1875,7 @@ void KTreeView::raiseItem(KTreeViewItem *item)
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
takeItem(item);
- insertItem(itemParent->tqchildAt(--itemChildIndex), item, TRUE);
+ insertItem(itemParent->childAt(--itemChildIndex), item, TRUE);
if(autoU && isVisible())
tqrepaint();
setAutoUpdate(autoU);
@@ -1961,7 +1961,7 @@ void KTreeView::split(KTreeViewItem *item)
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
takeItem(item);
- appendChildItem(itemParent->tqchildAt(--itemChildIndex), item);
+ appendChildItem(itemParent->childAt(--itemChildIndex), item);
if(autoU && isVisible())
tqrepaint();
setAutoUpdate(autoU);
diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h
index d0af2d5..deed0f8 100644
--- a/kdat/ktreeview.h
+++ b/kdat/ktreeview.h
@@ -70,7 +70,7 @@ public:
* Returns a pointer to the child item at the given index in this
* item's sub tree, or 0 if not found.
*/
- KTreeViewItem* tqchildAt(int index) const;
+ KTreeViewItem* childAt(int index) const;
/**
* Returns the number of child items in this item's sub tree.
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
index 2066705..60a720f 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui
@@ -22,13 +22,13 @@
0
-
+
0
0
-
+
32767
32767
@@ -80,7 +80,7 @@
Expanding
-
+
130
20
@@ -118,7 +118,7 @@
Expanding
-
+
50
20
@@ -166,7 +166,7 @@
Expanding
-
+
16
20
@@ -252,7 +252,7 @@
Expanding
-
+
16
20
@@ -269,7 +269,7 @@
Expanding
-
+
16
20
@@ -321,7 +321,7 @@
Expanding
-
+
16
20
@@ -352,7 +352,7 @@
Expanding
-
+
16
20
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index 4bacfab..f79401d 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -12,13 +12,13 @@
81
-
+
0
0
-
+
32767
32767
@@ -44,7 +44,7 @@
Expanding
-
+
80
16
@@ -69,7 +69,7 @@
Expanding
-
+
20
16
@@ -116,7 +116,7 @@
Expanding
-
+
20
16
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 397df4c..34f1ccb 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -48,7 +48,7 @@
Preferred
-
+
16
20
@@ -70,7 +70,7 @@
Expanding
-
+
80
20
@@ -89,7 +89,7 @@
Expanding
-
+
180
20
@@ -114,7 +114,7 @@
Expanding
-
+
20
16
@@ -139,7 +139,7 @@
Expanding
-
+
20
16
@@ -174,7 +174,7 @@
kpbAddHost
-
+
32767
32767
@@ -191,7 +191,7 @@
kpbEditHost
-
+
32767
32767
@@ -208,7 +208,7 @@
kpbRemoveHost
-
+
32767
32767
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
index 0986db4..37098be 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
@@ -43,7 +43,7 @@
Expanding
-
+
21
20
@@ -54,7 +54,7 @@
label
-
+
150
0
@@ -74,7 +74,7 @@
Expanding
-
+
20
20
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index 2405333..21db184 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -20,13 +20,13 @@
0
-
+
510
410
-
+
32767
32767
@@ -95,7 +95,7 @@
Expanding
-
+
301
20
@@ -231,7 +231,7 @@
Expanding
-
+
20
230
@@ -306,7 +306,7 @@
Expanding
-
+
181
0
@@ -358,7 +358,7 @@
Expanding
-
+
31
0
@@ -385,13 +385,13 @@
0
-
+
70
0
-
+
65
32767
@@ -415,7 +415,7 @@
Expanding
-
+
0
90
@@ -478,7 +478,7 @@
Expanding
-
+
16
20
@@ -523,7 +523,7 @@
Expanding
-
+
16
16
@@ -550,7 +550,7 @@
Expanding
-
+
20
21
@@ -561,7 +561,7 @@
kpbAddDomainServer
-
+
32767
32767
@@ -578,7 +578,7 @@
kpbEditDomainServer
-
+
32767
32767
@@ -595,7 +595,7 @@
kpbRemoveDomainServer
-
+
32767
32767
@@ -618,7 +618,7 @@
Expanding
-
+
20
21
@@ -679,7 +679,7 @@
kpbAddKnownHost
-
+
32767
32767
@@ -696,7 +696,7 @@
kpbEditKnownHost
-
+
32767
32767
@@ -713,7 +713,7 @@
kpbRemoveKnownHost
-
+
32767
32767
@@ -857,7 +857,7 @@
Expanding
-
+
21
51
@@ -876,7 +876,7 @@
Expanding
-
+
20
150
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index 579f0e4..03bf9a4 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -60,9 +60,9 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
if ( !item )
return;
- const TQRect tqitemRect = listView->tqitemRect( item );
+ const TQRect itemRect = listView->itemRect( item );
- if ( !tqitemRect.isValid() )
+ if ( !itemRect.isValid() )
return;
const int col = listView->header()->sectionAt( p.x() );
@@ -75,7 +75,7 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
if ( !headerRect.isValid() )
return;
- const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width() + 60, tqitemRect.height() );
+ const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width() + 60, itemRect.height() );
TQString tipStr;
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index 9a1f62d..f56d9ef 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -12,13 +12,13 @@
130
-
+
342
130
-
+
342
130
@@ -32,7 +32,7 @@
- tlNetworktqStatus
+ tlNetworkStatus
diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui
index 2bbfd95..496502b 100644
--- a/knetworkconf/knetworkconf/kselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui
@@ -79,7 +79,7 @@
Expanding
-
+
130
20
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index ce28d21..498f93c 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList *pki)
packageInfo *p;
TQStringList plist;
- kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQString cmd = "cat " STATUS;
TQStringList list = kpty->run(cmd);
- kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -228,7 +228,7 @@ void DEBAPT::listRPack(TQPtrList *pki)
}
list.clear();
- kpackage->settqStatus(i18n("DEB APT"));
+ kpackage->setStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList *pki)
// kdDebug() << "H=" << hostName << "\n";
if (hostName.isEmpty())
- kpackage->settqStatus(i18n("Querying DEB APT available list"));
+ kpackage->setStatus(i18n("Querying DEB APT available list"));
else
- kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQStringList list = kpty->run("apt-cache dumpavail");
if (hostName.isEmpty())
- kpackage->settqStatus(i18n("Processing DEB APT available list"));
+ kpackage->setStatus(i18n("Processing DEB APT available list"));
else
- kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
// kdDebug() << "A=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -284,7 +284,7 @@ void DEBAPT::listAvail(TQPtrList *pki)
}
list.clear();
- kpackage->settqStatus(i18n("DEB APT"));
+ kpackage->setStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index d0bdd69..41146fe 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -155,7 +155,7 @@ void DEB::listPackList(TQPtrList *pki, const TQString &fname, cache
local = u.isLocalFile();
}
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
TQFile file(STATUS);
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 7831a5e..730e769 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -128,7 +128,7 @@ static void insertGroups(TQMap *a, TQString cats)
packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, const TQString &version) {
TQString name( pname);
bool installed = false;
- kpackage->settqStatus(i18n("Getting package info"));
+ kpackage->setStatus(i18n("Getting package info"));
kdDebug() << "Looking at package " << pname << endl;
@@ -205,7 +205,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
}
a["description"] = desc;
} else {
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return 0;
}
@@ -213,7 +213,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
ret->packageState = installed? packageInfo::INSTALLED : packageInfo::AVAILABLE;
ret->fixup();
if (!installed) ret->smerge(typeID);
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return ret;
}
@@ -234,7 +234,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
// Run pkg_info on the package name to get the file list.
// The file list is returned on stdout, one per line.
- kpackage->settqStatus(i18n("Getting file list"));
+ kpackage->setStatus(i18n("Getting file list"));
TQStringList ret;
@@ -249,7 +249,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
} else {
if (!p->hasProperty("name")) {
ret.append(i18n("Can't find package name!"));
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return ret;
}
@@ -270,7 +270,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
ret = list;
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return ret;
}
@@ -498,7 +498,7 @@ int fbsdInterface::pathInfo(TQMap &a)
// Open a pipe to a pkg_info process in order to read the comment, name
// and description for the packages.
- kpackage->settqStatus(i18n("Querying BSD packages database for installed packages"));
+ kpackage->setStatus(i18n("Querying BSD packages database for installed packages"));
TQString cmd = PKG_INFO_BIN;
cmd += " -acdl ";
@@ -528,7 +528,7 @@ int fbsdInterface::pathInfo(TQMap &a)
TQString pkg = name.section(' ',-1);
if (pkg.isEmpty()) {
KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return;
} else {
if (pkg[pkg.length()-1] == ':') {
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 877f2f3..6a333f8 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -68,7 +68,7 @@ FindF::FindF(TQWidget *parent)
value->setFocus();
TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1);
- valueLabel->tqsetAlignment( AlignRight );
+ valueLabel->setAlignment( AlignRight );
tab = new KListView(frame1, "tab");
connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 964f21c..448b74c 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -124,7 +124,7 @@ void Gentoo::listInstalledPackages(TQPtrList *pki)
TQString sline = i18n("Looking for Gentoo packages: ");
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
TQFile f(portageDir+"profiles/categories");
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 4ed7c74..29de45f 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -143,7 +143,7 @@ void KISS::listInstalledPackages(TQPtrList *pki)
if (!reader.start(0,FALSE))
return;
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
vb = "" ;
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index 34d0a0a..c7e99b6 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -44,7 +44,7 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent, const char * name ) :
pty = pt;
setFont(KGlobalSettings::fixedFont());
// setMinimumWidth(fontMetrics().maxWidth()*80 +
- // tqminimumSizeHint().width());
+ // minimumSizeHint().width());
setWordWrap(NoWrap);
setReadOnly(TRUE);
}
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 17697ce..041c793 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
} else {
save_url = url;
- settqStatus(i18n("Starting KIO"));
+ setStatus(i18n("Starting KIO"));
Kio kio;
if (kio.download(url, cf)) {
- settqStatus(i18n("KIO finished"));
+ setStatus(i18n("KIO finished"));
TQFileInfo fi(cf);
if (!(fi.exists() && fi.size() > 0)) {
unlink(TQFile::encodeName(cf));
@@ -660,7 +660,7 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
return cf;
}
} else {
- settqStatus(i18n("KIO failed"));
+ setStatus(i18n("KIO failed"));
return "";
}
}
@@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped
openNetFiles(list.toStringList());
}
-void KPACKAGE::settqStatus(const TQString &s) // set the text in the status bar
+void KPACKAGE::setStatus(const TQString &s) // set the text in the status bar
{
status->setText(s);
kapp->processEvents(); // refresh the screen
}
-TQString KPACKAGE::gettqStatus() // get the text in the status bar
+TQString KPACKAGE::getStatus() // get the text in the status bar
{
if(status)
return status->text();
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 2b72029..c096a0c 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -77,13 +77,13 @@ public:
OPEN_READONLY = 2,
OPEN_INSERT = 4 };
- void settqStatus(const TQString &s);
+ void setStatus(const TQString &s);
// this sets the status bar's string to s
void setPercent(int x);
// this set the status bar's progress to x
- TQString gettqStatus();
+ TQString getStatus();
// this gets the current status string on the status bar
// void setMode(int newmode, pkgInterface *type, int refresh);
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 3ec4d07..5298d56 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
packageInfo *i;
int n = 0;
- kpackage->settqStatus(i18n("Building package tree"));
+ kpackage->setStatus(i18n("Building package tree"));
kpackage->setPercent(0);
treeList->setSorting(-1);
@@ -378,7 +378,7 @@ void managementWidget::rebuildListTree()
treeList->setSorting(0);
kpackage->setPercent(100); // set the progress
- kpackage->settqStatus("");
+ kpackage->setStatus("");
checkMarked();
}
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 7594d51..a65e17a 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -146,7 +146,7 @@ Options::Options(TQWidget *parent)
vp->addWidget(pcache[2]);
TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ;
- cd->tqsetSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
+ cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
cachedir = new KURLRequester("", cd, "cachedir");
}
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index 5016439..8941327 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -280,7 +280,7 @@ void packageDisplayWidget::updateFileList()
TQStringList errorfiles;
// set the status
- kpackage->settqStatus(i18n("Updating File List"));
+ kpackage->setStatus(i18n("Updating File List"));
// clear the file list
fileList->clear();
@@ -306,7 +306,7 @@ void packageDisplayWidget::updateFileList()
errorfiles = package->interface->verify(package, files);
}
- kpackage->settqStatus(i18n("Updating File List"));
+ kpackage->setStatus(i18n("Updating File List"));
uint c=0, p=0;
uint step = (files.count() / 100) + 1;
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 05fd3ca..2e1aca7 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -46,7 +46,7 @@ packagePropertiesWidget::packagePropertiesWidget
// hide();
package=NULL;
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
setBackgroundColor(cg.base());
initTranslate();
}
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index fba9263..93c7d28 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -142,7 +142,7 @@ void pkgInterface::listDir(TQPtrList *pki, const TQString &fname, c
packageInfo *p;
TQString sline( queryMsg + fname );
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
kdDebug() << "listDir fn=" << fname << " dir=" << dir << endl;
@@ -163,8 +163,8 @@ void pkgInterface::listDir(TQPtrList *pki, const TQString &fname, c
while ( (fi=it.current()) ) { // for each entry...
if ( fi->isDir() ) {
// entry is a subdir
- if ( fi->fileName() != TQString::tqfromLatin1(".") &&
- fi->fileName() != TQString::tqfromLatin1("..") )
+ if ( fi->fileName() != TQString::fromLatin1(".") &&
+ fi->fileName() != TQString::fromLatin1("..") )
{
// not current dir and not parent dir
// -> recursive call:
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
unlink(TQFile::encodeName(tmpf));
if (kpkg)
- kpackage->settqStatus(i18n("Starting Kio"));
+ kpackage->setStatus(i18n("Starting Kio"));
Kio kio;
if (kio.download(url, tmpf)) {
if (kpkg)
- kpackage->settqStatus(i18n("Kio finished"));
+ kpackage->setStatus(i18n("Kio finished"));
TQFileInfo f(tmpf);
if (!(f.exists() && f.size() > 0)) {
unlink(TQFile::encodeName(tmpf));
@@ -272,7 +272,7 @@ TQString pkgInterface::getPackList(cacheObj *cp)
}
} else {
if (kpkg)
- kpackage->settqStatus(i18n("Kio failed"));
+ kpackage->setStatus(i18n("Kio failed"));
return "";
}
} else {
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
uint step = (files.count() / 100) + 1;
- kpackage->settqStatus(i18n("Verifying"));
+ kpackage->setStatus(i18n("Verifying"));
kpackage->setPercent(0);
for( TQStringList::ConstIterator it = files.begin();
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 9017c8a..a17e9cb 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -36,7 +36,7 @@ Modal::Modal(TQString msg, TQWidget *parent, const char * name )
: KDialog( parent, name, TRUE )
{
TQLabel *line1 = new TQLabel(msg,this);
- line1->tqsetAlignment(AlignCenter);
+ line1->setAlignment(AlignCenter);
line1->setAutoResize(true);
}
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 9b0401f..1cc4a85 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -160,11 +160,11 @@ void RPM::listInstalledPackages(TQPtrList *pki)
TQString cmd = "rpm -q -a";
cmd += packageQuery();
- kpackage->settqStatus(i18n("Querying RPM package list"));
+ kpackage->setStatus(i18n("Querying RPM package list"));
kpackage->setPercent(0);
TQStringList list = kpty->run(cmd);
- kpackage->settqStatus(i18n("Processing RPM package list"));
+ kpackage->setStatus(i18n("Processing RPM package list"));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -197,7 +197,7 @@ void RPM::listInstalledPackages(TQPtrList *pki)
}
list.clear();
- kpackage->settqStatus(i18n("DEB APT"));
+ kpackage->setStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index 2a7bb25..8338ee8 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -54,7 +54,7 @@ Search::Search(TQWidget *parent, const char * name)
value = new TQLineEdit( frame1, "v");
vf->addWidget(value,0);
value->setFocus();
- value->setFixedHeight(value->tqsizeHint().height());
+ value->setFixedHeight(value->sizeHint().height());
value->setMinimumWidth(250);
connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &)));
@@ -64,13 +64,13 @@ Search::Search(TQWidget *parent, const char * name)
substr = new TQCheckBox(i18n("Sub string"), frame1, "substr");
substr->setChecked(TRUE);
hc->addWidget(substr,1,AlignLeft);
- substr->setFixedSize(substr->tqsizeHint());
+ substr->setFixedSize(substr->sizeHint());
hc->addStretch(1);
wrap = new TQCheckBox(i18n("Wrap search"), frame1, "wrap");
wrap->setChecked(TRUE);
hc->addWidget(wrap,1,AlignRight);
- wrap->setFixedSize(wrap->tqsizeHint());
+ wrap->setFixedSize(wrap->sizeHint());
enableButton( User1, false );
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index ae51d7b..e4c97a6 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -206,7 +206,7 @@ void SLACK::listInstalledPackages(TQPtrList *pki)
TQDir d(DIR);
if (d.exists()) {
TQString sline = i18n("Querying SLACK package list: ");
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
@@ -260,7 +260,7 @@ void SLACK::listPackList(TQPtrList *pki, const TQString &s, cacheO
TQString sline = i18n("Querying SLACK package list: ");
sline += cp->location;
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
np = 0;
@@ -619,7 +619,7 @@ TQStringList SLACK::FindFile(const TQString &name, bool)
TQDir d(DIR);
if (d.exists()) {
TQString sline = i18n("Querying SLACK package list: ");
- kpackage->settqStatus(sline);
+ kpackage->setStatus(sline);
const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 1a66446..8192083 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -140,7 +140,7 @@ dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
if (bsubdirs) {
psubdirs = new TQCheckBox(i18n("Subfolders"),this);
- psubdirs->setFixedSize(psubdirs->tqsizeHint());
+ psubdirs->setFixedSize(psubdirs->sizeHint());
pack->addWidget(psubdirs,0);
}
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 8c7dc90..001227d 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -201,7 +201,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
s >> rlMagic;
s >> section;
- if (rlMagic != TQString::tqfromLatin1("RUNLEVEL %1").tqarg(i))
+ if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").tqarg(i))
return false;
if (section != "START")
@@ -240,14 +240,14 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
s << TQCString("KSysV")
<< version
- << TQDateTime::tqcurrentDateTime(); // save date
+ << TQDateTime::currentDateTime(); // save date
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
TQ_INT32 numberOfItems = start[i]->childCount();
- s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i)
- << TQString::tqfromLatin1 ("START")
+ s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i)
+ << TQString::fromLatin1 ("START")
<< numberOfItems;
for (TQListViewItemIterator it (start[i]);
@@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
numberOfItems = stop[i]->childCount();
- s << TQString::tqfromLatin1 ("STOP")
+ s << TQString::fromLatin1 ("STOP")
<< numberOfItems;
for (TQListViewItemIterator it (stop[i]);
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index dabf882..2a7523c 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -1062,16 +1062,16 @@ void KSVContent::calcMinSize ()
TQCOORD& w = mMinSize.rwidth();
TQCOORD& h = mMinSize.rheight();
- w = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().width();
- h = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().height();
+ w = 2 * KDialog::marginHint() + mScriptBox->sizeHint().width();
+ h = 2 * KDialog::marginHint() + mScriptBox->sizeHint().height();
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
if (mRunlevels[i]->isHidden())
continue;
- w += KDialog::spacingHint() + mRunlevels[i]->tqsizeHint().width();
- h = kMax (h, mRunlevels[i]->tqsizeHint().height());
+ w += KDialog::spacingHint() + mRunlevels[i]->sizeHint().width();
+ h = kMax (h, mRunlevels[i]->sizeHint().height());
}
mContent->tqlayout()->setEnabled(false);
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 2c92baa..06c7097 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -33,7 +33,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
parent, "KSysV Preferences", true, true),
mConfig (KSVConfig::self())
{
- setMinimumSize (tqsizeHint ());
+ setMinimumSize (sizeHint ());
/**
* Look & Feel Page
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index 1e2e8bf..aee06bf 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -48,7 +48,7 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props)
desc->setSpacing (1);
TQLabel* label = new TQLabel(i18n("Description:"), desc);
- label->setFixedHeight (label->tqsizeHint().height());
+ label->setFixedHeight (label->sizeHint().height());
TQString text;
ksv::getServiceDescription (data.filename(), text);
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index 5c31402..e766e77 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -37,7 +37,7 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString
lockBox->setMargin (1);
lockBox->setFrameStyle (TQFrame::NoFrame);
- lockBox->setFixedSize (lockBox->tqsizeHint());
+ lockBox->setFixedSize (lockBox->sizeHint());
connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent()));
mTimer->start (mInterval);
diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index b4687d6..4b7d4ef 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -25,7 +25,7 @@
#include "ksvdraglist.h"
#include "ServiceDlg.h"
-#define MIN_SIZE(A) A->setMinimumSize(A->tqsizeHint())
+#define MIN_SIZE(A) A->setMinimumSize(A->sizeHint())
ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
TQWidget* parent, const char* name)
@@ -40,14 +40,14 @@ ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
MIN_SIZE(desc);
desc->setBuddy(mServices);
MIN_SIZE(mServices);
- mServices->setMinimumWidth(mServices->tqminimumSize().width() * 2);
+ mServices->setMinimumWidth(mServices->minimumSize().width() * 2);
TQBoxLayout* serv_layout = new TQHBoxLayout();
top->addLayout (serv_layout);
serv_layout->addWidget(desc);
serv_layout->addWidget(mServices);
- setFixedSize (tqsizeHint());
+ setFixedSize (sizeHint());
}
ServiceDlg::~ServiceDlg()
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index f039d63..4dedbe3 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -87,12 +87,12 @@
#include
#include
-namespace tqStatus
+namespace Status
{
enum {
Changed, Checklist, Writable
};
-} // namespace tqStatus
+} // namespace Status
KSVTopLevel::KSVTopLevel()
: KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose),
@@ -428,14 +428,14 @@ void KSVTopLevel::initStatusBar()
"recommended though, due to security issues.")
.tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName()));
- authIconBox->setMinimumSize (authIconBox->tqminimumSizeHint());
- visBox->setMinimumSize (visBox->tqminimumSizeHint());
+ authIconBox->setMinimumSize (authIconBox->minimumSizeHint());
+ visBox->setMinimumSize (visBox->minimumSizeHint());
status->addWidget (authIconBox, 0, false);
- status->insertItem ("", tqStatus::Changed, 100);
+ status->insertItem ("", Status::Changed, 100);
status->addWidget (visBox, 0, true);
- status->setItemAlignment (tqStatus::Changed, AlignLeft|AlignVCenter);
+ status->setItemAlignment (Status::Changed, AlignLeft|AlignVCenter);
}
void KSVTopLevel::slotShowConfig()
@@ -499,7 +499,7 @@ void KSVTopLevel::saveOptions()
void KSVTopLevel::slotUpdateRunning (const TQString& text)
{
- statusBar()->changeItem(text, tqStatus::Changed);
+ statusBar()->changeItem(text, Status::Changed);
}
void KSVTopLevel::editCut() {
@@ -563,7 +563,7 @@ void KSVTopLevel::setChanged (bool val)
mFileSave->setEnabled (val);
// update statusbar
- statusBar()->changeItem(val ? i18n(" Changed") : TQString(), tqStatus::Changed);
+ statusBar()->changeItem(val ? i18n(" Changed") : TQString(), Status::Changed);
// clear messages
statusBar()->clear();
@@ -651,7 +651,7 @@ void KSVTopLevel::print()
// .arg (ksv::hostname()));
// y += fm.lineSpacing();
-// p.drawText (10, y, TQDateTime::tqcurrentDateTime().toString());
+// p.drawText (10, y, TQDateTime::currentDateTime().toString());
// y += fm.lineSpacing() * 2; // an extra empty line
// for (int i = 0; i < ksv::runlevelNumber; ++i)
@@ -771,17 +771,17 @@ void KSVTopLevel::printLog()
rheading.setWidth (&p, width);
int tmp_h = rheading.height();
TQRegion region (0, y, width, tmp_h);
- rheading.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+ rheading.draw (&p, 0, y, region, colorGroup(), 0L);
y += tmp_h;
- TQSimpleRichText rdate (i18n("Printed on %1
").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())),
+ TQSimpleRichText rdate (i18n("Printed on %1
").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
TQFont("times"), TQString(), ksv::styleSheet(),
TQMimeSourceFactory::defaultFactory());
rdate.setWidth (&p, width);
tmp_h = rdate.height();
TQRegion r2 (0, y, width, tmp_h);
- rdate.draw (&p, 0, y, r2, tqcolorGroup(), 0L);
+ rdate.draw (&p, 0, y, r2, colorGroup(), 0L);
y += tmp_h;
}
@@ -799,7 +799,7 @@ void KSVTopLevel::printLog()
break;
TQRegion region (0, y, width, tmp_h);
- rich.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+ rich.draw (&p, 0, y, region, colorGroup(), 0L);
y += tmp_h;
++line;
@@ -938,7 +938,7 @@ void KSVTopLevel::slotSaveLog()
s << "KDE System V Init Editor"
<< endl
- << TQDateTime::tqcurrentDateTime().toString()
+ << TQDateTime::currentDateTime().toString()
<< endl << endl
<< mView->log()
<< endl;
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 15dc5b9..7255ac6 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -137,7 +137,7 @@
Expanding
- tqsizeHint
+ sizeHint
20
20
@@ -281,7 +281,7 @@
Expanding
- tqsizeHint
+ sizeHint
20
20
@@ -367,7 +367,7 @@
mServicesPath
- tqminimumSize
+ minimumSize
100
0
@@ -430,7 +430,7 @@
- tqminimumSize
+ minimumSize
0
10
@@ -489,7 +489,7 @@
mRunlevelPath
- tqminimumSize
+ minimumSize
100
0
@@ -544,7 +544,7 @@
Expanding
- tqsizeHint
+ sizeHint
20
20
diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp
index 95af765..1ff34e2 100644
--- a/ksysv/kdltooltip.cpp
+++ b/ksysv/kdltooltip.cpp
@@ -73,7 +73,7 @@ void KDLToolTip::maybeTip (const TQPoint& p)
}
else if (item)
{
- rect = mParent->tqitemRect (i);
+ rect = mParent->itemRect (i);
rect.moveTopLeft (mParent->viewport()->mapToParent (rect.topLeft()));
text = item->tooltip();
@@ -84,7 +84,7 @@ void KDLToolTip::maybeTip (const TQPoint& p)
TQListViewItem* last = mParent->lastItem();
if (last)
- rect.setTop (mParent->viewport()->mapToParent (mParent->tqitemRect(last).bottomRight()).y());
+ rect.setTop (mParent->viewport()->mapToParent (mParent->itemRect(last).bottomRight()).y());
text = mParent->tooltip();
}
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index 986e805..f79e521 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -77,18 +77,18 @@ void KScroller::resizeEvent (TQResizeEvent* e)
updateScrollBars();
}
-TQSize KScroller::tqminimumSizeHint() const
+TQSize KScroller::minimumSizeHint() const
{
- TQSize size = tqsizeHint();
+ TQSize size = sizeHint();
if (size.width() > 300)
size.setWidth(300);
return size;
}
-TQSize KScroller::tqsizeHint() const
+TQSize KScroller::sizeHint() const
{
- TQSize size = mContent->tqminimumSize();
- int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ TQSize size = mContent->minimumSize();
+ int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
size += TQSize( extra, extra );
return size;
}
@@ -97,7 +97,7 @@ void KScroller::updateScrollBars ()
{
int w = width();
int h = height();
- TQSize cs = mContent->tqminimumSize();
+ TQSize cs = mContent->minimumSize();
setupVertical ( cs.width(), cs.height(), w, h);
setupHorizontal ( cs.width(), cs.height(), w, h);
@@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h)
if (cw > w)
{
- int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
if (!mVertical->isHidden())
w -= extra;
@@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h)
if (ch > h)
{
- int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
mVertical->setRange (0, ch - h);
mVertical->setPageStep (h);
mVertical->setLineStep (25);
@@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h)
{
if (!mVertical->isHidden() && !mHorizontal->isHidden())
{
- int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
mCornerWidget->raise();
mCornerWidget->setGeometry (w - extra, h - extra, extra, extra);
diff --git a/ksysv/kscroller.h b/ksysv/kscroller.h
index 77a78f9..5b63346 100644
--- a/ksysv/kscroller.h
+++ b/ksysv/kscroller.h
@@ -70,7 +70,7 @@ public slots:
void setCornerWidget (TQWidget* corner);
/**
- * Update the scrollbars. Call whenever you change the contents tqminimumSize.
+ * Update the scrollbars. Call whenever you change the contents minimumSize.
*/
void updateScrollBars ();
@@ -83,12 +83,12 @@ protected:
/**
* Reimplemented for internal reasons, the API is not affected.
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
/**
* Reimplemented for internal reasons, the API is not affected.
*/
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
private slots:
diff --git a/ksysv/ksvdrag.cpp b/ksysv/ksvdrag.cpp
index e524bef..7d94536 100644
--- a/ksysv/ksvdrag.cpp
+++ b/ksysv/ksvdrag.cpp
@@ -65,7 +65,7 @@ const char* KSVDrag::format (int i) const
}
}
-TQByteArray KSVDrag::tqencodedData (const char* format) const
+TQByteArray KSVDrag::encodedData (const char* format) const
{
TQByteArray res;
@@ -90,7 +90,7 @@ bool KSVDrag::decodeNative (const TQMimeSource* mime, KSVData& data)
{
if (mime && mime->provides ("application/x-ksysv"))
{
- TQDataStream ds (mime->tqencodedData ("application/x-ksysv"), IO_ReadOnly);
+ TQDataStream ds (mime->encodedData ("application/x-ksysv"), IO_ReadOnly);
ds >> data;
return true;
diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h
index 00bb1a3..3c2010c 100644
--- a/ksysv/ksvdrag.h
+++ b/ksysv/ksvdrag.h
@@ -20,7 +20,7 @@ public:
virtual ~KSVDrag();
virtual const char* format (int i) const;
- TQByteArray tqencodedData (const char*) const;
+ TQByteArray encodedData (const char*) const;
static bool decodeNative (const TQMimeSource*, KSVData&);
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index 6c57f55..f4e8770 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -532,7 +532,7 @@ void KSVDragList::startDrag ()
if (d)
{
- d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup()));
+ d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup()));
d->drag();
}
@@ -762,7 +762,7 @@ void KSVDragList::setEnabled (bool enable)
{
if (!testWState(WState_Disabled))
{
- if (tqfocusWidget() == this)
+ if (focusWidget() == this)
focusNextPrevChild (TRUE);
setWState (WState_Disabled);
// setBackgroundFromMode(); // this is private in TQWidget...
@@ -793,7 +793,7 @@ void KServiceDragList::startDrag ()
if (d)
{
- d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup()));
+ d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup()));
d->dragCopy();
}
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 07911b3..75fefc8 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -82,7 +82,7 @@
0
-
+
200
0
@@ -110,7 +110,7 @@
0
-
+
200
0
@@ -182,7 +182,7 @@
0
-
+
0
10
@@ -238,7 +238,7 @@
0
-
+
80
0
@@ -286,7 +286,7 @@
0
-
+
80
0
@@ -334,7 +334,7 @@
0
-
+
80
0
@@ -366,7 +366,7 @@
0
-
+
80
0
@@ -432,7 +432,7 @@
Expanding
-
+
20
20
diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui
index 6d45733..ca19113 100644
--- a/ksysv/miscconfig.ui
+++ b/ksysv/miscconfig.ui
@@ -83,7 +83,7 @@
Expanding
-
+
20
20
@@ -130,7 +130,7 @@
0
-
+
0
10
@@ -153,7 +153,7 @@
Expanding
-
+
20
20
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 051e267..109a9e8 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -94,7 +94,7 @@
0
-
+
100
0
@@ -134,7 +134,7 @@
0
-
+
0
10
@@ -198,7 +198,7 @@
0
-
+
100
0
@@ -236,7 +236,7 @@
Expanding
-
+
20
20
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 089ebe5..1ecf522 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -47,7 +47,7 @@ KSVTrash::KSVTrash (TQWidget* parent, const char* name)
TQToolTip::add(mLabel, i18n("Drag here to remove services"));
TQToolTip::add(this, i18n("Drag here to remove services"));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
setAcceptDrops(true);
mLabel->installEventFilter(this);
@@ -131,7 +131,7 @@ bool KSVTrash::eventFilter( TQObject *, TQEvent *e )
}
}
-TQSize KSVTrash::tqsizeHint() const
+TQSize KSVTrash::sizeHint() const
{
static TQSize size = TQSize (mPixmapWidth + 2 * 5, mPixmapWidth + 2 * 7);
diff --git a/ksysv/trash.h b/ksysv/trash.h
index eb62562..13596a4 100644
--- a/ksysv/trash.h
+++ b/ksysv/trash.h
@@ -34,7 +34,7 @@ public:
KSVTrash (TQWidget* parent = 0, const char* name = 0);
virtual ~KSVTrash();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
protected:
/**
diff --git a/kuser/filessettings.ui b/kuser/filessettings.ui
index abbafb6..83a8827 100644
--- a/kuser/filessettings.ui
+++ b/kuser/filessettings.ui
@@ -212,7 +212,7 @@
Expanding
-
+
20
40
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index ed650d2..8c6eb91 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -200,7 +200,7 @@
Expanding
-
+
20
16
diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp
index dbbff91..77fcc91 100644
--- a/kuser/kgroup.cpp
+++ b/kuser/kgroup.cpp
@@ -28,7 +28,7 @@
KU::KGroup::KGroup()
{
- pwd = TQString::tqfromLatin1("*");
+ pwd = TQString::fromLatin1("*");
gid = 0;
type = 2;
caps = 0;
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 4534ac5..eed0ee5 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -95,7 +95,7 @@ bool KGroupFiles::reload()
rc = stat(TQFile::encodeName(filename), &st);
if(rc != 0) {
KMessageBox::error( 0, i18n("stat call on file %1 failed: %2\nCheck KUser settings.").
- tqarg(filename).tqarg(TQString::tqfromLatin1(strerror(errno))) );
+ tqarg(filename).tqarg(TQString::fromLatin1(strerror(errno))) );
if( (processing_file & GROUP) != 0 ) {
group_errno = errno;
if(!nisgroup_filename.isEmpty()) {
@@ -194,16 +194,16 @@ bool KGroupFiles::save()
// read KUser configuration info
group_filename = mCfg->groupsrc();
- new_group_filename = group_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+ new_group_filename = group_filename + TQString::fromLatin1(KU_CREATE_EXT);
#ifdef HAVE_SHADOW
gshadow_filename = mCfg->gshadowsrc();
if ( !KStandardDirs::exists( gshadow_filename ) )
gshadow_filename = TQString();
else
- new_gshadow_filename = gshadow_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+ new_gshadow_filename = gshadow_filename + TQString::fromLatin1(KU_CREATE_EXT);
#endif
nisgroup_filename = mCfg->nisgroupsrc();
- new_nisgroup_filename = nisgroup_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+ new_nisgroup_filename = nisgroup_filename + TQString::fromLatin1(KU_CREATE_EXT);
if( nisgroup_filename != group_filename ) {
mingid = mCfg->nismingid();
}
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index cfd3e49..6369ee7 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -651,8 +651,8 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
TQDir s(srcPath);
TQDir d(dstPath);
- TQString dot = TQString::tqfromLatin1(".");
- TQString dotdot = TQString::tqfromLatin1("..");
+ TQString dot = TQString::fromLatin1(".");
+ TQString dotdot = TQString::fromLatin1("..");
s.setFilter( TQDir::All | TQDir::Hidden | TQDir::System );
@@ -772,7 +772,7 @@ int KU::KUser::removeCrontabs()
file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name;
if ( access(TQFile::encodeName(file), F_OK) == 0 ) {
- command = TQString::tqfromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
+ command = TQString::fromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
if ( system(TQFile::encodeName(command)) != 0 ) {
KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2")
.tqarg(command).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 868f100..cc67a8a 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -179,7 +179,7 @@ bool KUserFiles::loadpwd()
tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
#if defined(__FreeBSD__) || defined(__bsdi__)
- tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
+ tmpKU->setClass(TQString::fromLatin1(p->pw_class));
tmpKU->setLastChange(p->pw_change);
tmpKU->setExpire(p->pw_expire);
#endif
@@ -314,9 +314,9 @@ bool KUserFiles::savepwd()
passwd_filename = mCfg->passwdsrc();
nispasswd_filename = mCfg->nispasswdsrc();
TQString new_passwd_filename =
- passwd_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+ passwd_filename + TQString::fromLatin1(KU_CREATE_EXT);
TQString new_nispasswd_filename =
- nispasswd_filename+TQString::tqfromLatin1(KU_CREATE_EXT);
+ nispasswd_filename+TQString::fromLatin1(KU_CREATE_EXT);
if( nispasswd_filename != passwd_filename ) {
minuid = mCfg->nisminuid();
@@ -512,7 +512,7 @@ bool KUserFiles::savesdw()
struct spwd s;
KU::KUser *up;
TQString shadow_file = mCfg->shadowsrc();
- TQString new_shadow_file = shadow_file+TQString::tqfromLatin1(KU_CREATE_EXT);
+ TQString new_shadow_file = shadow_file+TQString::fromLatin1(KU_CREATE_EXT);
if ( shadow_file.isEmpty() )
return TRUE;
@@ -588,7 +588,7 @@ void KUserFiles::createPassword( KU::KUser *user, const TQString &password )
{
if ( caps & Cap_Shadow ) {
user->setSPwd( encryptPass( password, mCfg->md5shadow() ) );
- user->setPwd( TQString::tqfromLatin1("x") );
+ user->setPwd( TQString::fromLatin1("x") );
} else
user->setPwd( encryptPass( password, false ) );
}
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index 5d4979a..d661e35 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -341,7 +341,7 @@ void KUserLDAP::createPassword( KU::KUser *user, const TQString &password )
hash[6], hash[7], hash[8], hash[9], hash[10], hash[11],
hash[12], hash[13], hash[14], hash[15]);
- user->setNTPwd( TQString::tqfromLatin1( (const char*) &hex, 32 ) );
+ user->setNTPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
if ( mCfg->lanmanhash() ) {
@@ -354,7 +354,7 @@ void KUserLDAP::createPassword( KU::KUser *user, const TQString &password )
hash[6], hash[7], hash[8], hash[9], hash[10], hash[11],
hash[12], hash[13], hash[14], hash[15]);
- user->setLMPwd( TQString::tqfromLatin1( (const char*) &hex, 32 ) );
+ user->setLMPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
} else {
user->setLMPwd( "" );
}
@@ -372,7 +372,7 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
cn = mCfg->ldapcnfullname() ? user->getFullName() : user->getName();
if ( cn.isEmpty() ) cn = user->getName();
- gecos = TQString::tqfromLatin1("%1,%2,%3,%4")
+ gecos = TQString::fromLatin1("%1,%2,%3,%4")
.tqarg(user->getFullName())
.tqarg(user->getOffice1())
.tqarg(user->getOffice2())
diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp
index 584bd74..8c67fcb 100644
--- a/kuser/kusersystem.cpp
+++ b/kuser/kusersystem.cpp
@@ -88,7 +88,7 @@ bool KUserSystem::loadpwd()
tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
#if defined(__FreeBSD__) || defined(__bsdi__)
- tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
+ tmpKU->setClass(TQString::fromLatin1(p->pw_class));
tmpKU->setLastChange(p->pw_change);
tmpKU->setExpire(p->pw_expire);
#endif
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 7d962f6..578894a 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -264,7 +264,7 @@
Expanding
-
+
40
20
@@ -283,7 +283,7 @@
Expanding
-
+
20
16
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index 575ea2f..fa24b2a 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -253,7 +253,7 @@
Expanding
-
+
20
40
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index 95524f3..0f3dfbd 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -73,7 +73,7 @@ void mainWidget::setupActions()
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection());
-#define BarIconC(x) BarIcon(TQString::tqfromLatin1(x))
+#define BarIconC(x) BarIcon(TQString::fromLatin1(x))
(void) new KAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, TQT_TQOBJECT(md),
TQT_SLOT(useradd()), actionCollection(), "add_user");
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 2e1ebab..659ff73 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -37,7 +37,7 @@
bool backup(const TQString & name)
{
- TQString tmp = name + TQString::tqfromLatin1(KU_BACKUP_EXT);
+ TQString tmp = name + TQString::fromLatin1(KU_BACKUP_EXT);
TQFile::remove( tmp );
if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1)
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index a68d629..4893e04 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -206,7 +206,7 @@
Expanding
-
+
20
40
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index dbd73d0..cd431c0 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -43,8 +43,8 @@ void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, int row,
bool two_column, bool nochange)
{
TQLabel *lab = new TQLabel(widget, label, parent);
- lab->setMinimumSize(lab->tqsizeHint());
- widget->setMinimumSize(widget->tqsizeHint());
+ lab->setMinimumSize(lab->sizeHint());
+ widget->setMinimumSize(widget->sizeHint());
tqlayout->addWidget(lab, row, 0);
if (!what.isEmpty())
{
diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp
index eb970d9..631c860 100644
--- a/kuser/pwddlg.cpp
+++ b/kuser/pwddlg.cpp
@@ -32,14 +32,14 @@ pwddlg::pwddlg( TQWidget* parent, const char* name )
TQLabel* lb1 = new TQLabel(page, "lb1");
lb1->setText(i18n("Password:"));
- lb1->setMinimumSize(lb1->tqsizeHint());
- lb1->tqsetAlignment(AlignRight|AlignVCenter);
+ lb1->setMinimumSize(lb1->sizeHint());
+ lb1->setAlignment(AlignRight|AlignVCenter);
lepw1 = new KLineEdit(page, "LineEdit_1");
// ensure it fits at least 12 characters
lepw1->setText( "XXXXXXXXXXXX" );
- lepw1->setMinimumSize(lepw1->tqsizeHint());
+ lepw1->setMinimumSize(lepw1->sizeHint());
// clear text
lepw1->clear();
@@ -48,14 +48,14 @@ pwddlg::pwddlg( TQWidget* parent, const char* name )
TQLabel* lb2 = new TQLabel(page, "lb2");
lb2->setText(i18n("Verify:"));
- lb2->setMinimumSize(lb2->tqsizeHint());
- lb2->tqsetAlignment(AlignRight|AlignVCenter);
+ lb2->setMinimumSize(lb2->sizeHint());
+ lb2->setAlignment(AlignRight|AlignVCenter);
lepw2 = new KLineEdit(page, "LineEdit_2");
// ensure it fits at least 12 characters
lepw2->setText( "XXXXXXXXXXXX" );
- lepw2->setMinimumSize(lepw2->tqsizeHint());
+ lepw2->setMinimumSize(lepw2->sizeHint());
// clear text
lepw2->clear();
diff --git a/kuser/sid.cpp b/kuser/sid.cpp
index 8f3e254..4d5845b 100644
--- a/kuser/sid.cpp
+++ b/kuser/sid.cpp
@@ -74,7 +74,7 @@ bool SID::isEmpty() const
void SID::updateSID()
{
- mSid = mDom + TQString::tqfromLatin1("-") + TQString::number( mRid );
+ mSid = mDom + TQString::fromLatin1("-") + TQString::number( mRid );
}
void SID::setSID( const TQString &sid )
diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 3c80d2a..3b096cd 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -42,7 +42,7 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T
if(isFile) {
select=new TQPushButton(_("Select..."), this);
connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked()));
- select->resize(select->tqminimumSizeHint());
+ select->resize(select->minimumSizeHint());
setStretchFactor(select, 0);
} else
select=0;
@@ -53,29 +53,29 @@ void EditWidget::selectFileClicked()
if(!filename.isEmpty())
line->setText(filename);
}
-TQSize EditWidget::tqsizeHint() const
+TQSize EditWidget::sizeHint() const
{
- int w=2*SPACE_MARGIN+lbl->tqsizeHint().width()+SPACE_INSIDE+line->tqsizeHint().width();
- int h=lbl->tqsizeHint().height();
- if(htqsizeHint().height())
- h=line->tqsizeHint().height();
+ int w=2*SPACE_MARGIN+lbl->sizeHint().width()+SPACE_INSIDE+line->sizeHint().width();
+ int h=lbl->sizeHint().height();
+ if(hsizeHint().height())
+ h=line->sizeHint().height();
if(select!=0) {
- w+=SPACE_INSIDE+select->tqsizeHint().width();
- if(htqsizeHint().height())
- h=select->tqsizeHint().height();
+ w+=SPACE_INSIDE+select->sizeHint().width();
+ if(hsizeHint().height())
+ h=select->sizeHint().height();
}
return TQSize(w, h);
}
-TQSize EditWidget::tqminimumSizeHint() const
+TQSize EditWidget::minimumSizeHint() const
{
- int w=2*SPACE_MARGIN+lbl->tqminimumSizeHint().width()+SPACE_INSIDE+line->tqminimumSizeHint().width();
- int h=lbl->tqminimumSizeHint().height();
- if(htqminimumSizeHint().height())
- h=line->tqminimumSizeHint().height();
+ int w=2*SPACE_MARGIN+lbl->minimumSizeHint().width()+SPACE_INSIDE+line->minimumSizeHint().width();
+ int h=lbl->minimumSizeHint().height();
+ if(hminimumSizeHint().height())
+ h=line->minimumSizeHint().height();
if(select!=0) {
- w+=SPACE_INSIDE+select->tqminimumSizeHint().width();
- if(htqminimumSizeHint().height())
- h=select->tqminimumSizeHint().height();
+ w+=SPACE_INSIDE+select->minimumSizeHint().width();
+ if(hminimumSizeHint().height())
+ h=select->minimumSizeHint().height();
}
return TQSize(w, h);
}
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index e0901f9..b781cf2 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -58,7 +58,7 @@ public:
void cut() { line->cut(); };
void copy() const { line->copy(); };
void paste() { line->paste(); };
- void tqsetAlignment(int flag) { line->tqsetAlignment(flag); };
+ void setAlignment(int flag) { line->setAlignment(flag); };
int tqalignment() const { return line->tqalignment(); };
void cursorLeft(bool mark, int steps=1) { line->cursorLeft(mark, steps); };
void cursorRight(bool mark, int steps=1) { line->cursorRight(mark, steps); };
@@ -72,8 +72,8 @@ public:
bool edited() const { return line->edited(); };
bool hasMarkedText() const { return line->hasMarkedText(); };
TQString markedText() const { return line->markedText(); };
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
public slots:
virtual void setText(const TQString &text) { line->setText(text); };
void selectAll() { line->selectAll(); };
diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp
index 111ab40..4dc73e2 100644
--- a/lilo-config/qt/standalone.cpp
+++ b/lilo-config/qt/standalone.cpp
@@ -62,14 +62,14 @@ Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
TQWhatsThis::add(_cancel, _("This button exits the program without saving your changes."));
connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancel()));
_apply->setEnabled(false);
- setMinimumWidth(actions->tqsizeHint().width()+10);
+ setMinimumWidth(actions->sizeHint().width()+10);
arrangeWidgets();
}
void Standalone::arrangeWidgets()
{
- m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
- actions->setGeometry(SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->tqsizeHint().height());
+ m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
+ actions->setGeometry(SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->sizeHint().height());
}
void Standalone::resizeEvent(TQResizeEvent *e)
diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp
index 1788ee1..f74c4e9 100644
--- a/secpolicy/secpolicywin.cpp
+++ b/secpolicy/secpolicywin.cpp
@@ -49,7 +49,7 @@ SecPolicyWin::SecPolicyWin(const char *name)
adjustSize();
// work around KTMainWindow sizing bug.
- resize(tqsizeHint().width(), tqsizeHint().height() + mBar->height() +
+ resize(sizeHint().width(), sizeHint().height() + mBar->height() +
KDialog::marginHint());
show();
}