summaryrefslogtreecommitdiffstats
path: root/conduits/memofileconduit
diff options
context:
space:
mode:
Diffstat (limited to 'conduits/memofileconduit')
-rw-r--r--conduits/memofileconduit/Makefile.am2
-rw-r--r--conduits/memofileconduit/memofile-conduit.cc8
-rw-r--r--conduits/memofileconduit/memofile-conduit.h5
-rw-r--r--conduits/memofileconduit/memofile-factory.cc2
-rw-r--r--conduits/memofileconduit/memofile.h2
-rw-r--r--conduits/memofileconduit/memofileconduit.xmi36
-rw-r--r--conduits/memofileconduit/memofiles.cc16
-rw-r--r--conduits/memofileconduit/memofiles.h4
-rw-r--r--conduits/memofileconduit/setup_base.ui12
9 files changed, 44 insertions, 43 deletions
diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am
index 1f51105..020c569 100644
--- a/conduits/memofileconduit/Makefile.am
+++ b/conduits/memofileconduit/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la
conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc
-conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui
conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE)
kde_kcfg_DATA = memofileconduit.kcfg
diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc
index 954af38..233f6af 100644
--- a/conduits/memofileconduit/memofile-conduit.cc
+++ b/conduits/memofileconduit/memofile-conduit.cc
@@ -31,7 +31,7 @@
// Only include what we really need:
// First UNIX system stuff, then std C++,
-// then Qt, then KDE, then local includes.
+// then TQt, then KDE, then local includes.
//
//
@@ -120,7 +120,7 @@ MemofileConduit::~MemofileConduit()
fCtrPC->setStartCount(_memofiles->count());
setFirstSync( _memofiles->isFirstSync() );
- addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
+ addSyncLogEntry(i18n(" Syncing with %1.").tqarg(_memo_directory));
if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
addSyncLogEntry(i18n(" Copying Pilot to PC..."));
@@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot()
{
FUNCTIONSETUP;
- DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
+ DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl;
}
@@ -448,7 +448,7 @@ void MemofileConduit::deleteUnsyncedHHRecords()
Pilot::RecordIDList::iterator it;
for ( it = ids.begin(); it != ids.end(); ++it )
{
- if (!_memofiles->find(*it))
+ if (!_memofiles->tqfind(*it))
{
DEBUGKPILOT << fname
<< "Deleting record with ID "<< *it <<" from handheld "
diff --git a/conduits/memofileconduit/memofile-conduit.h b/conduits/memofileconduit/memofile-conduit.h
index c795066..d2d07d1 100644
--- a/conduits/memofileconduit/memofile-conduit.h
+++ b/conduits/memofileconduit/memofile-conduit.h
@@ -37,6 +37,7 @@ class PilotMemo;
class MemofileConduit : public ConduitAction
{
Q_OBJECT
+ TQ_OBJECT
public:
MemofileConduit(KPilotLink *,
const char *name=0L,
@@ -52,8 +53,8 @@ protected slots:
private:
// configuration settings...
- QString _DEFAULT_MEMODIR;
- QString _memo_directory;
+ TQString _DEFAULT_MEMODIR;
+ TQString _memo_directory;
bool _sync_private;
PilotMemoInfo *fMemoAppInfo;
diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc
index 795edc3..8b2d9df 100644
--- a/conduits/memofileconduit/memofile-factory.cc
+++ b/conduits/memofileconduit/memofile-factory.cc
@@ -46,7 +46,7 @@
class MemofileConduitConfig : public ConduitConfigBase
{
public:
- MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L);
+ MemofileConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
virtual void commit();
virtual void load();
protected:
diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h
index 4bd5fb7..1308e98 100644
--- a/conduits/memofileconduit/memofile.h
+++ b/conduits/memofileconduit/memofile.h
@@ -32,7 +32,7 @@
// Only include what we really need:
// First UNIX system stuff, then std C++,
-// then Qt, then KDE, then local includes.
+// then TQt, then KDE, then local includes.
//
//
diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi
index 33ff89f..9088d35 100644
--- a/conduits/memofileconduit/memofileconduit.xmi
+++ b/conduits/memofileconduit/memofileconduit.xmi
@@ -34,7 +34,7 @@
<UML:Operation visibility="protected" xmi.id="28" type="void" name="process" />
<UML:Operation visibility="private" xmi.id="43" type="bool" name="readConfig" />
<UML:Operation visibility="private" xmi.id="44" type="void" name="getAppInfo" />
- <UML:Operation visibility="private" xmi.id="45" type="QString" name="getCategoryName" >
+ <UML:Operation visibility="private" xmi.id="45" type=TQSTRING_OBJECT_NAME_STRING name="getCategoryName" >
<UML:Parameter visibility="public" xmi.id="46" value="" type="int" name="category" />
</UML:Operation>
<UML:Operation visibility="private" xmi.id="47" type="bool" name="initializeFromPilot" />
@@ -43,7 +43,7 @@
<UML:Operation visibility="private" xmi.id="50" type="bool" name="initializeFromFilesystem" />
<UML:Operation visibility="private" xmi.id="51" type="bool" name="initializeMemofileList" />
<UML:Operation visibility="private" xmi.id="52" type="bool" name="checkDirectory" >
- <UML:Parameter visibility="public" xmi.id="53" value="" type="QString" name="dir" />
+ <UML:Parameter visibility="public" xmi.id="53" value="" type=TQSTRING_OBJECT_NAME_STRING name="dir" />
</UML:Operation>
<UML:Operation visibility="private" xmi.id="54" type="bool" name="ensureFilesystemReady" />
<UML:Operation visibility="private" xmi.id="55" type="bool" name="copyHHToPC" />
@@ -54,8 +54,8 @@
<UML:Parameter visibility="public" xmi.id="60" value="" type="const QString&amp;" name="fileName" />
<UML:Parameter visibility="public" xmi.id="61" value="" type="Memofile*" name="theMemo" />
</UML:Operation>
- <UML:Attribute visibility="private" xmi.id="29" value="" type="QString" name="_DEFAULT_MEMODIR" />
- <UML:Attribute visibility="private" xmi.id="30" value="" type="QString" name="_memo_directory" />
+ <UML:Attribute visibility="private" xmi.id="29" value="" type=TQSTRING_OBJECT_NAME_STRING name="_DEFAULT_MEMODIR" />
+ <UML:Attribute visibility="private" xmi.id="30" value="" type=TQSTRING_OBJECT_NAME_STRING name="_memo_directory" />
<UML:Attribute visibility="private" xmi.id="31" value="" type="bool" name="_sync_private" />
<UML:Attribute visibility="private" xmi.id="32" value="" type="QPtrList&lt; PilotMemo >" name="fMemoList" />
<UML:Attribute visibility="private" xmi.id="33" value="" type="struct MemoAppInfo" name="fMemoAppInfo" />
@@ -65,7 +65,7 @@
<UML:Attribute visibility="private" xmi.id="40" value="" type="int" name="fCounter" />
<UML:Attribute visibility="private" xmi.id="41" value="" type="int" name="fDeleteCounter" />
<UML:Attribute visibility="private" xmi.id="42" value="" type="int" name="fModifyCounter" />
- <UML:Enumeration stereotype="18" visibility="public" xmi.id="17" name="Status" >
+ <UML:Enumeration stereotype="18" visibility="public" xmi.id="17" name="tqStatus" >
<UML:EnumerationLiteral visibility="public" xmi.id="19" name="Init" />
<UML:EnumerationLiteral visibility="public" xmi.id="20" name="ModifiedFilesToPilot" />
<UML:EnumerationLiteral visibility="public" xmi.id="21" name="DeleteFilesOnPilot" />
@@ -79,7 +79,7 @@
<UML:Class visibility="public" xmi.id="63" name="Memofiles" >
<UML:Operation visibility="public" xmi.id="80" type="Memofiles" name="Memofiles" >
<UML:Parameter visibility="public" xmi.id="81" value="" type="QMap" name="categories" />
- <UML:Parameter visibility="public" xmi.id="82" value="" type="QString" name="baseDirectory" />
+ <UML:Parameter visibility="public" xmi.id="82" value="" type=TQSTRING_OBJECT_NAME_STRING name="baseDirectory" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="87" type="void" name="load" >
<UML:Parameter visibility="public" xmi.id="88" value="" type="bool" name="loadAll" />
@@ -92,39 +92,39 @@
</UML:Operation>
<UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" />
<UML:Operation visibility="public" xmi.id="98" type="void" name="loadIds" />
- <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" >
- <UML:Parameter visibility="public" xmi.id="100" value="" type="QString" name="category" />
- <UML:Parameter visibility="public" xmi.id="101" value="" type="QString" name="filename" />
+ <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="tqfind" >
+ <UML:Parameter visibility="public" xmi.id="100" value="" type=TQSTRING_OBJECT_NAME_STRING name="category" />
+ <UML:Parameter visibility="public" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="102" type="void" name="addModified" >
<UML:Parameter visibility="public" xmi.id="103" value="" type="PilotMemo *" name="memo" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="104" type="QPtrList&lt;Memofile>" name="getModified" />
<UML:Attribute visibility="private" xmi.id="83" value="" type="QMap" name="_categories" />
- <UML:Attribute visibility="private" xmi.id="85" value="" type="QString" name="_baseDirectory" />
+ <UML:Attribute visibility="private" xmi.id="85" value="" type=TQSTRING_OBJECT_NAME_STRING name="_baseDirectory" />
<UML:Attribute visibility="private" xmi.id="93" value="" type="QPtrList&lt;Memofile>" name="_memofiles" />
</UML:Class>
<UML:Class visibility="public" xmi.id="64" name="Memofile" >
<UML:Operation visibility="public" xmi.id="65" type="" name="Memofile" >
<UML:Parameter visibility="public" xmi.id="66" value="" type="PilotMemo*" name="memo" />
- <UML:Parameter visibility="public" xmi.id="67" value="" type="QString" name="categoryName" />
+ <UML:Parameter visibility="public" xmi.id="67" value="" type=TQSTRING_OBJECT_NAME_STRING name="categoryName" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="68" type="" name="Memofile" >
<UML:Parameter visibility="public" xmi.id="69" value="" type="recordid_t" name="id" />
<UML:Parameter visibility="public" xmi.id="70" value="" type="int" name="category" />
- <UML:Parameter visibility="public" xmi.id="71" value="" type="QString" name="categoryName" />
+ <UML:Parameter visibility="public" xmi.id="71" value="" type=TQSTRING_OBJECT_NAME_STRING name="categoryName" />
<UML:Parameter visibility="public" xmi.id="72" value="" type="uint" name="lastModifiedTime" />
- <UML:Parameter visibility="public" xmi.id="73" value="" type="QString" name="filename" />
- <UML:Parameter visibility="public" xmi.id="74" value="" type="QString" name="text" />
+ <UML:Parameter visibility="public" xmi.id="73" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
+ <UML:Parameter visibility="public" xmi.id="74" value="" type=TQSTRING_OBJECT_NAME_STRING name="text" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="75" type="uint" name="lastModified" />
- <UML:Operation visibility="public" xmi.id="76" type="QString" name="filename" />
+ <UML:Operation visibility="public" xmi.id="76" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
<UML:Attribute visibility="private" xmi.id="77" value="" type="uint" name="_lastModified" />
- <UML:Attribute visibility="private" xmi.id="78" value="" type="QString" name="_categoryName" />
- <UML:Attribute visibility="private" xmi.id="79" value="" type="QString" name="_filename" />
+ <UML:Attribute visibility="private" xmi.id="78" value="" type=TQSTRING_OBJECT_NAME_STRING name="_categoryName" />
+ <UML:Attribute visibility="private" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING name="_filename" />
</UML:Class>
<UML:DataType stereotype="3" visibility="public" xmi.id="84" name="QMap" />
- <UML:DataType stereotype="3" visibility="public" xmi.id="86" name="QString" />
+ <UML:DataType stereotype="3" visibility="public" xmi.id="86" name=TQSTRING_OBJECT_NAME_STRING />
<UML:DataType stereotype="3" visibility="public" xmi.id="94" name="QPtrList&lt;Memofile>" />
<UML:Association visibility="public" xmi.id="36" >
<UML:Association.connection>
diff --git a/conduits/memofileconduit/memofiles.cc b/conduits/memofileconduit/memofiles.cc
index c51915b..c8ce67b 100644
--- a/conduits/memofileconduit/memofiles.cc
+++ b/conduits/memofileconduit/memofiles.cc
@@ -89,7 +89,7 @@ void Memofiles::load (bool loadAll)
// DEBUGKPILOT << fname
// << ": checking category: [" << categoryName
// << "], file: [" << file << "]." << endl;
- Memofile * memofile = find(categoryName, file);
+ Memofile * memofile = tqfind(categoryName, file);
if (NULL == memofile) {
memofile = new Memofile(category, categoryName, file, _baseDirectory);
memofile->setModified(true);
@@ -316,7 +316,7 @@ bool Memofiles::loadFromMetadata ()
return true;
}
-Memofile * Memofiles::find (recordid_t id)
+Memofile * Memofiles::tqfind (recordid_t id)
{
Memofile * memofile;
@@ -331,7 +331,7 @@ Memofile * Memofiles::find (recordid_t id)
}
-Memofile * Memofiles::find (const TQString & category, const TQString & filename)
+Memofile * Memofiles::tqfind (const TQString & category, const TQString & filename)
{
Memofile * memofile;
@@ -353,7 +353,7 @@ void Memofiles::deleteMemo(PilotMemo * memo)
if (! memo->isDeleted())
return;
- Memofile * memofile = find(memo->id());
+ Memofile * memofile = tqfind(memo->id());
if (memofile) {
memofile->deleteFile();
_memofiles.remove(memofile);
@@ -375,7 +375,7 @@ void Memofiles::addModifiedMemo (PilotMemo * memo)
+ TQString::number(memo->id()) + CSL1("], title: [")
+ memo->getTitle() + CSL1("]. ");
- Memofile * memofile = find(memo->id());
+ Memofile * memofile = tqfind(memo->id());
if (NULL == memofile) {
_cudCounter.created();
@@ -653,7 +653,7 @@ TQString Memofiles::filename(PilotMemo * memo)
if (filename.isEmpty()) {
TQString text = memo->text();
- int i = text.find(CSL1("\n"));
+ int i = text.tqfind(CSL1("\n"));
if (i > 1) {
filename = text.left(i);
}
@@ -666,7 +666,7 @@ TQString Memofiles::filename(PilotMemo * memo)
TQString category = _categories[memo->category()];
- Memofile * memofile = find(category, filename);
+ Memofile * memofile = tqfind(category, filename);
// if we couldn't find a memofile with this filename, or if the
// memofile that is found is the same as the memo that we're looking
@@ -683,7 +683,7 @@ TQString Memofiles::filename(PilotMemo * memo)
// for trouble.
while (NULL != memofile && uniq <=20) {
newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) );
- memofile = find(category, newfilename);
+ memofile = tqfind(category, newfilename);
}
return newfilename;
diff --git a/conduits/memofileconduit/memofiles.h b/conduits/memofileconduit/memofiles.h
index 72b6ed4..290cf3a 100644
--- a/conduits/memofileconduit/memofiles.h
+++ b/conduits/memofileconduit/memofiles.h
@@ -55,8 +55,8 @@ public:
TQPtrList<Memofile> getModified();
TQPtrList<Memofile> getAll() { return _memofiles; } ;
- Memofile * find (const TQString & category, const TQString & filename);
- Memofile * find (recordid_t id);
+ Memofile * tqfind (const TQString & category, const TQString & filename);
+ Memofile * tqfind (recordid_t id);
MemoCategoryMap readCategoryMetadata();
void setCategories(MemoCategoryMap map) { _categories = map; } ;
diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui
index 5053469..606bf5e 100644
--- a/conduits/memofileconduit/setup_base.ui
+++ b/conduits/memofileconduit/setup_base.ui
@@ -3,7 +3,7 @@
<comment>A tabWidget for configuring
the Memofile-conduit settings.</comment>
<author>Jason 'vanRijn' Kasper</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Form1</cstring>
</property>
@@ -46,7 +46,7 @@ the Memofile-conduit settings.</comment>
<property name="spacing">
<number>6</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>tabWidget</cstring>
</property>
@@ -60,7 +60,7 @@ the Memofile-conduit settings.</comment>
</property>
<property name="tqlayoutMargin" stdset="0">
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>Widget2</cstring>
</property>
@@ -88,7 +88,7 @@ the Memofile-conduit settings.</comment>
</size>
</property>
</spacer>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -96,7 +96,7 @@ the Memofile-conduit settings.</comment>
<string>Sync private records:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -115,7 +115,7 @@ the Memofile-conduit settings.</comment>
<string>Select the directory you want to store your PDA's memos in</string>
</property>
</widget>
- <widget class="QCheckBox" row="1" column="1">
+ <widget class="TQCheckBox" row="1" column="1">
<property name="name">
<cstring>fSyncPrivate</cstring>
</property>