Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 19 insertions, 19 deletions

diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 2b7895282..5afd6402d 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -49,7 +49,7 @@ static const char* inlineMimeType = "text/calendar";
 
 ResourceScalix::ResourceScalix( const KConfig *config )
   : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ),
-    mCalendar( TQString::fromLatin1("UTC") )
+    mCalendar( TQString::tqfromLatin1("UTC") )
 {
   setType( "scalix" );
 }
@@ -99,7 +99,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
     return false;
   }
 
-  TQMap<Q_UINT32, TQString> lst;
+  TQMap<TQ_UINT32, TQString> lst;
   if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
     kdError(5500) << "Communication problem in "
                   << "ResourceScalix::getIncidenceList()\n";
@@ -111,7 +111,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   // Populate with the new entries
   const bool silent = mSilent;
   mSilent = true;
-  TQMap<Q_UINT32, TQString>::Iterator it;
+  TQMap<TQ_UINT32, TQString>::Iterator it;
   for ( it = lst.begin(); it != lst.end(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
     if ( !journal )
@@ -158,7 +158,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal )
 }
 
 KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource,
-                             Q_UINT32 sernum, const TQString& )
+                             TQ_UINT32 sernum, const TQString& )
 {
   KCal::Journal* journal = 0;
     // FIXME: This does not take into account the time zone!
@@ -166,7 +166,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
   journal = static_cast<KCal::Journal*>( formatter.fromString( data ) );
 
   Q_ASSERT( journal );
-  if( journal && !mUidMap.contains( journal->uid() ) )
+  if( journal && !mUidMap.tqcontains( journal->uid() ) )
     if ( addNote( journal, subresource, sernum ) )
       return journal;
     else
@@ -175,7 +175,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
 }
 
 bool ResourceScalix::addNote( KCal::Journal* journal,
-                             const TQString& subresource, Q_UINT32 sernum )
+                             const TQString& subresource, TQ_UINT32 sernum )
 {
   kdDebug(5500) << "ResourceScalix::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
 
@@ -212,7 +212,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal,
 bool ResourceScalix::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.contains( uid ) )
+  if ( !mUidMap.tqcontains( uid ) )
     // Odd
     return false;
 
@@ -252,8 +252,8 @@ KCal::Alarm::List ResourceScalix::alarms( const TQDateTime& from, const TQDateTi
 void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
-  Q_UINT32 sernum;
-  if ( mUidMap.contains( i->uid() ) ) {
+  TQ_UINT32 sernum;
+  if ( mUidMap.tqcontains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -276,7 +276,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
  */
 bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int,
                                            const TQString& note )
 {
@@ -327,7 +327,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -347,7 +347,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -383,7 +383,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   emit signalSubresourceRemoved( this, type, subResource );
 }
 
-void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
@@ -393,7 +393,7 @@ void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>&
   const bool silent = mSilent;
   mSilent = true;
   TQString mimetype = inlineMimeType;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
     if ( !journal )
       kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -411,7 +411,7 @@ TQStringList ResourceScalix::subresources() const
 
 bool ResourceScalix::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].active();
   }
 
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index cb0c50fbf..dc8517b68 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -80,7 +80,7 @@ public:
 
   /// The ResourceScalixBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& note );
+                              TQ_UINT32 sernum, int format, const TQString& note );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -90,7 +90,7 @@ public:
                                 const TQString& label, bool writable );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -106,9 +106,9 @@ signals:
 
 private:
   bool addNote( KCal::Journal* journal, const TQString& resource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   KCal::Journal* addNote( const TQString& data, const TQString& subresource,
-                          Q_UINT32 sernum, const TQString &mimetype );
+                          TQ_UINT32 sernum, const TQString &mimetype );
 
   bool loadSubResource( const TQString& resource, const TQString& mimetype );