summaryrefslogtreecommitdiffstats
path: root/kcontrol/konq/rootopts.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/konq/rootopts.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/konq/rootopts.cpp')
-rw-r--r--kcontrol/konq/rootopts.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index c4e2c26d2..f4111cfda 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
tmpLabel->setBuddy( urDesktop );
lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
- TQString wtstr = i18n("This folder tqcontains all the files"
+ TQString wtstr = i18n("This folder contains all the files"
" which you see on your desktop. You can change the location of this"
" folder if you want to, and the contents will move automatically"
" to the new location as well.");
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
tmpLabel->setBuddy( urAutostart );
lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
- wtstr = i18n("This folder tqcontains applications or"
+ wtstr = i18n("This folder contains applications or"
" links to applications (shortcuts) that you want to have started"
" automatically whenever KDE starts. You can change the location of this"
" folder if you want to, and the contents will move automatically"
@@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
KIO::ListJob* job = KIO::listDir( src );
connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
- tqApp->enter_loop();
+ qApp->enter_loop();
if (m_ok)
{
@@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
KIO::Job * job = KIO::move( src, dest );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
// wait for job
- tqApp->enter_loop();
+ qApp->enter_loop();
}
}
kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl;
@@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest );
connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- tqApp->enter_loop();
+ qApp->enter_loop();
}
- tqApp->exit_loop();
+ qApp->exit_loop();
}
void DesktopPathConfig::slotResult( KIO::Job * job )
@@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job )
job->showErrorDialog(this);
}
- tqApp->exit_loop();
+ qApp->exit_loop();
}
#include "rootopts.moc"