From 0a282818406cdb3b61baa598dee849d3215c783a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 27 Aug 2011 21:38:57 +0000
Subject: Fix a number of accidental tqStatus string conversions

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 conduits/docconduit/doc-conflictdialog.cc    | 2 +-
 conduits/memofileconduit/memofileconduit.xmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'conduits')

diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 8d1e211..32af25f 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -168,7 +168,7 @@ void ResolutionDialog::slotInfo(int index) {
 	int ix=cE.index;
 	if (!syncInfo) return;
 	docSyncInfo si=(*syncInfo)[ix];
-	TQString text=i18n("tqStatus of the database %1:\n\n").tqarg(si.handheldDB);
+	TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB);
 	text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus));
 	text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus));
 
diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi
index 8e8ef1e..c33d9bd 100644
--- a/conduits/memofileconduit/memofileconduit.xmi
+++ b/conduits/memofileconduit/memofileconduit.xmi
@@ -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="tqStatus" >
+    <UML:Enumeration stereotype="18" visibility="public" xmi.id="17" name="Status" >
      <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" />
-- 
cgit v1.2.3