summaryrefslogtreecommitdiffstats
path: root/kdf
diff options
context:
space:
mode:
Diffstat (limited to 'kdf')
-rw-r--r--kdf/disklist.cpp2
-rw-r--r--kdf/disks.cpp14
-rw-r--r--kdf/kdf.cpp4
-rw-r--r--kdf/listview.cpp12
-rw-r--r--kdf/listview.h2
-rw-r--r--kdf/mntconfig.cpp2
6 files changed, 18 insertions, 18 deletions
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 596cbcb..abec1b8 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
*/
- TQString tmp = TQString::tqfromLatin1(data, len);
+ TQString tmp = TQString::fromLatin1(data, len);
dfStringErrOut.append(tmp);
}
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 155e6e2..1520b18 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -104,13 +104,13 @@ int DiskEntry::mount()
{
// FreeBSD's mount(8) is picky: -o _must_ go before
// the device and mountpoint.
- cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m");
+ cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
}
- cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
- cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
- cmdS.replace(TQString::tqfromLatin1("%t"),fsType());
- cmdS.replace(TQString::tqfromLatin1("%o"),mountOptions());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%t"),fsType());
+ cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -126,8 +126,8 @@ int DiskEntry::umount()
if (cmdS.isEmpty()) // generate default umount cmd
cmdS="umount %d";
- cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
- cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index f963a12..45f0ec7 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -48,8 +48,8 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
- // kdf->setMinimumSize(kdf->tqsizeHint());
- kdf->resize(kdf->tqsizeHint());
+ // kdf->setMinimumSize(kdf->sizeHint());
+ kdf->resize(kdf->sizeHint());
setupGUI(KMainWindow::Keys | StatusBar | Save | Create);
}
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index 49021ee..b9274c3 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -20,7 +20,7 @@
//
// 1999-11-28 Espen Sand
// The purpose of this class is:
-// 1) Easily set minimum number of visible items and to adjust the tqsizeHint()
+// 1) Easily set minimum number of visible items and to adjust the sizeHint()
// 2) Provide a pixmap collection
//
@@ -46,20 +46,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
mVisibleItem = TQMAX( 1, visibleItem );
if( updateSize == true )
{
- TQSize s = tqsizeHint();
- setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
+ TQSize s = sizeHint();
+ setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-TQSize CListView::tqsizeHint( void ) const
+TQSize CListView::sizeHint( void ) const
{
- TQSize s = TQListView::tqsizeHint();
+ TQSize s = TQListView::sizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
- s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
+ s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
return( s );
}
diff --git a/kdf/listview.h b/kdf/listview.h
index 96ae398..873a327 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -34,7 +34,7 @@ class CListView : public KListView
CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void setVisibleItem( int visibleItem, bool updateSize=true );
- virtual TQSize tqsizeHint( void ) const;
+ virtual TQSize sizeHint( void ) const;
const TQPixmap &icon( const TQString &iconName, bool drawBorder );
private:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 1819760..0eb86ba 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -102,7 +102,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mIconButton = new KIconButton(mGroupBox);
mIconButton->setIconType(KIcon::Small, KIcon::Device);
Q_CHECK_PTR(mIconButton);
- mIconButton->setFixedWidth( mIconButton->tqsizeHint().height() );
+ mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
gl->addWidget( mIconButton, 2, 1 );