summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/encodingdetector_ja.cpp2
-rw-r--r--kmail/encodingdetector_ja_p.h2
-rw-r--r--kmail/folderdiaquotatab.h6
-rw-r--r--kmail/folderdiaquotatab_p.h6
-rw-r--r--kmail/headerlistquicksearch.cpp6
-rw-r--r--kmail/headerlistquicksearch.h6
-rw-r--r--kmail/imapaccountbase.cpp6
-rw-r--r--kmail/imapaccountbase.h2
-rw-r--r--kmail/kmcomposewin.cpp2
-rw-r--r--kmail/kmcomposewin.h2
-rw-r--r--kmail/kmfoldercachedimap.cpp14
-rw-r--r--kmail/kmfoldercachedimap.h8
-rw-r--r--kmail/quotajobs.h6
-rw-r--r--kmail/templateparser.cpp4
-rw-r--r--kmail/templateparser.h8
15 files changed, 40 insertions, 40 deletions
diff --git a/kmail/encodingdetector_ja.cpp b/kmail/encodingdetector_ja.cpp
index 659661a03..d5eeb1e0e 100644
--- a/kmail/encodingdetector_ja.cpp
+++ b/kmail/encodingdetector_ja.cpp
@@ -23,7 +23,7 @@
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
diff --git a/kmail/encodingdetector_ja_p.h b/kmail/encodingdetector_ja_p.h
index d5809c048..dac255d55 100644
--- a/kmail/encodingdetector_ja_p.h
+++ b/kmail/encodingdetector_ja_p.h
@@ -23,7 +23,7 @@
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index be91bba2b..b75ae53da 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -29,8 +29,8 @@
* you do not wish to do so, delete this exception statement from
* your version.
*/
-#ifndef FOLDERDIATQUOTA_H
-#define FOLDERDIATQUOTA_H
+#ifndef FOLDERDIAQUOTA_H
+#define FOLDERDIAQUOTA_H
#include "kmfolderdia.h"
#include "kmfoldertype.h"
@@ -88,5 +88,5 @@ private:
} // end of namespace KMail
-#endif /* FOLDERDIATQUOTA_H */
+#endif /* FOLDERDIAQUOTA_H */
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 669e21901..90eba639e 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -30,8 +30,8 @@
*/
-#ifndef FOLDERDIATQUOTA_P_H
-#define FOLDERDIATQUOTA_P_H
+#ifndef FOLDERDIAQUOTA_P_H
+#define FOLDERDIAQUOTA_P_H
#include <tqlabel.h>
@@ -61,4 +61,4 @@ private:
}//end of namespace KMail
-#endif /* FOLDERDIATQUOTA_H */
+#endif /* FOLDERDIAQUOTA_H */
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 5fe00e022..9d6c37e55 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -85,7 +85,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
mStatusCombo->setCurrentItem( 0 );
mStatusCombo->installEventFilter( this );
connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
- this, TQT_SLOT( sloStatusChanged( int ) ) );
+ this, TQT_SLOT( slotStatusChanged( int ) ) );
label->setBuddy( mStatusCombo );
@@ -170,10 +170,10 @@ void HeaderListQuickSearch::reset()
{
clear();
mStatusCombo->setCurrentItem( 0 );
- sloStatusChanged( 0 );
+ slotStatusChanged( 0 );
}
-void HeaderListQuickSearch::sloStatusChanged( int index )
+void HeaderListQuickSearch::slotStatusChanged( int index )
{
if ( index == 0 )
mStatus = 0;
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index 0e3c4c9de..992c3515d 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -28,8 +28,8 @@
your version.
*/
-#ifndef KMAILHEADERLISTQUICKSEARCH_H
-#define KMAILHEADERLISTQUICKSEARCH_H
+#ifndef KMAILHEADERLISQUICKSEARCH_H
+#define KMAILHEADERLISQUICKSEARCH_H
#include "kmmsgbase.h" // for KMMsgStatus
#include "kmsearchpattern.h"
@@ -87,7 +87,7 @@ private slots:
* cache the status in mStatus so as to avoid having to do the comparatively
* expensive string comparison for each item in itemMatches
*/
- void sloStatusChanged( int index );
+ void slotStatusChanged( int index );
private:
/** Helper method for the filling of the status combo. */
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 605d5c02a..25e5eb782 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -1215,7 +1215,7 @@ namespace KMail {
jd.path = path;
insertJob(job, jd);
connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotSeStatusResult(KIO::Job *)));
+ TQT_SLOT(slotSetStatusResult(KIO::Job *)));
}
void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1237,11 +1237,11 @@ namespace KMail {
jd.path = path;
insertJob(job, jd);
connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotSeStatusResult(KIO::Job *)));
+ TQT_SLOT(slotSetStatusResult(KIO::Job *)));
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::slotSeStatusResult(KIO::Job * job)
+ void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
{
ImapAccountBase::JobIterator it = findJob(job);
if ( it == jobsEnd() ) return;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 4cca259ff..95342f9ec 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -438,7 +438,7 @@ namespace KMail {
/**
* Only delete information about the job and ignore write errors
*/
- void slotSeStatusResult(KIO::Job * job);
+ void slotSetStatusResult(KIO::Job * job);
/// Result of getUserRights() job
void slotGetUserRightsResult( KIO::Job* _job );
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 7db2c6778..227f48ca1 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -4996,7 +4996,7 @@ void KMComposeWin::slotSpellcheckConfig()
}
//-----------------------------------------------------------------------------
-void KMComposeWin::sloStatusMessage(const TQString &message)
+void KMComposeWin::slotStatusMessage(const TQString &message)
{
statusBar()->changeItem( message, 0 );
}
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 635ff7da9..1115a846c 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -369,7 +369,7 @@ private slots:
/**
* XML-GUI stuff
*/
- void sloStatusMessage(const TQString &message);
+ void slotStatusMessage(const TQString &message);
void slotEditToolbars();
void slotUpdateToolbars();
void slotEditKeys();
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 02bec8ed0..72f1113c2 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -828,13 +828,13 @@ TQString KMFolderCachedImap::state2String( int state ) const
case SYNC_STATE_SET_ANNOTATIONS: return "SYNC_STATE_SET_ANNOTATIONS";
case SYNC_STATE_GET_ACLS: return "SYNC_STATE_GET_ACLS";
case SYNC_STATE_SET_ACLS: return "SYNC_STATE_SET_ACLS";
- case SYNC_STATE_GET_TQUOTA: return "SYNC_STATE_GET_TQUOTA";
+ case SYNC_STATE_GET_QUOTA: return "SYNC_STATE_GET_QUOTA";
case SYNC_STATE_FIND_SUBFOLDERS: return "SYNC_STATE_FIND_SUBFOLDERS";
case SYNC_STATE_SYNC_SUBFOLDERS: return "SYNC_STATE_SYNC_SUBFOLDERS";
case SYNC_STATE_RENAME_FOLDER: return "SYNC_STATE_RENAME_FOLDER";
case SYNC_STATE_CHECK_UIDVALIDITY: return "SYNC_STATE_CHECK_UIDVALIDITY";
case SYNC_STATE_CLOSE: return "SYNC_STATE_CLOSE";
- case SYNC_STATE_GET_SUBFOLDER_TQUOTA: return "SYNC_STATE_GET_SUBFOLDER_TQUOTA";
+ case SYNC_STATE_GET_SUBFOLDER_QUOTA: return "SYNC_STATE_GET_SUBFOLDER_QUOTA";
default: return "Unknown state";
}
}
@@ -1293,13 +1293,13 @@ void KMFolderCachedImap::serverSyncInternal()
case SYNC_STATE_SYNC_SUBFOLDERS:
syncNextSubFolder( false );
break;
- case SYNC_STATE_GET_SUBFOLDER_TQUOTA:
+ case SYNC_STATE_GET_SUBFOLDER_QUOTA:
// Sync the subfolders again, so that the quota information is updated for all. This state is
// only entered if the close to quota property of one subfolder changed in the previous state.
syncNextSubFolder( true );
break;
- case SYNC_STATE_GET_TQUOTA:
+ case SYNC_STATE_GET_QUOTA:
mSyncState = SYNC_STATE_CLOSE;
if( !noContent() && mAccount->hasQuotaSupport() ) {
mProgress = 98;
@@ -1346,10 +1346,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync )
if( mSubfoldersForSync.isEmpty() ) {
// Sync finished, and a close to quota property of an subfolder changed, therefore go into
- // the SYNC_STATE_GET_SUBFOLDER_TQUOTA state and sync again
+ // the SYNC_STATE_GET_SUBFOLDER_QUOTA state and sync again
if ( mSomeSubFolderCloseToQuotaChanged && mRecurse && !secondSync ) {
buildSubFolderList();
- mSyncState = SYNC_STATE_GET_SUBFOLDER_TQUOTA;
+ mSyncState = SYNC_STATE_GET_SUBFOLDER_QUOTA;
serverSyncInternal();
}
@@ -1358,7 +1358,7 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync )
// Quota checking has to come after syncing subfolder, otherwise the quota information would
// be outdated, since the subfolders can change in size during the syncing.
// https://issues.kolab.org/issue4066
- mSyncState = SYNC_STATE_GET_TQUOTA;
+ mSyncState = SYNC_STATE_GET_QUOTA;
serverSyncInternal();
}
} else {
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index a25637b3a..613b3752d 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -474,8 +474,8 @@ private:
/**
* Sync the next subfolder in the list of subfolders (mSubfoldersForSync).
- * When finished, this will switch either to the state SYNC_STATE_GET_SUBFOLDER_TQUOTA or
- * to SYNC_STATE_GET_TQUOTA.
+ * When finished, this will switch either to the state SYNC_STATE_GET_SUBFOLDER_QUOTA or
+ * to SYNC_STATE_GET_QUOTA.
*/
void syncNextSubFolder( bool secondSync );
@@ -505,13 +505,13 @@ private:
SYNC_STATE_SET_ANNOTATIONS,
SYNC_STATE_GET_ACLS,
SYNC_STATE_SET_ACLS,
- SYNC_STATE_GET_TQUOTA,
+ SYNC_STATE_GET_QUOTA,
SYNC_STATE_FIND_SUBFOLDERS,
SYNC_STATE_SYNC_SUBFOLDERS,
SYNC_STATE_CHECK_UIDVALIDITY,
SYNC_STATE_RENAME_FOLDER,
SYNC_STATE_CLOSE,
- SYNC_STATE_GET_SUBFOLDER_TQUOTA
+ SYNC_STATE_GET_SUBFOLDER_QUOTA
} mSyncState;
int mProgress;
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index e53a4f18e..0188a1ebf 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -29,8 +29,8 @@
* your version.
*/
-#ifndef TQUOTAJOBS_H
-#define TQUOTAJOBS_H
+#ifndef QUOTAJOBS_H
+#define QUOTAJOBS_H
#include <tqvariant.h>
@@ -192,5 +192,5 @@ private:
} // KMail namespace
-#endif /* TQUOTAJOBS_H */
+#endif /* QUOTAJOBS_H */
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 2feebf4e1..310460230 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -299,7 +299,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
// pipe message body throw command and insert it as quotation
- kdDebug() << "Command: TQUOTEPIPE=" << endl;
+ kdDebug() << "Command: QUOTEPIPE=" << endl;
TQString q;
int len = parseQuotes( "QUOTEPIPE=", cmd, q );
i += len;
@@ -312,7 +312,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
}
} else if ( cmd.startsWith( "QUOTE" ) ) {
- kdDebug() << "Command: TQUOTE" << endl;
+ kdDebug() << "Command: QUOTE" << endl;
i += strlen( "QUOTE" );
if ( mOrigMsg ) {
TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, messageText( true ),
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index 679cbd00f..bf0118515 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -32,7 +32,7 @@ class KProcess;
/**
* The TemplateParser transforms a message with a given template.
*
- * A template contains text and commands, such as %TQUOTE or %ODATE, which will be
+ * A template contains text and commands, such as %QUOTE or %ODATE, which will be
* replaced with the real values in process().
*
* The message given in the constructor is the message that is being transformed.
@@ -72,7 +72,7 @@ class TemplateParser : public TQObject
/**
* Sets the selection. If this is set, only the selection will be added to commands such
- * as %TQUOTE. Otherwise, the whole message is quoted.
+ * as %QUOTE. Otherwise, the whole message is quoted.
* If this is not called at all, the whole message is quoted as well.
* Call this before calling process().
*/
@@ -80,7 +80,7 @@ class TemplateParser : public TQObject
/**
* Sets whether the template parser is allowed to decrypt the original message when needing
- * its message text, for example for the %TQUOTE command.
+ * its message text, for example for the %QUOTE command.
* If true, it will tell the ObjectTreeParser it uses internally to decrypt the message,
* and that will possibly show a password request dialog to the user.
*
@@ -155,7 +155,7 @@ class TemplateParser : public TQObject
/**
* Determines whether the signature should be stripped when getting the text of the original
- * message, e.g. for commands such as %TQUOTE
+ * message, e.g. for commands such as %QUOTE
*/
bool shouldStripSignature() const;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 18:10:24 +0000