summaryrefslogtreecommitdiffstats
path: root/tdeio
diff options
context:
space:
mode:
Diffstat (limited to 'tdeio')
-rw-r--r--tdeio/tdefile/kdiroperator.h16
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp14
-rw-r--r--tdeio/tdefile/kurlrequester.cpp2
-rw-r--r--tdeio/tdeio/kshellcompletion.cpp6
-rw-r--r--tdeio/tdeio/kshellcompletion.h4
-rw-r--r--tdeio/tdeio/kurlcompletion.cpp24
-rw-r--r--tdeio/tdeio/kurlcompletion.h6
7 files changed, 36 insertions, 36 deletions
diff --git a/tdeio/tdefile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h
index ca850b733..95bf5c5ba 100644
--- a/tdeio/tdefile/kdiroperator.h
+++ b/tdeio/tdefile/kdiroperator.h
@@ -319,27 +319,27 @@ class TDEIO_EXPORT KDirOperator : public TQWidget
int numFiles() const;
/**
- * @returns a KCompletion object, containing all filenames and
+ * @returns a TDECompletion object, containing all filenames and
* directories of the current directory/URL.
* You can use it to insert it into a KLineEdit or KComboBox
* Note: it will only contain files, after prepareCompletionObjects()
* has been called. It will be implicitly called from makeCompletion()
* or makeDirCompletion()
*/
- KCompletion * completionObject() const {
- return const_cast<KCompletion *>( &myCompletion );
+ TDECompletion * completionObject() const {
+ return const_cast<TDECompletion *>( &myCompletion );
}
/**
- * @returns a KCompletion object, containing only all directories of the
+ * @returns a TDECompletion object, containing only all directories of the
* current directory/URL.
* You can use it to insert it into a KLineEdit or KComboBox
* Note: it will only contain directories, after
* prepareCompletionObjects() has been called. It will be implicitly
* called from makeCompletion() or makeDirCompletion()
*/
- KCompletion *dirCompletionObject() const {
- return const_cast<KCompletion *>( &myDirCompletion );
+ TDECompletion *dirCompletionObject() const {
+ return const_cast<TDECompletion *>( &myDirCompletion );
}
/**
@@ -838,8 +838,8 @@ private:
KDirLister *dir;
KURL currUrl;
- KCompletion myCompletion;
- KCompletion myDirCompletion;
+ TDECompletion myCompletion;
+ TDECompletion myDirCompletion;
bool myCompleteListDirty;
TQDir::SortSpec mySorting;
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 2b8fd1814..9d4ee6534 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -1749,8 +1749,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
if (IamRoot && isLocal)
{
usrEdit = new KLineEdit( gb );
- KCompletion *kcom = usrEdit->completionObject();
- kcom->setOrder(KCompletion::Sorted);
+ TDECompletion *kcom = usrEdit->completionObject();
+ kcom->setOrder(TDECompletion::Sorted);
setpwent();
for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++)
kcom->addItem(TQString::fromLatin1(user->pw_name));
@@ -1829,7 +1829,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
if (IamRoot && isLocal)
{
grpEdit = new KLineEdit(gb);
- KCompletion *kcom = new KCompletion;
+ TDECompletion *kcom = new TDECompletion;
kcom->setItems(groupList);
grpEdit->setCompletionObject(kcom, true);
grpEdit->setAutoDeleteCompletionObject( true );
@@ -3487,8 +3487,8 @@ void KDesktopPropsPlugin::slotAdvanced()
w->dcopCombo->setCurrentItem(0);
// Provide username completion up to 1000 users.
- KCompletion *kcom = new KCompletion;
- kcom->setOrder(KCompletion::Sorted);
+ TDECompletion *kcom = new TDECompletion;
+ kcom->setOrder(TDECompletion::Sorted);
struct passwd *pw;
int i, maxEntries = 1000;
setpwent();
@@ -3761,8 +3761,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
enableSuidEdit();
// Provide username completion up to 1000 users.
- KCompletion *kcom = new KCompletion;
- kcom->setOrder(KCompletion::Sorted);
+ TDECompletion *kcom = new TDECompletion;
+ kcom->setOrder(TDECompletion::Sorted);
struct passwd *pw;
int i, maxEntries = 1000;
setpwent();
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 1d5bf009e..9a76a69a6 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -124,7 +124,7 @@ public:
receiver, TQT_SIGNAL( returnPressed( const TQString& ) ));
}
- void setCompletionObject( KCompletion *comp ) {
+ void setCompletionObject( TDECompletion *comp ) {
if ( combo )
combo->setCompletionObject( comp );
else
diff --git a/tdeio/tdeio/kshellcompletion.cpp b/tdeio/tdeio/kshellcompletion.cpp
index 2fb67a31f..789a5ce05 100644
--- a/tdeio/tdeio/kshellcompletion.cpp
+++ b/tdeio/tdeio/kshellcompletion.cpp
@@ -77,7 +77,7 @@ TQString KShellCompletion::makeCompletion(const TQString &text)
/*
* postProcessMatch, postProcessMatches
*
- * Called by KCompletion before emitting match() and matches()
+ * Called by TDECompletion before emitting match() and matches()
*
* Add add the part of the text that was not completed
* Add quotes when needed
@@ -121,11 +121,11 @@ void KShellCompletion::postProcessMatches( TQStringList *matches ) const
}
}
-void KShellCompletion::postProcessMatches( KCompletionMatches *matches ) const
+void KShellCompletion::postProcessMatches( TDECompletionMatches *matches ) const
{
KURLCompletion::postProcessMatches( matches );
- for ( KCompletionMatches::Iterator it = matches->begin();
+ for ( TDECompletionMatches::Iterator it = matches->begin();
it != matches->end(); it++ )
{
if ( !(*it).value().isNull() ) {
diff --git a/tdeio/tdeio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h
index fa90c509e..a23fbe78e 100644
--- a/tdeio/tdeio/kshellcompletion.h
+++ b/tdeio/tdeio/kshellcompletion.h
@@ -56,10 +56,10 @@ public:
TQString makeCompletion(const TQString &text);
protected:
- // Called by KCompletion
+ // Called by TDECompletion
void postProcessMatch( TQString *match ) const;
void postProcessMatches( TQStringList *matches ) const;
- void postProcessMatches( KCompletionMatches *matches ) const;
+ void postProcessMatches( TDECompletionMatches *matches ) const;
private:
// Find the part of text that should be completed
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index 22bbe147a..dc6581ce6 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -462,7 +462,7 @@ public:
TDEIO::ListJob *list_job; // kio job to list directories
TQString prepend; // text to prepend to listed items
- TQString compl_text; // text to pass on to KCompletion
+ TQString compl_text; // text to pass on to TDECompletion
// Filters for files read with kio
bool list_urls_only_exe; // true = only list executables
@@ -486,13 +486,13 @@ KURLCompletionPrivate::~KURLCompletionPrivate()
// KURLCompletion
//
-KURLCompletion::KURLCompletion() : KCompletion()
+KURLCompletion::KURLCompletion() : TDECompletion()
{
init();
}
-KURLCompletion::KURLCompletion( Mode mode ) : KCompletion()
+KURLCompletion::KURLCompletion( Mode mode ) : TDECompletion()
{
init();
setMode ( mode );
@@ -653,15 +653,15 @@ TQString KURLCompletion::makeCompletion(const TQString &text)
/*
* finished
*
- * Go on and call KCompletion.
+ * Go on and call TDECompletion.
* Called when all matches have been added
*/
TQString KURLCompletion::finished()
{
if ( d->last_compl_type == CTInfo )
- return KCompletion::makeCompletion( d->compl_text.lower() );
+ return TDECompletion::makeCompletion( d->compl_text.lower() );
else
- return KCompletion::makeCompletion( d->compl_text );
+ return TDECompletion::makeCompletion( d->compl_text );
}
/*
@@ -1104,7 +1104,7 @@ bool KURLCompletion::urlCompletion(const MyURL &url, TQString *match)
/*
* addMatches
*
- * Called to add matches to KCompletion
+ * Called to add matches to TDECompletion
*/
void KURLCompletion::addMatches( const TQStringList &matches )
{
@@ -1311,7 +1311,7 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job )
d->list_job = 0L;
- finished(); // will call KCompletion::makeCompletion()
+ finished(); // will call TDECompletion::makeCompletion()
}
else {
@@ -1345,7 +1345,7 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job )
/*
* postProcessMatch, postProcessMatches
*
- * Called by KCompletion before emitting match() and matches()
+ * Called by TDECompletion before emitting match() and matches()
*
* Append '/' to directories for file completion. This is
* done here to avoid stat()'ing a lot of files
@@ -1405,10 +1405,10 @@ void KURLCompletion::postProcessMatches( TQStringList * matches ) const
}
}
-void KURLCompletion::postProcessMatches( KCompletionMatches * matches ) const
+void KURLCompletion::postProcessMatches( TDECompletionMatches * matches ) const
{
if ( !matches->isEmpty() && d->last_compl_type == CTFile ) {
- KCompletionMatches::Iterator it = matches->begin();
+ TDECompletionMatches::Iterator it = matches->begin();
for (; it != matches->end(); ++it ) {
adjustMatch( (*it).value() );
}
@@ -1598,7 +1598,7 @@ static TQString unescape(const TQString &text)
}
void KURLCompletion::virtual_hook( int id, void* data )
-{ KCompletion::virtual_hook( id, data ); }
+{ TDECompletion::virtual_hook( id, data ); }
#include "kurlcompletion.moc"
diff --git a/tdeio/tdeio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h
index 30a825d3d..a5b075f3b 100644
--- a/tdeio/tdeio/kurlcompletion.h
+++ b/tdeio/tdeio/kurlcompletion.h
@@ -38,7 +38,7 @@ class KURLCompletionPrivate;
* @short Completion of a single URL
* @author David Smith <[email protected]>
*/
-class TDEIO_EXPORT KURLCompletion : public KCompletion
+class TDEIO_EXPORT KURLCompletion : public TDECompletion
{
Q_OBJECT
@@ -168,10 +168,10 @@ public:
class MyURL;
protected:
- // Called by KCompletion, adds '/' to directories
+ // Called by TDECompletion, adds '/' to directories
void postProcessMatch( TQString *match ) const;
void postProcessMatches( TQStringList *matches ) const;
- void postProcessMatches( KCompletionMatches* matches ) const;
+ void postProcessMatches( TDECompletionMatches* matches ) const;
virtual void customEvent( TQCustomEvent *e );