summaryrefslogtreecommitdiffstats
path: root/kfind
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kfind
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kfind')
-rw-r--r--kfind/ChangeLog4
-rw-r--r--kfind/kdatecombo.cpp4
-rw-r--r--kfind/kftabdlg.cpp14
-rw-r--r--kfind/kfwin.cpp6
-rw-r--r--kfind/kquery.cpp16
-rw-r--r--kfind/kquery.h8
6 files changed, 26 insertions, 26 deletions
diff --git a/kfind/ChangeLog b/kfind/ChangeLog
index 87849d49..9d8ae06b 100644
--- a/kfind/ChangeLog
+++ b/kfind/ChangeLog
@@ -64,7 +64,7 @@ ver. 0.4.1: Mario Weilguni <mweilguni@kde.org>
ver. 0.4: Mario Weilguni <mweilguni@kde.org>
* introduced this ChangeLog
- * kfind now uses KShellProcess instead of KProcess, makes
+ * kfind now uses KShellProcess instead of TDEProcess, makes
regular expression search possible with egrep/xargs
* kftabdlg.cpp: tab-dialog isn't closed anymore if Escape key
is pressed
@@ -83,7 +83,7 @@ ver. 0.3.4:
ver. 0.3.3:
- o uses KProcess
+ o uses TDEProcess
o supports other languages then english (at this time german and czech)
ver. 0.3.2:
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 5ac494f8..b901b0f0 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -49,12 +49,12 @@ KDateCombo::~KDateCombo()
TQString KDateCombo::date2String(const TQDate & date)
{
- return(KGlobal::locale()->formatDate(date, true));
+ return(TDEGlobal::locale()->formatDate(date, true));
}
TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd)
{
- return *qd = KGlobal::locale()->readDate(str);
+ return *qd = TDEGlobal::locale()->readDate(str);
}
TQDate & KDateCombo::getDate(TQDate *currentDate)
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index a16ad67c..75e89a9a 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -158,7 +158,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
betweenType->setCurrentItem(1);
- TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
+ TQDate dt = TDEGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate = new KDateCombo(dt, pages[1], "fromDate");
toDate = new KDateCombo(pages[1], "toDate");
@@ -380,7 +380,7 @@ KfindTabWidget::~KfindTabWidget()
void KfindTabWidget::setURL( const KURL & url )
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("History");
m_url = url;
TQStringList sl = conf->readPathListEntry("Directories");
@@ -459,7 +459,7 @@ void KfindTabWidget::saveHistory()
void KfindTabWidget::loadHistory()
{
// Load pattern history
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("History");
TQStringList sl = conf->readListEntry("Patterns");
if(!sl.isEmpty())
@@ -522,7 +522,7 @@ void KfindTabWidget::slotSizeBoxChanged(int index)
void KfindTabWidget::setDefaults()
{
- TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
+ TQDate dt = TDEGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate ->setDate(dt);
toDate ->setDate(TQDate::currentDate());
@@ -726,11 +726,11 @@ void KfindTabWidget::setQuery(KQuery *query)
}
TQString KfindTabWidget::date2String(const TQDate & date) {
- return(KGlobal::locale()->formatDate(date, true));
+ return(TDEGlobal::locale()->formatDate(date, true));
}
TQDate &KfindTabWidget::string2Date(const TQString & str, TQDate *qd) {
- return *qd = KGlobal::locale()->readDate(str);
+ return *qd = TDEGlobal::locale()->readDate(str);
}
void KfindTabWidget::getDirectory()
@@ -849,7 +849,7 @@ static void save_pattern(TQComboBox *obj,
}
}
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup(group);
conf->writePathEntry(entry, sl);
}
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index bdf07784..740c7ae3 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -61,11 +61,11 @@ KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const TQString& mat
{
fileInfo = new TQFileInfo(item.url().path());
- TQString size = KGlobal::locale()->formatNumber(item.size(), 0);
+ TQString size = TDEGlobal::locale()->formatNumber(item.size(), 0);
TQDateTime dt;
dt.setTime_t(item.time(KIO::UDS_MODIFICATION_TIME));
- TQString date = KGlobal::locale()->formatDateTime(dt);
+ TQString date = TDEGlobal::locale()->formatDateTime(dt);
int perm_index;
if(fileInfo->isReadable())
@@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init)
{
setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
TQString sampleDate =
- KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+ TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 4231f1aa..e6f8664f 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -20,10 +20,10 @@ KQuery::KQuery(TQObject *parent, const char * name)
{
m_regexps.setAutoDelete(true);
m_fileItems.setAutoDelete(true);
- processLocate = new KProcess(this);
- connect(processLocate,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(KProcess*,char*,int)));
- connect(processLocate,TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(KProcess*,char*,int)));
- connect(processLocate,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(slotendProcessLocate(KProcess*)));
+ processLocate = new TDEProcess(this);
+ connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
+ connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
+ connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*)));
// Files with these mime types can be ignored, even if
// findFormatByFileContent() in some cases may claim that
@@ -78,7 +78,7 @@ void KQuery::start()
*processLocate << m_url.path(1).latin1();
bufferLocate=NULL;
bufferLocateLength=0;
- processLocate->start(KProcess::NotifyOnExit,KProcess::AllOutput);
+ processLocate->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
return;
}
@@ -478,12 +478,12 @@ void KQuery::setUseFileIndex(bool useLocate)
m_useLocate=useLocate;
}
-void KQuery::slotreceivedSdterr(KProcess* ,char* str,int)
+void KQuery::slotreceivedSdterr(TDEProcess* ,char* str,int)
{
KMessageBox::error(NULL, TQString(str), i18n("Error while using locate"));
}
-void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
+void KQuery::slotreceivedSdtout(TDEProcess*,char* str,int l)
{
int i;
@@ -494,7 +494,7 @@ void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
bufferLocate[bufferLocateLength-l+i]=str[i];
}
-void KQuery::slotendProcessLocate(KProcess*)
+void KQuery::slotendProcessLocate(TDEProcess*)
{
TQString qstr;
TQStringList strlist;
diff --git a/kfind/kquery.h b/kfind/kquery.h
index ecd83b34..5ddc334f 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -53,9 +53,9 @@ class KQuery : public TQObject
void slotListEntries(KIO::Job *, const KIO::UDSEntryList &);
void slotResult(KIO::Job *);
void slotCanceled(KIO::Job *);
- void slotreceivedSdtout(KProcess*,char*,int);
- void slotreceivedSdterr(KProcess*,char*,int);
- void slotendProcessLocate(KProcess*);
+ void slotreceivedSdtout(TDEProcess*,char*,int);
+ void slotreceivedSdterr(TDEProcess*,char*,int);
+ void slotendProcessLocate(TDEProcess*);
signals:
void addFile(const KFileItem *filename, const TQString& matchingLine);
@@ -86,7 +86,7 @@ class KQuery : public TQObject
char* bufferLocate;
int bufferLocateLength;
TQStringList locateList;
- KProcess *processLocate;
+ TDEProcess *processLocate;
TQPtrList<TQRegExp> m_regexps;// regexps for file name
// TQValueList<bool> m_regexpsContainsGlobs; // what should this be good for ? Alex
KIO::ListJob *job;