summaryrefslogtreecommitdiffstats
path: root/kitchensync/libqopensync
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kitchensync/libqopensync
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
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
Diffstat (limited to 'kitchensync/libqopensync')
-rw-r--r--kitchensync/libqopensync/group.cpp2
-rw-r--r--kitchensync/libqopensync/member.cpp4
-rw-r--r--kitchensync/libqopensync/plugin.cpp6
-rw-r--r--kitchensync/libqopensync/syncchange.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index bc94e2208..a3fd4f2a0 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -146,7 +146,7 @@ TQString Group::name() const
{
Q_ASSERT( mGroup );
- return TQString::fromLatin1( osync_group_get_name( mGroup ) );
+ return TQString::tqfromLatin1( osync_group_get_name( mGroup ) );
}
void Group::setLastSynchronization( const TQDateTime &dateTime )
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index 35cb04632..5ed409861 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const
{
Q_ASSERT( mMember );
- return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
+ return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) );
}
TQString Member::pluginName() const
{
Q_ASSERT( mMember );
- return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
+ return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) );
}
Plugin Member::plugin() const
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index acd54447a..fd7600499 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -43,20 +43,20 @@ TQString Plugin::name() const
{
Q_ASSERT( mPlugin );
- return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
+ return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) );
}
TQString Plugin::longName() const
{
Q_ASSERT( mPlugin );
- return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
+ return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) );
}
TQString Plugin::description() const
{
Q_ASSERT( mPlugin );
- return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
+ return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) );
}
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 53d9c4401..27ff6b220 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -82,7 +82,7 @@ class SyncChange
TQString data() const;
/**
- Returns whether the change contains data.
+ Returns whether the change tqcontains data.
*/
bool hasData() const;