summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
Diffstat (limited to 'kresources')
-rw-r--r--kresources/blogging/resourcebloggingsettings.ui2
-rw-r--r--kresources/caldav/config.cpp2
-rw-r--r--kresources/carddav/config.cpp2
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp10
-rw-r--r--kresources/groupwise/groupwisesettingswidgetbase.ui2
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp4
-rw-r--r--kresources/kolab/kcal/task.cpp4
-rw-r--r--kresources/kolab/kcal/task.h2
-rw-r--r--kresources/slox/sloxfolder.cpp4
-rw-r--r--kresources/slox/sloxfolder.h4
-rw-r--r--kresources/slox/sloxfolderdialog.cpp4
-rw-r--r--kresources/slox/sloxfoldermanager.cpp8
12 files changed, 24 insertions, 24 deletions
diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui
index de8a0baf..917933ce 100644
--- a/kresources/blogging/resourcebloggingsettings.ui
+++ b/kresources/blogging/resourcebloggingsettings.ui
@@ -313,7 +313,7 @@
<tabstop>mOpenCategory</tabstop>
<tabstop>mCloseCategory</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="5" margin="5"/>
+<layoutdefaults spacing="5" margin="5"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index c86cdd1a..dbab62d7 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -190,7 +190,7 @@ void ResourceCalDavConfig::setupUI() {
label->hide();
mPassword->hide();
- // combining tqlayouts
+ // combining layouts
vertical->addLayout(mainLayout);
vertical->addLayout(horizontal);
}
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index a33519c9..70a3caf1 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -158,7 +158,7 @@ void ResourceCardDavConfig::setupUI() {
label->hide();
mPassword->hide();
- // combining tqlayouts
+ // combining layouts
vertical->addLayout(mainLayout);
vertical->addLayout(horizontal);
}
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index b15a5a39..177ce9de 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -1114,8 +1114,8 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
// SUBTODO
Incidence *inc = todo->relatedTo();
if ( inc ) {
- TQString tqparentUid = idMapper().remoteId( inc->uid() );
- args.insert( "id_tqparent", tqparentUid );
+ TQString parentUid = idMapper().remoteId( inc->uid() );
+ args.insert( "id_tqparent", parentUid );
}
// STATE
@@ -1172,9 +1172,9 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod
}
// SUBTODO
- TQString tqparentId = args[ "id_tqparent" ].toString();
- if ( tqparentId != "0" ) { // we are a sub todo
- TQString localParentUid = idMapper().localId( tqparentId );
+ TQString parentId = args[ "id_tqparent" ].toString();
+ if ( parentId != "0" ) { // we are a sub todo
+ TQString localParentUid = idMapper().localId( parentId );
if ( !localParentUid.isEmpty() ) { // found tqparent todo
Todo *tqparent = mCalendar.todo( localParentUid );
if ( tqparent )
diff --git a/kresources/groupwise/groupwisesettingswidgetbase.ui b/kresources/groupwise/groupwisesettingswidgetbase.ui
index 732b296b..49437ef4 100644
--- a/kresources/groupwise/groupwisesettingswidgetbase.ui
+++ b/kresources/groupwise/groupwisesettingswidgetbase.ui
@@ -73,7 +73,7 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index e9e05c26..c0770879 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -280,8 +280,8 @@ int KSSLSocket::verifyCertificate()
}
// Since we're the tqparent, we need to teach the child.
- setMetaData("ssl_tqparent_ip", ourIp );
- setMetaData("ssl_tqparent_cert", pc.toString());
+ setMetaData("ssl_parent_ip", ourIp );
+ setMetaData("ssl_parent_cert", pc.toString());
// - Read from cache and see if there is a policy for this
KSSLCertificateCache::KSSLCertificatePolicy cp = d->cc->getPolicyByCertificate(pc);
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 872e9b4a..7bf5a601 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -136,9 +136,9 @@ KCal::Incidence::tqStatus Task::status() const
return mtqStatus;
}
-void Task::setParent( const TQString& tqparentUid )
+void Task::setParent( const TQString& parentUid )
{
- mParent = tqparentUid;
+ mParent = parentUid;
}
TQString Task::tqparent() const
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 624605a2..5990192b 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -80,7 +80,7 @@ public:
virtual void setqStatus( KCal::Incidence::tqStatus status );
virtual KCal::Incidence::tqStatus status() const;
- virtual void setParent( const TQString& tqparentUid );
+ virtual void setParent( const TQString& parentUid );
virtual TQString tqparent() const;
virtual void setHasStartDate( bool );
diff --git a/kresources/slox/sloxfolder.cpp b/kresources/slox/sloxfolder.cpp
index 0430f8ee..fbfb9f05 100644
--- a/kresources/slox/sloxfolder.cpp
+++ b/kresources/slox/sloxfolder.cpp
@@ -21,10 +21,10 @@
#include "sloxfolder.h"
-SloxFolder::SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def ) :
+SloxFolder::SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def ) :
item( 0 ),
mId( id ),
- mParentId( tqparentId ),
+ mParentId( parentId ),
mName( name ),
mDefault( def )
{
diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h
index 967f83ed..e27399a6 100644
--- a/kresources/slox/sloxfolder.h
+++ b/kresources/slox/sloxfolder.h
@@ -35,10 +35,10 @@ enum FolderType {
class KDE_EXPORT SloxFolder
{
public:
- SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def = false );
+ SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false );
TQString id() const { return mId; }
- TQString tqparentId() const { return mParentId; }
+ TQString parentId() const { return mParentId; }
FolderType type() const { return mType; }
TQString name() const;
bool isDefault() const { return mDefault; }
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index acf871b2..d58a18e1 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -70,8 +70,8 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
return;
if ( folder->type() != mFolderType && folder->type() != Unbound )
return;
- if( mManager->folders().tqcontains( folder->tqparentId() ) ) {
- SloxFolder *tqparent = mManager->folders()[folder->tqparentId()];
+ if( mManager->folders().tqcontains( folder->parentId() ) ) {
+ SloxFolder *tqparent = mManager->folders()[folder->parentId()];
createFolderViewItem( tqparent );
if ( tqparent->item )
folder->item = new KListViewItem( tqparent->item );
diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp
index b5fd3958..7894ec93 100644
--- a/kresources/slox/sloxfoldermanager.cpp
+++ b/kresources/slox/sloxfoldermanager.cpp
@@ -136,7 +136,7 @@ void SloxFolderManager::readFolders()
TQDomNodeList nodes = doc.elementsByTagName( "D:prop" );
for( uint i = 0; i < nodes.count(); ++i ) {
TQDomElement element = nodes.item(i).toElement();
- TQString id = "-1", tqparentId = "-1"; // OX default folder
+ TQString id = "-1", parentId = "-1"; // OX default folder
bool def = false;
TQString name, type;
TQDomNode n;
@@ -145,13 +145,13 @@ void SloxFolderManager::readFolders()
TQString tag = e.tagName();
TQString value = e.text();
if ( tag == "ox:object_id" ) id = value;
- else if ( tag == "ox:folder_id" ) tqparentId = value;
+ else if ( tag == "ox:folder_id" ) parentId = value;
else if ( tag == "ox:title" ) name = value;
else if ( tag == "ox:module" ) type = value;
else if ( tag == "ox:defaultfolder" ) def = (value == "true");
}
- if ( id != "-1" && tqparentId != "-1" ) {
- SloxFolder *folder = new SloxFolder( id, tqparentId, type, name, def );
+ if ( id != "-1" && parentId != "-1" ) {
+ SloxFolder *folder = new SloxFolder( id, parentId, type, name, def );
mFolders[id] = folder;
kdDebug() << k_funcinfo << "Found folder: " << folder->name() << endl;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 08:07:04 +0000