summaryrefslogtreecommitdiffstats
path: root/kmail/kmfolderdir.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kmail/kmfolderdir.cpp
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmfolderdir.cpp')
-rw-r--r--kmail/kmfolderdir.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index f3b80e3f1..1f6019b00 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -55,7 +55,7 @@ TQString KMFolderRootDir::prettyURL() const
if ( !mBaseURL.isEmpty() )
return i18n( mBaseURL.data() );
else
- return TQString::null;
+ return TQString();
}
@@ -75,9 +75,9 @@ KMFolderMgr* KMFolderRootDir::manager() const
//=============================================================================
//=============================================================================
-KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* parent,
+KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* tqparent,
const TQString& name, KMFolderDirType dirType )
- : KMFolderNode( parent, name ), KMFolderNodeList(),
+ : KMFolderNode( tqparent, name ), KMFolderNodeList(),
mOwner( owner ), mDirType( dirType )
{
setAutoDelete( true );
@@ -129,9 +129,9 @@ TQString KMFolderDir::path() const
{
static TQString p;
- if (parent())
+ if (tqparent())
{
- p = parent()->path();
+ p = tqparent()->path();
p.append("/");
p.append(name());
}
@@ -147,29 +147,29 @@ TQString KMFolderDir::label() const
if ( mOwner )
return mOwner->label();
else
- return TQString::null;
+ return TQString();
}
//-----------------------------------------------------------------------------
TQString KMFolderDir::prettyURL() const
{
- TQString parentUrl;
- if ( parent() )
- parentUrl = parent()->prettyURL();
- if ( !parentUrl.isEmpty() )
- return parentUrl + '/' + label();
+ TQString tqparentUrl;
+ if ( tqparent() )
+ tqparentUrl = tqparent()->prettyURL();
+ if ( !tqparentUrl.isEmpty() )
+ return tqparentUrl + '/' + label();
else
return label();
}
//-----------------------------------------------------------------------------
-void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *parentFolder )
+void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *tqparentFolder )
{
- KMFolderDir* folderDir = new KMFolderDir( parentFolder, this, dirName, mDirType);
+ KMFolderDir* folderDir = new KMFolderDir( tqparentFolder, this, dirName, mDirType);
folderDir->reload();
append( folderDir );
- parentFolder->setChild( folderDir );
+ tqparentFolder->setChild( folderDir );
}
// Get the default folder type of the given dir type. This function should only be used when
@@ -179,7 +179,7 @@ KMFolderType dirTypeToFolderType( KMFolderDirType dirType )
switch( dirType ) {
// Use maildir for normal folder dirs, as this function is only called when finding a dir
- // without a parent folder, which can only happen with maildir-like folders
+ // without a tqparent folder, which can only happen with maildir-like folders
case KMStandardDir: return KMFolderTypeMaildir;
case KMImapDir: return KMFolderTypeImap;
@@ -211,7 +211,7 @@ bool KMFolderDir::reload(void)
return FALSE;
}
- QFileInfoList* fiList=(QFileInfoList*)dir.entryInfoList();
+ TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList();
if (!fiList)
{
TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath);
@@ -320,8 +320,8 @@ bool KMFolderDir::reload(void)
// .foo.directory => foo
TQString folderName = *it;
- int right = folderName.find( ".directory" );
- int left = folderName.find( "." );
+ int right = folderName.tqfind( ".directory" );
+ int left = folderName.tqfind( "." );
Q_ASSERT( left != -1 && right != -1 );
folderName = folderName.mid( left + 1, right - 1 );
@@ -354,7 +354,7 @@ KMFolderNode* KMFolderDir::hasNamedFolder(const TQString& aName)
//-----------------------------------------------------------------------------
KMFolderMgr* KMFolderDir::manager() const
{
- return parent()->manager();
+ return tqparent()->manager();
}