summaryrefslogtreecommitdiffstats
path: root/tdeio/tdefile/kpropertiesdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdeio/tdefile/kpropertiesdialog.cpp')
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp379
1 files changed, 191 insertions, 188 deletions
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index ae8aae85d..cfd57d7cc 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -92,14 +92,14 @@ extern "C" {
#include <kdirnotify_stub.h>
#include <kdiskfreesp.h>
#include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kicondialog.h>
#include <kurl.h>
#include <kurlrequester.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/job.h>
#include <tdeio/chmodjob.h>
#include <tdeio/renamedlg.h>
@@ -120,7 +120,7 @@ extern "C" {
#include <tdeparts/componentfactory.h>
#include <kmetaprops.h>
#include <kpreviewprops.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <krun.h>
#include <tdelistview.h>
#include <kacl.h>
@@ -135,7 +135,7 @@ extern "C" {
#include "kpropertiesdialog.h"
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
# include <win32_utils.h>
#endif
@@ -289,7 +289,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current
bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent,
const char* name, bool modal)
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQString localPath = item->localPath();
if (!localPath.isEmpty())
return showWin32FilePropertyDialog(localPath);
@@ -301,7 +301,7 @@ bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent,
bool KPropertiesDialog::showDialog(const KURL& _url, TQWidget* parent,
const char* name, bool modal)
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (_url.isLocalFile())
return showWin32FilePropertyDialog( _url.path() );
#endif
@@ -372,8 +372,8 @@ KPropertiesDialog::~KPropertiesDialog()
void KPropertiesDialog::insertPlugin (KPropsDlgPlugin* plugin)
{
- connect (plugin, TQT_SIGNAL (changed ()),
- plugin, TQT_SLOT (setDirty ()));
+ connect (plugin, TQ_SIGNAL (changed ()),
+ plugin, TQ_SLOT (setDirty ()));
m_pageList.append (plugin);
}
@@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages()
insertPlugin (p);
}
- if ( kapp->authorizeTDEAction("sharefile") &&
+ if ( tdeApp->authorizeTDEAction("sharefile") &&
KFileSharePropsPlugin::supports( m_items ) )
{
KPropsDlgPlugin *p = new KFileSharePropsPlugin( this );
@@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages()
{
KPropsDlgPlugin *plugin = KParts::ComponentFactory
::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(),
- TQT_TQOBJECT(this),
+ this,
(*it)->name().latin1() );
if ( !plugin )
continue;
@@ -754,7 +754,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
grid->setColStretch(1, 0);
grid->setColStretch(2, 1);
grid->addColSpacing(1, KDialog::spacingHint());
- vbl->addLayout(TQT_TQLAYOUT(grid));
+ vbl->addLayout(grid);
int curRow = 0;
if ( !d->bMultiple )
@@ -800,7 +800,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
filename = nameFromFileName( filename );
if ( d->bKDesktopMode && d->bDesktopFile ) {
- KDesktopFile config( url.path(), true /* readonly */ );
+ TDEDesktopFile config( url.path(), true /* readonly */ );
if ( config.hasKey( "Name" ) ) {
filename = config.readName();
}
@@ -875,7 +875,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
// So we have to really open .desktop files
TQString iconStr = KMimeType::findByURL( url, mode )->icon( url, isLocal );
if ( bDesktopFile && isLocal ) {
- KDesktopFile config( url.path(), true );
+ TDEDesktopFile config( url.path(), true );
config.setDesktopGroup();
iconStr = config.readEntry( "Icon" );
if ( config.hasDeviceType() ) {
@@ -890,8 +890,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
}
iconButton->setIcon(iconStr);
iconArea = iconButton;
- connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ),
- this, TQT_SLOT( slotIconChanged() ) );
+ connect( iconButton, TQ_SIGNAL( iconChanged(TQString) ),
+ this, TQ_SLOT( slotIconChanged() ) );
} else {
TQLabel *iconLabel = new TQLabel( d->m_frame );
int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin);
@@ -906,7 +906,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
}
iconArea = iconLabel;
}
- grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft);
+ grid->addWidget(iconArea, curRow, 0, TQt::AlignLeft);
if (d->bMultiple || isTrash || isDevice || isMediaNode || hasRoot)
{
@@ -935,8 +935,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
d->m_lined->setSelection(0, lastDot);
}
- connect( d->m_lined, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( nameFileChanged(const TQString & ) ) );
+ connect( d->m_lined, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( nameFileChanged(const TQString & ) ) );
}
grid->addWidget(nameArea, curRow++, 2);
@@ -956,7 +956,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
box->setSpacing(20);
l = new TQLabel(mimeComment, box );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
//TODO: wrap for win32 or mac?
TQPushButton *button = new TQPushButton(box);
@@ -969,9 +969,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
else
TQToolTip::add(button, i18n("Edit file type"));
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() ));
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() ));
- if (!kapp->authorizeTDEAction("editfiletype"))
+ if (!tdeApp->authorizeTDEAction("editfiletype"))
button->hide();
#endif
@@ -1024,14 +1024,14 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
// buttons
m_sizeDetermineButton = new TQPushButton( i18n("Calculate"), d->m_frame );
m_sizeStopButton = new TQPushButton( i18n("Stop"), d->m_frame );
- connect( m_sizeDetermineButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeDetermine() ) );
- connect( m_sizeStopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeStop() ) );
+ connect( m_sizeDetermineButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeDetermine() ) );
+ connect( m_sizeStopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeStop() ) );
sizelay->addWidget(m_sizeDetermineButton, 0);
sizelay->addWidget(m_sizeStopButton, 0);
sizelay->addStretch(10); // so that the buttons don't grow horizontally
- // auto-launch for local dirs only, and not for '/'
- if ( isLocal && !hasRoot )
+ // auto-launch for local dirs only, but not for '/' or medias
+ if ( isReallyLocal && !hasRoot )
{
m_sizeDetermineButton->setText( i18n("Refresh") );
slotSizeDetermine();
@@ -1110,9 +1110,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
grid->addWidget( d->m_freeSpaceLabel, curRow++, 2 );
KDiskFreeSp * job = new KDiskFreeSp;
- connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
+ connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
const unsigned long&, const TQString& ) ),
- this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
+ this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
const unsigned long&, const TQString& ) ) );
job->readDF( mountPoint );
}
@@ -1142,7 +1142,7 @@ void KFilePropsPlugin::setFileNameReadOnly( bool ro )
void KFilePropsPlugin::slotEditFileType()
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQString mime;
if ( d->mimeType == KMimeType::defaultMimeType() ) {
int pos = d->oldFileName.findRev( '.' );
@@ -1274,11 +1274,11 @@ void KFilePropsPlugin::slotSizeDetermine()
kdDebug(250) << " URL=" << properties->item()->url().url() << endl;
d->dirSizeJob = KDirSize::dirSizeJob( properties->items() );
d->dirSizeUpdateTimer = new TQTimer(this);
- connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ),
- TQT_SLOT( slotDirSizeUpdate() ) );
+ connect( d->dirSizeUpdateTimer, TQ_SIGNAL( timeout() ),
+ TQ_SLOT( slotDirSizeUpdate() ) );
d->dirSizeUpdateTimer->start(500);
- connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
+ connect( d->dirSizeJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
m_sizeStopButton->setEnabled(true);
m_sizeDetermineButton->setEnabled(false);
@@ -1291,9 +1291,9 @@ void KFilePropsPlugin::slotSizeDetermine()
TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
KDiskFreeSp * job = new KDiskFreeSp;
- connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
+ connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
const unsigned long&, const TQString& ) ),
- this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
+ this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
const unsigned long&, const TQString& ) ) );
job->readDF( mountPoint );
}
@@ -1336,7 +1336,7 @@ void KFilePropsPlugin::applyChanges()
kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl;
- if (nameArea->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ if (nameArea->inherits("TQLineEdit"))
{
TQString n = ((TQLineEdit *) nameArea)->text();
// Remove trailing spaces (#4345)
@@ -1379,10 +1379,10 @@ void KFilePropsPlugin::applyChanges()
job = TDEIO::copy( oldurl, properties->kurl() );
}
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
- TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
+ TQ_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
// wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
tqt_enter_modal(&dummy);
@@ -1432,7 +1432,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
{
kdDebug(250) << "KFilePropsPlugin::slotCopyFinished " << m_sRelativePath << endl;
KURL newURL;
- newURL.setPath( KDesktopFile::locateLocal(m_sRelativePath) );
+ newURL.setPath( TDEDesktopFile::locateLocal(m_sRelativePath) );
kdDebug(250) << "KFilePropsPlugin::slotCopyFinished path=" << newURL.path() << endl;
properties->updateUrl( newURL );
}
@@ -1440,7 +1440,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
if ( d->bKDesktopMode && d->bDesktopFile ) {
// Renamed? Update Name field
if ( d->oldFileName != properties->kurl().fileName() || m_bFromTemplate ) {
- KDesktopFile config( properties->kurl().path() );
+ TDEDesktopFile config( properties->kurl().path() );
TQString nameStr = nameFromFileName(properties->kurl().fileName());
config.writeEntry( "Name", nameStr );
config.writeEntry( "Name", nameStr, true, false, true );
@@ -1450,7 +1450,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
void KFilePropsPlugin::applyIconChanges()
{
- TDEIconButton *iconButton = ::tqqt_cast<TDEIconButton *>( iconArea );
+ TDEIconButton *iconButton = ::tqt_cast<TDEIconButton *>( iconArea );
if ( !iconButton || !d->bIconChanged )
return;
// handle icon changes - only local files (or pseudo-local) for now
@@ -1492,7 +1492,7 @@ void KFilePropsPlugin::applyIconChanges()
}
f.close();
- KDesktopFile cfg(path);
+ TDEDesktopFile cfg(path);
kdDebug(250) << "sIcon = " << (sIcon) << endl;
kdDebug(250) << "str = " << (str) << endl;
cfg.writeEntry( "Icon", sIcon );
@@ -1676,7 +1676,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
TQPushButton* pbAdvancedPerm = 0;
/* Group: Access Permissions */
- gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame );
+ gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), d->m_frame );
gb->layout()->setSpacing(KDialog::spacingHint());
gb->layout()->setMargin(KDialog::marginHint());
box->addWidget (gb);
@@ -1698,7 +1698,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
l = d->ownerPermCombo = new TQComboBox(gb);
lbl->setBuddy(l);
gl->addWidget(l, 1, 1);
- connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() ));
+ connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() ));
TQWhatsThis::add(l, i18n("Specifies the actions that the owner is allowed to do."));
lbl = new TQLabel( i18n("Gro&up:"), gb);
@@ -1706,7 +1706,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
l = d->groupPermCombo = new TQComboBox(gb);
lbl->setBuddy(l);
gl->addWidget(l, 2, 1);
- connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() ));
+ connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() ));
TQWhatsThis::add(l, i18n("Specifies the actions that the members of the group are allowed to do."));
lbl = new TQLabel( i18n("O&thers:"), gb);
@@ -1714,7 +1714,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
l = d->othersPermCombo = new TQComboBox(gb);
lbl->setBuddy(l);
gl->addWidget(l, 3, 1);
- connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() ));
+ connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() ));
TQWhatsThis::add(l, i18n("Specifies the actions that all users, who are neither "
"owner nor in the group, are allowed to do."));
@@ -1723,7 +1723,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
i18n("Only own&er can rename and delete folder content") :
i18n("Is &executable"),
gb );
- connect( d->extraCheckbox, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) );
+ connect( d->extraCheckbox, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) );
gl->addWidget(l, 4, 1);
TQWhatsThis::add(l, hasDir ? i18n("Enable this option to allow only the folder's owner to "
"delete or rename the contained files and folders. Other "
@@ -1733,19 +1733,19 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
"sense for programs and scripts. It is required when you want to "
"execute them."));
- TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
gl->addMultiCell(spacer, 5, 5, 0, 1);
pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb);
- gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight);
- connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() ));
+ gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight);
+ connect(pbAdvancedPerm, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowAdvancedPermissions() ));
}
else
d->extraCheckbox = 0;
/**** Group: Ownership ****/
- gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame );
+ gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Ownership"), d->m_frame );
gb->layout()->setSpacing(KDialog::spacingHint());
gb->layout()->setMargin(KDialog::marginHint());
box->addWidget (gb);
@@ -1781,8 +1781,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
TDEGlobalSettings::CompletionNone);
usrEdit->setText(strOwner);
gl->addWidget(usrEdit, 1, 1);
- connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( usrEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
}
else
{
@@ -1863,8 +1863,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
grpEdit->setText(strGroup);
gl->addWidget(grpEdit, 2, 1);
- connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( grpEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
}
else if ((groupList.count() > 1) && isMyFile && isLocal)
{
@@ -1872,8 +1872,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
grpCombo->insertStringList(groupList);
grpCombo->setCurrentItem(groupList.findIndex(strGroup));
gl->addWidget(grpCombo, 2, 1);
- connect( grpCombo, TQT_SIGNAL( activated( int ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( grpCombo, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SIGNAL( changed() ) );
}
else
{
@@ -1887,7 +1887,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
if ( hasDir && !isLink && !isTrash )
{
d->cbRecursive = new TQCheckBox( i18n("Apply changes to all subfolders and their contents"), d->m_frame );
- connect( d->cbRecursive, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) );
+ connect( d->cbRecursive, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) );
box->addWidget( d->cbRecursive );
}
@@ -1941,7 +1941,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
TQVBox *mainVBox = dlg.makeVBoxMainWidget();
// Group: Access Permissions
- gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox );
+ gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), mainVBox );
gb->layout()->setSpacing(KDialog::spacingHint());
gb->layout()->setMargin(KDialog::marginHint());
@@ -2093,16 +2093,19 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
if ( col != 3 ) theNotSpecials.append( cb );
cba[row][col] = cb;
cb->setChecked(aPermissions & fperm[row][col]);
+ if ( d->canChangePermissions )
+ {
+ allDisable = false;
+ }
if ( aPartialPermissions & fperm[row][col] )
{
cb->setTristate();
- if( d->canChangePermissions ) {
- allDisable = false;
- }
cb->setNoChange();
}
else if (d->cbRecursive && d->cbRecursive->isChecked())
- cb->setTristate();
+ {
+ cb->setTristate();
+ }
cb->setEnabled( d->canChangePermissions );
gl->addWidget (cb, row+2, col+1);
@@ -2143,7 +2146,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString );
}
if ( d->fileSystemSupportsACLs ) {
- std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun( &TQWidget::hide ) );
+ std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn( &TQWidget::hide ) );
extendedACLs = new KACLEditWidget( mainVBox );
if ( d->extendedACL.isValid() && d->extendedACL.isExtended() )
extendedACLs->setACL( d->extendedACL );
@@ -2550,8 +2553,8 @@ void KFilePermissionsPropsPlugin::applyChanges()
if ( defaultACLChange && d->fileSystemSupportsACLs )
job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) );
// Wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
tqt_enter_modal(&dummy);
@@ -2566,8 +2569,8 @@ void KFilePermissionsPropsPlugin::applyChanges()
if ( defaultACLChange && d->fileSystemSupportsACLs )
job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) );
// Wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
tqt_enter_modal(&dummy);
@@ -2624,7 +2627,7 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props )
}
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
URLStr = config.readPathEntry( "URL" );
@@ -2638,8 +2641,8 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props )
URLEdit->setURL( URLStr );
}
- connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( URLEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
layout->addStretch (1);
}
@@ -2664,7 +2667,7 @@ bool KURLPropsPlugin::supports( KFileItemList _items )
return false;
// open file and check type
- KDesktopFile config( item->url().path(), true /* readonly */ );
+ TDEDesktopFile config( item->url().path(), true /* readonly */ );
return config.hasLinkType();
}
@@ -2685,7 +2688,7 @@ void KURLPropsPlugin::applyChanges()
}
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
config.writeEntry( "Type", TQString::fromLatin1("Link"));
config.writePathEntry( "URL", URLEdit->url() );
@@ -2776,7 +2779,7 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl
return;
f.close();
- KSimpleConfig config( _props->kurl().path() );
+ TDESimpleConfig config( _props->kurl().path() );
config.setDesktopGroup();
TQString patternStr = config.readEntry( "Patterns" );
TQString iconStr = config.readEntry( "Icon" );
@@ -2795,14 +2798,14 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl
else
cbAutoEmbed->setNoChange();
- connect( patternEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( mimeEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( cbAutoEmbed, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( patternEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( mimeEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( cbAutoEmbed, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
}
KBindingPropsPlugin::~KBindingPropsPlugin()
@@ -2825,7 +2828,7 @@ bool KBindingPropsPlugin::supports( KFileItemList _items )
return false;
// open file and check type
- KDesktopFile config( item->url().path(), true /* readonly */ );
+ TDEDesktopFile config( item->url().path(), true /* readonly */ );
return config.hasMimeTypeType();
}
@@ -2842,7 +2845,7 @@ void KBindingPropsPlugin::applyChanges()
}
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
config.writeEntry( "Type", TQString::fromLatin1("MimeType") );
@@ -2921,8 +2924,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
device = new TQComboBox( true, d->m_frame, "ComboBox_device" );
device->insertStringList( devices );
layout->addWidget(device, 0, 1);
- connect( device, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotActivated( int ) ) );
+ connect( device, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotActivated( int ) ) );
readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" );
readonly->setText( i18n("Read only") );
@@ -2981,7 +2984,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
return;
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
TQString deviceStr = config.readEntry( "Dev" );
TQString mountPointStr = config.readEntry( "MountPoint" );
@@ -3015,17 +3018,17 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
unmounted->setIcon( unmountedStr );
- connect( device, TQT_SIGNAL( activated( int ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( device, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( readonly, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( unmounted, TQT_SIGNAL( iconChanged( TQString ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( device, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( device, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( readonly, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( unmounted, TQ_SIGNAL( iconChanged( TQString ) ),
+ this, TQ_SIGNAL( changed() ) );
- connect( device, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( slotDeviceChanged() ) );
+ connect( device, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( slotDeviceChanged() ) );
processLockouts();
}
@@ -3062,9 +3065,9 @@ void KDevicePropsPlugin::updateInfo()
if ( !mountpoint->text().isEmpty() )
{
KDiskFreeSp * job = new KDiskFreeSp;
- connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
+ connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
const unsigned long&, const TQString& ) ),
- this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
+ this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
const unsigned long&, const TQString& ) ) );
job->readDF( mountpoint->text() );
@@ -3124,7 +3127,7 @@ bool KDevicePropsPlugin::supports( KFileItemList _items )
if ( !KPropsDlgPlugin::isDesktopFile( item ) )
return false;
// open file and check type
- KDesktopFile config( item->url().path(), true /* readonly */ );
+ TDEDesktopFile config( item->url().path(), true /* readonly */ );
return config.hasDeviceType();
}
@@ -3140,7 +3143,7 @@ void KDevicePropsPlugin::applyChanges()
}
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
config.writeEntry( "Type", TQString::fromLatin1("FSDevice") );
@@ -3184,16 +3187,16 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
w->pathEdit->setMode(KFile::Directory | KFile::LocalOnly);
w->pathEdit->lineEdit()->setAcceptDrops(false);
- connect( w->nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
- connect( w->genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
- connect( w->commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
- connect( w->commandEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
- connect( w->pathEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
+ connect( w->nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+ connect( w->genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+ connect( w->commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+ connect( w->commandEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+ connect( w->pathEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
- connect( w->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) );
- connect( w->addFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFiletype() ) );
- connect( w->delFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelFiletype() ) );
- connect( w->advancedButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) );
+ connect( w->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) );
+ connect( w->addFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFiletype() ) );
+ connect( w->delFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelFiletype() ) );
+ connect( w->advancedButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdvanced() ) );
// now populate the page
TQString path = _props->kurl().path();
@@ -3202,7 +3205,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
return;
f.close();
- KDesktopFile config( path );
+ TDEDesktopFile config( path );
TQString nameStr = config.readName();
TQString genNameStr = config.readGenericName();
TQString commentStr = config.readComment();
@@ -3310,10 +3313,10 @@ void KDesktopPropsPlugin::slotAddFiletype()
mw->listView->setFullWidth(true);
mw->listView->setMinimumSize(500,400);
- connect(mw->listView, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotSelectMimetype()));
- connect(mw->listView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )),
- &dlg, TQT_SLOT( slotOk()));
+ connect(mw->listView, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotSelectMimetype()));
+ connect(mw->listView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )),
+ &dlg, TQ_SLOT( slotOk()));
TQMap<TQString,TQListViewItem*> majorMap;
TQListViewItem *majorGroup;
@@ -3428,7 +3431,7 @@ void KDesktopPropsPlugin::applyChanges()
// coupled to the command.
checkCommandChanged();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
config.writeEntry( "Type", TQString::fromLatin1("Application"));
config.writeEntry( "Comment", w->commentEdit->text() );
@@ -3574,22 +3577,22 @@ void KDesktopPropsPlugin::slotAdvanced()
delete kcom;
}
- connect( w->terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->terminalCloseCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->terminalCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->suidCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->startupInfoCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->systrayCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( w->dcopCombo, TQT_SIGNAL( highlighted( int ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( w->terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->terminalCloseCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->terminalCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->suidCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->startupInfoCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->systrayCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( w->dcopCombo, TQ_SIGNAL( highlighted( int ) ),
+ this, TQ_SIGNAL( changed() ) );
if ( dlg.exec() == TQDialog::Accepted )
{
@@ -3624,8 +3627,8 @@ bool KDesktopPropsPlugin::supports( KFileItemList _items )
if ( !KPropsDlgPlugin::isDesktopFile( item ) )
return false;
// open file and check type
- KDesktopFile config( item->url().path(), true /* readonly */ );
- return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access");
+ TDEDesktopFile config( item->url().path(), true /* readonly */ );
+ return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access");
}
void KPropertiesDialog::virtual_hook( int id, void* data )
@@ -3699,7 +3702,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// The groupbox about swallowing
TQGroupBox* tmpQGroupBox;
tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame );
- tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
+ tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
mainlayout->addWidget(tmpQGroupBox);
@@ -3726,7 +3729,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// The groupbox about run in terminal
tmpQGroupBox = new TQGroupBox( d->m_frame );
- tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
+ tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
mainlayout->addWidget(tmpQGroupBox);
@@ -3765,7 +3768,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// The groupbox about run with substituted uid.
tmpQGroupBox = new TQGroupBox( d->m_frame );
- tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
+ tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
mainlayout->addWidget(tmpQGroupBox);
@@ -3794,7 +3797,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
return;
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDollarExpansion( false );
config.setDesktopGroup();
execStr = config.readPathEntry( "Exec" );
@@ -3848,27 +3851,27 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
delete kcom;
}
- connect( swallowExecEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( swallowTitleEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( execEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( swallowExecEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( swallowTitleEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( execEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
if (d->nocloseonexitCheck)
- connect( d->nocloseonexitCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( terminalCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( suidCheck, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
-
- connect( execBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) );
- connect( terminalCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableCheckedEdit() ) );
- connect( suidCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableSuidEdit() ) );
+ connect( d->nocloseonexitCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( terminalCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( suidCheck, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+
+ connect( execBrowse, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) );
+ connect( terminalCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableCheckedEdit() ) );
+ connect( suidCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableSuidEdit() ) );
}
@@ -3902,8 +3905,8 @@ bool KExecPropsPlugin::supports( KFileItemList _items )
if ( !KPropsDlgPlugin::isDesktopFile( item ) )
return false;
// open file and check type
- KDesktopFile config( item->url().path(), true /* readonly */ );
- return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access");
+ TDEDesktopFile config( item->url().path(), true /* readonly */ );
+ return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access");
}
void KExecPropsPlugin::applyChanges()
@@ -3920,7 +3923,7 @@ void KExecPropsPlugin::applyChanges()
}
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
config.writeEntry( "Type", TQString::fromLatin1("Application"));
config.writePathEntry( "Exec", execEdit->text() );
@@ -3985,21 +3988,21 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
addExtensionButton->setIconSet( iconSet );
pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
addExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
- connect( addExtensionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotAddExtension() ) );
+ connect( addExtensionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotAddExtension() ) );
delExtensionButton = new TQPushButton( TQString::null, d->m_frame );
iconSet = SmallIconSet( "forward" );
delExtensionButton->setIconSet( iconSet );
delExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
- connect( delExtensionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotDelExtension() ) );
+ connect( delExtensionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotDelExtension() ) );
TQLabel *l;
TQGridLayout *grid = new TQGridLayout(2, 2);
grid->setColStretch(1, 1);
- toplayout->addLayout(TQT_TQLAYOUT(grid));
+ toplayout->addLayout(grid);
if ( d->m_kdesktopMode )
{
@@ -4035,7 +4038,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
grid->setColStretch(2, 1);
grid->setRowStretch( 0, 1 );
grid->setRowStretch( 3, 1 );
- toplayout->addLayout(TQT_TQLAYOUT(grid), 2);
+ toplayout->addLayout(grid, 2);
extensionsList = new TQListBox( d->m_frame );
extensionsList->setSelectionMode( TQListBox::Extended );
@@ -4054,7 +4057,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
return;
f.close();
- KDesktopFile config( path );
+ TDEDesktopFile config( path );
TQString commentStr = config.readComment();
TQString genNameStr = config.readGenericName();
@@ -4089,26 +4092,26 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
updateButton();
- connect( extensionsList, TQT_SIGNAL( highlighted( int ) ),
- this, TQT_SLOT( updateButton() ) );
- connect( availableExtensionsList, TQT_SIGNAL( highlighted( int ) ),
- this, TQT_SLOT( updateButton() ) );
+ connect( extensionsList, TQ_SIGNAL( highlighted( int ) ),
+ this, TQ_SLOT( updateButton() ) );
+ connect( availableExtensionsList, TQ_SIGNAL( highlighted( int ) ),
+ this, TQ_SLOT( updateButton() ) );
- connect( addExtensionButton, TQT_SIGNAL( clicked() ),
- this, TQT_SIGNAL( changed() ) );
- connect( delExtensionButton, TQT_SIGNAL( clicked() ),
- this, TQT_SIGNAL( changed() ) );
+ connect( addExtensionButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( delExtensionButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SIGNAL( changed() ) );
if ( nameEdit )
- connect( nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( availableExtensionsList, TQT_SIGNAL( selected( int ) ),
- this, TQT_SIGNAL( changed() ) );
- connect( extensionsList, TQT_SIGNAL( selected( int ) ),
- this, TQT_SIGNAL( changed() ) );
+ connect( nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( availableExtensionsList, TQ_SIGNAL( selected( int ) ),
+ this, TQ_SIGNAL( changed() ) );
+ connect( extensionsList, TQ_SIGNAL( selected( int ) ),
+ this, TQ_SIGNAL( changed() ) );
}
TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin()
@@ -4163,7 +4166,7 @@ void TDEApplicationPropsPlugin::applyChanges()
}
f.close();
- KSimpleConfig config( path );
+ TDESimpleConfig config( path );
config.setDesktopGroup();
config.writeEntry( "Type", TQString::fromLatin1("Application"));
config.writeEntry( "Comment", commentEdit->text() );