summaryrefslogtreecommitdiffstats
path: root/kdf
diff options
context:
space:
mode:
Diffstat (limited to 'kdf')
-rw-r--r--kdf/disklist.cpp10
-rw-r--r--kdf/disklist.h2
-rw-r--r--kdf/disks.cpp8
-rw-r--r--kdf/disks.h4
-rw-r--r--kdf/kcmdf.cpp2
-rw-r--r--kdf/kcmdf.h2
-rw-r--r--kdf/kdf.cpp8
-rw-r--r--kdf/kdf.h2
-rw-r--r--kdf/kdfconfig.cpp26
-rw-r--r--kdf/kdfconfig.h2
-rw-r--r--kdf/kdfwidget.cpp38
-rw-r--r--kdf/kdfwidget.h2
-rw-r--r--kdf/kwikdisk.cpp30
-rw-r--r--kdf/kwikdisk.h2
-rw-r--r--kdf/listview.h2
-rw-r--r--kdf/mntconfig.cpp40
-rw-r--r--kdf/mntconfig.h2
-rw-r--r--kdf/optiondialog.cpp4
-rw-r--r--kdf/optiondialog.h2
-rw-r--r--kdf/stdoption.cpp6
-rw-r--r--kdf/tdeconftest.cpp2
-rw-r--r--kdf/unix_outputs/unix-defines.txt125
22 files changed, 98 insertions, 223 deletions
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 3526999..d487a37 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -53,13 +53,13 @@ DiskList::DiskList(TQObject *parent, const char *name)
// BackgroundProcesses ****************************************
dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc);
- connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
- this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
- connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ),
- this, TQT_SLOT(dfDone() ) );
+ connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+ this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
+ connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ),
+ this, TQ_SLOT(dfDone() ) );
readingDFStdErrOut=FALSE;
- config = kapp->config();
+ config = tdeApp->config();
loadSettings();
}
diff --git a/kdf/disklist.h b/kdf/disklist.h
index fe22dbf..019b848 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -94,7 +94,7 @@ private:
/***************************************************************************/
class DiskList : public TQObject
-{ Q_OBJECT
+{ TQ_OBJECT
public:
DiskList( TQObject *parent=0, const char *name=0 );
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 1084380..391b5d9 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -56,10 +56,10 @@ void DiskEntry::init()
// BackgroundProcesses ****************************************
sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc);
- connect( sysProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
- this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
- connect( sysProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int) ),
- this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
+ connect( sysProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+ this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
+ connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ),
+ this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
readingSysStdErrOut=FALSE;
diff --git a/kdf/disks.h b/kdf/disks.h
index 0a0d529..faf8752 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -34,12 +34,12 @@
#include <tdeio/global.h>
#include <kprogress.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdelocale.h>
class DiskEntry : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
DiskEntry(TQObject *parent=0, const char *name=0);
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 4daaaab..f58a193 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -57,7 +57,7 @@ TQString KDiskFreeWidget::quickHelp() const
extern "C"
{
- KDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ )
+ TDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ )
{
return new KDiskFreeWidget( parent , "kdf" );
}
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index c321deb..6cb56a8 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -32,7 +32,7 @@
class KDiskFreeWidget : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index e316b3e..ea3263a 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -41,11 +41,11 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
{
kdf = new KDFWidget(this,"kdf",FALSE);
TQ_CHECK_PTR(kdf);
- (void) new TDEAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
+ (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQ_SLOT( updateDF() ), actionCollection(), "updatedf" );
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection());
- KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+ KStdAction::preferences(kdf, TQ_SLOT(settingsBtnClicked()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
// kdf->setMinimumSize(kdf->sizeHint());
diff --git a/kdf/kdf.h b/kdf/kdf.h
index c365294..7097306 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -30,7 +30,7 @@
/***************************************************************/
class KDFTopLevel : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 1180d6d..1e5946c 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -79,10 +79,10 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
{
mList->addColumn( mTabName[i]->mName );
}
- connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int)));
- connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(slotChanged()));
+ connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int)));
+ connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(slotChanged()));
topLayout->addWidget( mList );
TQListViewItem *mListItem = new TQListViewItem( mList );
@@ -99,17 +99,17 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
mScroll = new TQScrollBar( this );
TQ_CHECK_PTR(mScroll);
- mScroll->setOrientation( Qt::Horizontal );
+ mScroll->setOrientation( TQt::Horizontal );
mScroll->setSteps(1,20);
mScroll->setRange(0, 180 );
gl->addWidget( mScroll, 1, 1 );
- connect(mScroll,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
+ connect(mScroll,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged()));
mLCD = new TQLCDNumber( this );
TQ_CHECK_PTR(mLCD);
mLCD->setNumDigits( 3 );
mLCD->setSegmentStyle(TQLCDNumber::Filled);
- connect(mScroll,TQT_SIGNAL(valueChanged(int)),mLCD,TQT_SLOT(display(int)));
+ connect(mScroll,TQ_SIGNAL(valueChanged(int)),mLCD,TQ_SLOT(display(int)));
gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 );
text = i18n("Update frequency [seconds]. The value 0 disables update" );
@@ -125,19 +125,19 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
mFileManagerEdit = new TQLineEdit( this );
TQ_CHECK_PTR(mFileManagerEdit);
topLayout->addWidget( mFileManagerEdit );
- connect(mFileManagerEdit,TQT_SIGNAL(textChanged (const TQString &)),this,TQT_SLOT(slotChanged()));
+ connect(mFileManagerEdit,TQ_SIGNAL(textChanged (const TQString &)),this,TQ_SLOT(slotChanged()));
text = i18n("Open file manager automatically on mount");
mOpenMountCheck = new TQCheckBox(text, this );
TQ_CHECK_PTR(mOpenMountCheck);
topLayout->addWidget( mOpenMountCheck );
- connect(mOpenMountCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged()));
+ connect(mOpenMountCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged()));
text = i18n("Pop up a window when a disk gets critically full");
mPopupFullCheck = new TQCheckBox( text, this );
TQ_CHECK_PTR(mPopupFullCheck);
topLayout->addWidget( mPopupFullCheck );
- connect(mPopupFullCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged()));
+ connect(mPopupFullCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged()));
}
loadSettings();
@@ -156,13 +156,13 @@ KDFConfigWidget::~KDFConfigWidget()
void KDFConfigWidget::closeEvent(TQCloseEvent *)
{
applySettings();
- kapp->quit();
+ tdeApp->quit();
}
void KDFConfigWidget::applySettings( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDFConfig");
if( GUI )
@@ -196,7 +196,7 @@ void KDFConfigWidget::applySettings( void )
void KDFConfigWidget::loadSettings( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDFConfig");
if( GUI )
diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h
index d5c2993..955a1a7 100644
--- a/kdf/kdfconfig.h
+++ b/kdf/kdfconfig.h
@@ -41,7 +41,7 @@ class CListView;
class KDFConfigWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
class CTabName
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 7c5121d..13ad92c 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -39,7 +39,7 @@
#include <kcmenumngr.h>
#include <tdemessagebox.h>
#include <tdepopupmenu.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include "listview.h"
#include "kdfwidget.h"
@@ -95,10 +95,10 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full)
KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
: TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0)
{
- connect(&mDiskList , TQT_SIGNAL(readDFDone() ),
- this, TQT_SLOT (updateDFDone()) );
- connect(&mDiskList , TQT_SIGNAL(criticallyFull(DiskEntry*)),
- this, TQT_SLOT (criticallyFull(DiskEntry*)) );
+ connect(&mDiskList , TQ_SIGNAL(readDFDone() ),
+ this, TQ_SLOT (updateDFDone()) );
+ connect(&mDiskList , TQ_SIGNAL(criticallyFull(DiskEntry*)),
+ this, TQ_SLOT (criticallyFull(DiskEntry*)) );
mTabProp.resize(8);
mTabProp[0] = new CTabEntry( "Icon", i18n("Icon"), true, 32);
@@ -122,13 +122,13 @@ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
mList->setShowSortIndicator(true);
connect( mList,
- TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )),
- this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int )));
+ TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )),
+ this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int )));
connect( mList,
- TQT_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )),
- this, TQT_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int )));
- connect( mList->header(), TQT_SIGNAL(sizeChange(int, int, int)),
- this, TQT_SLOT(columnSizeChanged(int, int, int)) );
+ TQ_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )),
+ this, TQ_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int )));
+ connect( mList->header(), TQ_SIGNAL(sizeChange(int, int, int)),
+ this, TQ_SLOT(columnSizeChanged(int, int, int)) );
makeColumns();
mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false;
@@ -186,7 +186,7 @@ void KDFWidget::makeColumns( void )
void KDFWidget::closeEvent(TQCloseEvent *)
{
applySettings();
- kapp->quit();
+ tdeApp->quit();
}
@@ -202,7 +202,7 @@ void KDFWidget::settingsChanged( void )
**/
void KDFWidget::applySettings( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDiskFree");
if( GUI )
@@ -231,7 +231,7 @@ void KDFWidget::loadSettings( void )
if(GUI)
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDiskFree");
for( uint i=0; i<mTabProp.size(); i++ )
{
@@ -266,8 +266,8 @@ void KDFWidget::settingsBtnClicked( void )
{
mOptionDialog = new COptionDialog( this, "options", false );
if( mOptionDialog == 0 ) { return; }
- connect( mOptionDialog, TQT_SIGNAL(valueChanged()),
- this, TQT_SLOT(settingsChanged()) );
+ connect( mOptionDialog, TQ_SIGNAL(valueChanged()),
+ this, TQ_SLOT(settingsChanged()) );
}
mOptionDialog->show();
}
@@ -283,7 +283,7 @@ void KDFWidget::setUpdateFrequency( int frequency )
// Kill current timer and restart it if the frequency is
// larger than zero.
//
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if( frequency > 0 )
{
startTimer( frequency * 1000 );
@@ -632,7 +632,7 @@ void KDFWidget::columnSizeChanged( int, int, int )
if( mTimer == 0 )
{
mTimer = new TQTimer( this );
- connect( mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateDiskBarPixmaps()) );
+ connect( mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDiskBarPixmaps()) );
}
else if( mTimer->isActive() == true )
{
@@ -645,7 +645,7 @@ void KDFWidget::columnSizeChanged( int, int, int )
void KDFWidget::invokeHelp()
{
- kapp->invokeHelp("", "kcontrol/kdf");
+ tdeApp->invokeHelp("", "kcontrol/kdf");
}
#include "kdfwidget.moc"
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index 872379f..057761f 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -91,7 +91,7 @@ class CListViewItem : public TQListViewItem
class KDFWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index c06e9c2..1420a11 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -69,11 +69,11 @@ KwikDisk::KwikDisk()
setPixmap(KSystemTray::loadIcon("kdf"));
show();
- connect( &m_diskList, TQT_SIGNAL(readDFDone()), this, TQT_SLOT(updateDFDone()) );
- connect( &m_diskList, TQT_SIGNAL(criticallyFull(DiskEntry*)),
- this, TQT_SLOT(criticallyFull(DiskEntry*)) );
+ connect( &m_diskList, TQ_SIGNAL(readDFDone()), this, TQ_SLOT(updateDFDone()) );
+ connect( &m_diskList, TQ_SIGNAL(criticallyFull(DiskEntry*)),
+ this, TQ_SLOT(criticallyFull(DiskEntry*)) );
- connect( contextMenu(), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHide()) );
+ connect( contextMenu(), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(aboutToHide()) );
loadSettings();
updateDF();
@@ -134,7 +134,7 @@ void KwikDisk::setUpdateFrequency(int frequency)
// Kill current timer and restart it if the frequency is
// larger than zero.
//
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if( frequency > 0 )
{
startTimer(frequency * 1000);
@@ -184,7 +184,7 @@ void KwikDisk::updateDFDone()
{
entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail());
}
- int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) );
+ int id = contextMenu()->insertItem("", this, TQ_SLOT(toggleMount(int)) );
contextMenu()->setItemParameter(id, itemNo);
itemNo++;
@@ -215,7 +215,7 @@ void KwikDisk::updateDFDone()
qp.drawRect(0,0,pix->width(),pix->height());
qp.end();
}
- contextMenu()->disconnectItem(id,disk,TQT_SLOT(toggleMount()));
+ contextMenu()->disconnectItem(id,disk,TQ_SLOT(toggleMount()));
toolTipText = i18n("You must login as root to mount this disk");
}
@@ -226,21 +226,21 @@ void KwikDisk::updateDFDone()
contextMenu()->insertItem(
KSystemTray::loadIcon("kdf"),
- i18n("&Start KDiskFree"), this, TQT_SLOT(startKDF()),0);
+ i18n("&Start KDiskFree"), this, TQ_SLOT(startKDF()),0);
contextMenu()->insertItem(
KSystemTray::loadIcon("configure"),
- i18n("&Configure KwikDisk..."), this, TQT_SLOT(changeSettings()),0);
+ i18n("&Configure KwikDisk..."), this, TQ_SLOT(changeSettings()),0);
contextMenu()->insertItem(
KSystemTray::loadIcon("help"),
- KStdGuiItem::help().text(), this, TQT_SLOT(invokeHelp()),0);
+ KStdGuiItem::help().text(), this, TQ_SLOT(invokeHelp()),0);
contextMenu()->insertSeparator();
contextMenu()->insertItem(
KSystemTray::loadIcon("system-log-out"),
- KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) );
+ KStdGuiItem::quit().text(), this, TQ_SIGNAL(quitSelected()) );
}
void KwikDisk::toggleMount(int item)
@@ -297,8 +297,8 @@ void KwikDisk::changeSettings()
{
m_optionDialog = new COptionDialog(this, "options", FALSE);
if( !m_optionDialog ) return;
- connect(m_optionDialog, TQT_SIGNAL(valueChanged()),
- this, TQT_SLOT(loadSettings()));
+ connect(m_optionDialog, TQ_SIGNAL(valueChanged()),
+ this, TQ_SLOT(loadSettings()));
}
m_optionDialog->show();
}
@@ -312,7 +312,7 @@ void KwikDisk::startKDF()
void KwikDisk::invokeHelp()
{
- kapp->invokeHelp("", "kdf");
+ tdeApp->invokeHelp("", "kdf");
}
/*****************************************************************************/
@@ -335,7 +335,7 @@ int main(int argc, char **argv)
KwikDisk *mainWin = 0;
mainWin = new KwikDisk;
- TQObject::connect(mainWin, TQT_SIGNAL(quitSelected()), &app, TQT_SLOT(quit()));
+ TQObject::connect(mainWin, TQ_SIGNAL(quitSelected()), &app, TQ_SLOT(quit()));
// mainWin has WDestructiveClose flag by default, so it will delete itself.
return app.exec();
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index ce8db57..68bf44c 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -41,7 +41,7 @@
*/
class KwikDisk : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
KwikDisk();
diff --git a/kdf/listview.h b/kdf/listview.h
index f8a8424..d100131 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -27,7 +27,7 @@
class CListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 37b9ff8..732cba8 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -59,7 +59,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mDiskList.readFSTAB();
mDiskList.readDF();
mInitializing = true;
- connect( &mDiskList,TQT_SIGNAL(readDFDone()),this,TQT_SLOT(readDFDone()));
+ connect( &mDiskList,TQ_SIGNAL(readDFDone()),this,TQ_SLOT(readDFDone()));
TQString text;
TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint());
@@ -72,8 +72,8 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mList->addColumn( i18n("Mount Command") );
mList->addColumn( i18n("Unmount Command") );
mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
- connect( mList, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- this, TQT_SLOT(clicked(TQListViewItem *)));
+ connect( mList, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQ_SLOT(clicked(TQListViewItem *)));
topLayout->addWidget( mList );
@@ -93,47 +93,47 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mIconLineEdit = new TQLineEdit(mGroupBox);
TQ_CHECK_PTR(mIconLineEdit);
mIconLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
- connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this,TQT_SLOT(iconChanged(const TQString&)));
- connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this,TQT_SLOT(slotChanged()));
+ connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this,TQ_SLOT(iconChanged(const TQString&)));
+ connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this,TQ_SLOT(slotChanged()));
gl->addWidget( mIconLineEdit, 2, 0 );
mIconButton = new TDEIconButton(mGroupBox);
mIconButton->setIconType(TDEIcon::Small, TDEIcon::Device);
TQ_CHECK_PTR(mIconButton);
mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
- connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
+ connect(mIconButton,TQ_SIGNAL(iconChanged(TQString)),this,TQ_SLOT(iconChangedButton(TQString)));
gl->addWidget( mIconButton, 2, 1 );
//Mount
mMountButton = new TQPushButton( i18n("Get Mount Command"), mGroupBox );
TQ_CHECK_PTR(mMountButton);
- connect(mMountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectMntFile()));
+ connect(mMountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectMntFile()));
gl->addWidget( mMountButton, 1, 2 );
mMountLineEdit = new TQLineEdit(mGroupBox);
TQ_CHECK_PTR(mMountLineEdit);
mMountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
- connect(mMountLineEdit,TQT_SIGNAL(textChanged(const TQString&)),
- this,TQT_SLOT(mntCmdChanged(const TQString&)));
- connect( mMountLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this,TQT_SLOT(slotChanged()));
+ connect(mMountLineEdit,TQ_SIGNAL(textChanged(const TQString&)),
+ this,TQ_SLOT(mntCmdChanged(const TQString&)));
+ connect( mMountLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this,TQ_SLOT(slotChanged()));
gl->addWidget( mMountLineEdit, 1, 3 );
//Umount
mUmountButton = new TQPushButton(i18n("Get Unmount Command"), mGroupBox );
TQ_CHECK_PTR( mUmountButton );
- connect(mUmountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectUmntFile()));
+ connect(mUmountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectUmntFile()));
gl->addWidget( mUmountButton, 2, 2 );
mUmountLineEdit=new TQLineEdit(mGroupBox);
TQ_CHECK_PTR(mUmountLineEdit);
mUmountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
- connect(mUmountLineEdit,TQT_SIGNAL(textChanged(const TQString&)),
- this,TQT_SLOT(umntCmdChanged(const TQString&)));
- connect( mUmountLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
- this,TQT_SLOT(slotChanged()));
+ connect(mUmountLineEdit,TQ_SIGNAL(textChanged(const TQString&)),
+ this,TQ_SLOT(umntCmdChanged(const TQString&)));
+ connect( mUmountLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ this,TQ_SLOT(slotChanged()));
gl->addWidget( mUmountLineEdit, 2, 3 );
}
@@ -179,7 +179,7 @@ void MntConfigWidget::applySettings( void )
{
mDiskList.applySettings();
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("MntConfig");
if(GUI )
{
@@ -192,7 +192,7 @@ void MntConfigWidget::applySettings( void )
void MntConfigWidget::loadSettings( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
if( mInitializing == false && GUI )
{
config.setGroup("MntConfig");
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index 8e510cd..d247012 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -45,7 +45,7 @@ class TQListViewItem;
class MntConfigWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp
index 6734294..6d96fe3 100644
--- a/kdf/optiondialog.cpp
+++ b/kdf/optiondialog.cpp
@@ -33,13 +33,13 @@ COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal )
TQVBoxLayout *l1 = new TQVBoxLayout( f1 );
mConf = new KDFConfigWidget( f1, "kdfconf" );
l1->addWidget(mConf);
- connect( mConf, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mConf, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
TQFrame *f2 = addPage( i18n("Mount Commands") );
TQVBoxLayout *l2 = new TQVBoxLayout( f2 );
mMnt = new MntConfigWidget( f2, "mntconf");
l2->addWidget(mMnt);
- connect( mMnt, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mMnt, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
enableButton( Apply, false );
dataChanged = false;
}
diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h
index c56f8a2..77efa05 100644
--- a/kdf/optiondialog.h
+++ b/kdf/optiondialog.h
@@ -27,7 +27,7 @@ class MntConfigWidget;
class COptionDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp
index 297274b..96920a8 100644
--- a/kdf/stdoption.cpp
+++ b/kdf/stdoption.cpp
@@ -47,7 +47,7 @@ CStdOption::~CStdOption( void )
void CStdOption::updateConfiguration( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDFConfig");
mFileManager = config.readPathEntry(
"FileManagerCommand", mDefaultFileManager );
@@ -62,7 +62,7 @@ void CStdOption::updateConfiguration( void )
void CStdOption::writeConfiguration( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDFConfig");
config.writeEntry( "UpdateFrequency", mUpdateFrequency );
config.writePathEntry( "FileManagerCommand", mFileManager );
@@ -74,7 +74,7 @@ void CStdOption::writeConfiguration( void )
void CStdOption::writeDefaultFileManager( void )
{
- TDEConfig &config = *kapp->config();
+ TDEConfig &config = *tdeApp->config();
config.setGroup("KDFConfig");
config.writePathEntry( "FileManagerCommand", mDefaultFileManager );
config.sync();
diff --git a/kdf/tdeconftest.cpp b/kdf/tdeconftest.cpp
index ff806f9..ad9bf6f 100644
--- a/kdf/tdeconftest.cpp
+++ b/kdf/tdeconftest.cpp
@@ -50,7 +50,7 @@ main(int argc, char ** argv)
TDECmdLineArgs::init(argc, argv, "test", description, version);
TDEApplication app;
- TDEConfig * cfg = kapp->config();
+ TDEConfig * cfg = tdeApp->config();
TQDict<char> dict;
diff --git a/kdf/unix_outputs/unix-defines.txt b/kdf/unix_outputs/unix-defines.txt
deleted file mode 100644
index 75a2846..0000000
--- a/kdf/unix_outputs/unix-defines.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-What about using builtin symbols defined by the compiler (gcc)
-itself. For example on Alpha I have :
-
-lappa{bussat}(74) echo 'main(){printf("hello world\n";}' |gcc -E -v -
-Reading specs from /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.3/specs
-gcc version 2.7.2.3
- /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.3/cpp -lang-c -v -undef
--D__GNUC__=2 -D__GNUC_MINOR__=7 -Dunix -D__osf__ -D__alpha -D__alpha__
--D_LONGLONG -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__unix__ -D__osf__ -D__alpha
--D__alpha__ -D_LONGLONG -D__SYSTYPE_BSD__ -D_SYSTYPE_BSD -D__unix
--D__SYSTYPE_BSD -Asystem(unix) -Asystem(xpg4) -Acpu(alpha)
--Amachine(alpha) -D__LANGUAGE_C__ -D__LANGUAGE_C -DLANGUAGE_C -
-GNU CPP version 2.7.2.3
-#include "..." search starts here:
-#include <...> search starts here:
- /usr/local/include
- /usr/local/alpha-dec-osf4.0/include
- /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.3/include
- /usr/include
-End of search list.
-# 1 ""
-main(){printf("hello world\n";}
-
-On HP, this becomes :
-bussat [21] echo 'main(){printf("hello world\n";}' |gcc -E -v -
-Reading specs from
-/opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.10/2.7.2.2/specs
-gcc version 2.7.2.2
- /opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.10/2.7.2.2/cpp -lang-c -v -undef
--D__GNUC__=2 -D__GNUC_MINOR__=7 -Dhppa -Dhp9000s800 -D__hp9000s800
--Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE -D__hppa__ -D__hp9000s800__
--D__hp9000s800 -D__hp9k8__ -D__PWB__ -D__hpux__ -D__unix__
--D_HPUX_SOURCE -D__hppa -D__hp9000s800 -D__hp9k8 -D__PWB -D__hpux
--D__unix -Asystem(unix) -Asystem(hpux) -Acpu(hppa) -Amachine(hppa)
--D__hp9000s700 -D_PA_RISC1_1 -
-GNU CPP version 2.7.2.2 (hppa)
-#include "..." search starts here:
-#include <...> search starts here:
- /opt/gcc/include
- /opt/gcc/hppa1.1-hp-hpux10.10/include
- /opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.10/2.7.2.2/include
- /usr/include
-End of search list.
-# 1 ""
-main(){printf("hello world
-";}
-
-On Sun Solaris2.5 I found
-lappsun8{bussat}[1]: echo 'main(){printf("hello world\n";}' |gcc -E -v -
-Reading specs from
-/opt/FSFgcc/lib/gcc-lib/sparc-sun-solaris2.5/2.7.2/specs
-gcc version 2.7.2
- /opt/FSFgcc/lib/gcc-lib/sparc-sun-solaris2.5/2.7.2/cpp -lang-c -v
--undef -D__GNUC__=2 -D__GNUC_MINOR__=7 -Dsun -Dsparc -Dunix -D__svr4__
--D__SVR4 -D__GCC_NEW_VARARGS__ -D__sun__ -D__sparc__ -D__unix__
--D__svr4__ -D__SVR4 -D__GCC_NEW_VARARGS__ -D__sun -D__sparc -D__unix
--Asystem(unix) -Asystem(svr4) -Acpu(sparc) -Amachine(sparc) -
-GNU CPP version 2.7.2 (sparc)
-#include "..." search starts here:
-#include <...> search starts here:
- /usr/local/include
- /opt/FSFgcc/sparc-sun-solaris2.5/include
- /opt/FSFgcc/lib/gcc-lib/sparc-sun-solaris2.5/2.7.2/include
- /usr/include
-End of search list.
-# 1 ""
-main(){printf("hello world
-";}
-
-Finally, on Sun with SunOS4.1 the results are :
-lappsun1{bussat}[1]: echo 'main(){printf("hello world\n";}' |gcc -E -v
--
-Reading specs from
-/usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.0/specs
-gcc version 2.6.0
- /usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.0/cpp -lang-c -v
--undef -D__GNUC__=2 -D__GNUC_MINOR__=6 -Dsparc -Dsun -Dunix
--D__GCC_NEW_VARARGS__ -D__sparc__ -D__sun__ -D__unix__
--D__GCC_NEW_VARARGS__ -D__sparc -D__sun -D__unix -Asystem(unix)
--Asystem(bsd) -Acpu(sparc) -Amachine(sparc) -
-GNU CPP version 2.6.0 (sparc)
-#include "..." search starts here:
-#include <...> search starts here:
- /usr/local/include
- /usr/local/sparc-sun-sunos4.1.3_U1/include
- /usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.0/include
- /usr/include
-End of search list.
-# 1 ""
-main(){printf("hello world
-";}
-
-on a Linux box there is:
-mike@kermit:/home/mike > echo 'main(){printf("hello world\n";}' |gcc -E -v -
-Reading specs from /usr/lib/gcc-lib/i486-linux/2.7.2.1/specs
-gcc version 2.7.2.1
- /usr/lib/gcc-lib/i486-linux/2.7.2.1/cpp -lang-c -v -undef -D__GNUC__=2
--D__GNUC_MINOR__=7 -D__ELF__ -Dunix -Di386 -Dlinux -D__ELF__ -D__unix__
--D__i386__ -D__linux__ -D__unix -D__i386 -D__linux -Asystem(unix)
--Asystem(posix) -Acpu(i386) -Amachine(i386) -D__i486__ - GNU CPP version
-2.7.2.1 (i386 Linux/ELF) #include "..." search starts here: #include <...>
-search starts here: /usr/local/include
- /usr/i486-linux/include
- /usr/lib/gcc-lib/i486-linux/2.7.2.1/include
- /usr/include
-End of search list.
-# 1 ""
-main(){printf("hello world\n";}
-
-on digital UNIX V3.2D-1 there is
-mkropfbe@edusrv(1)$ echo 'main(){printf("hello world\n";}' |gcc -E -v -
-Reading specs from /usr/local/lib/gcc-lib/alpha-dec-osf3.2/2.7.2/specs
-gcc version 2.7.2
- /usr/local/lib/gcc-lib/alpha-dec-osf3.2/2.7.2/cpp -lang-c -v -undef
--D__GNUC__=2 -D__GNUC_MINOR__=7 -Dunix -D__osf__ -D__alpha -D__alpha__
--D_LONGLONG -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__unix__ -D__osf__ -D__alpha
--D__alpha__ -D_LONGLONG -D__SYSTYPE_BSD__ -D_SYSTYPE_BSD -D__unix
--D__SYSTYPE_BSD -Asystem(unix) -Asystem(xpg4) -Acpu(alpha) -Amachine(alpha)
--D__LANGUAGE_C__ -D__LANGUAGE_C -DLANGUAGE_C - GNU CPP version 2.7.2 #include
-"..." search starts here: #include <...> search starts here:
-/usr/local/include /usr/local/alpha-dec-osf3.2/include
-/usr/local/lib/gcc-lib/alpha-dec-osf3.2/2.7.2/include /usr/include
-End of search list.
-# 1 ""
-main(){printf("hello world\n";}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 16:23:26 +0000