diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 15:08:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 15:08:46 -0600 |
| commit | d497b1b0373d758ede3d877ab68c8d7c8ab29062 (patch) | |
| tree | 00ebfc47087a5fd82949fc1abf08dd7e03c1c631 | |
| parent | 639f34ef2efdec6ff0d1f47d919ca070d027fb80 (diff) | |
| download | tdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.tar.gz tdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.zip | |
Fix inadvertent TQt changes
This closes Bug 752
152 files changed, 489 insertions, 489 deletions
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index a4c1b26b4..ab0e430e2 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons if (!Settings::resetQuickFilterOnNodeChange()) { - m_searchBar->slotSeStatus(Settings::statusFilter()); + m_searchBar->slotSetStatus(Settings::statusFilter()); m_searchBar->slotSetText(Settings::textFilter()); } @@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon) void View::connectFrame(Frame *f) { - connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&))); + connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&))); connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &))); connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) ); connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted())); @@ -465,7 +465,7 @@ void View::connectFrame(Frame *f) connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&))); } -void View::sloStatusText(const TQString &c) +void View::slotStatusText(const TQString &c) { if (sender() == m_currentFrame) emit setStatusBarText(c); @@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config) m_searchBar->slotSetText(config->readEntry("searchLine")); int statusfilter = config->readNumEntry("searchCombo", -1); if (statusfilter != -1) - m_searchBar->slotSeStatus(statusfilter); + m_searchBar->slotSetStatus(statusfilter); } int selectedID = config->readNumEntry("selectedNodeID", -1); diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 6dd52f215..8237759d3 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -196,7 +196,7 @@ namespace Akregator { void slotMouseOverInfo(const KFileItem *kifi); /** sets the status bar text to a given string */ - void sloStatusText(const TQString &); + void slotStatusText(const TQString &); void slotStarted(); void slotCanceled(const TQString &); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 20ebc5afc..a8bf8a365 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, 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 @@ -442,41 +442,41 @@ void DeleteAction::exec(Article& article) article.setDeleted(); } -SeStatusAction::SeStatusAction(int status) : m_status(status) +SetStatusAction::SetStatusAction(int status) : m_status(status) { } -void SeStatusAction::exec(Article& article) +void SetStatusAction::exec(Article& article) { if (!article.isNull()) article.setStatus(m_status); } -int SeStatusAction::status() const +int SetStatusAction::status() const { return m_status; } -void SeStatusAction::setStatus(int status) +void SetStatusAction::setStatus(int status) { m_status = status; } -void SeStatusAction::writeConfig(KConfig* config) const +void SetStatusAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction")); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction")); config->writeEntry(TQString::fromLatin1("actionParams"), m_status); } -void SeStatusAction::readConfig(KConfig* config) +void SetStatusAction::readConfig(KConfig* config) { m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read); } -bool SeStatusAction::operator==(const AbstractAction& other) +bool SetStatusAction::operator==(const AbstractAction& other) { AbstractAction* ptr = const_cast<AbstractAction*>(&other); - SeStatusAction* o = dynamic_cast<SeStatusAction*>(ptr); + SetStatusAction* o = dynamic_cast<SetStatusAction*>(ptr); if (!o) return false; else @@ -681,8 +681,8 @@ void ArticleFilter::readConfig(KConfig* config) d->action = new AssignTagAction(); else if (actionType == TQString::fromLatin1("DeleteAction")) d->action = new DeleteAction(); - else if (actionType == TQString::fromLatin1("SeStatusAction")) - d->action = new SeStatusAction(); + else if (actionType == TQString::fromLatin1("SetStatusAction")) + d->action = new SetStatusAction(); if (d->action) d->action->readConfig(config); diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index 4979c76ec..d0bd00e71 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -18,7 +18,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, 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 @@ -166,10 +166,10 @@ class DeleteAction : public AbstractAction virtual bool operator==(const AbstractAction& other); }; -class SeStatusAction : public AbstractAction +class SetStatusAction : public AbstractAction { public: - SeStatusAction(int status=0); + SetStatusAction(int status=0); virtual void exec(Article& article); @@ -179,7 +179,7 @@ class SeStatusAction : public AbstractAction virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); - virtual SeStatusAction* clone() const { return new SeStatusAction(*this); } + virtual SetStatusAction* clone() const { return new SetStatusAction(*this); } virtual bool operator==(const AbstractAction& other); private: diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index 149ad6c1f..3b507b8bd 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -23,8 +23,8 @@ without including the source code for TQt in the source distribution. */ -#ifndef AKREGATOR_FETCHTQUEUE_H -#define AKREGATOR_FETCHTQUEUE_H +#ifndef AKREGATOR_FETCHQUEUE_H +#define AKREGATOR_FETCHQUEUE_H #include <tqobject.h> diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 77260872f..01b479baf 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -277,7 +277,7 @@ void MainWindow::slotClearStatusText() m_statusLabel->setText(TQString()); } -void MainWindow::slotSeStatusBarText( const TQString & text ) +void MainWindow::slotSetStatusBarText( const TQString & text ) { m_statusLabel->setText(text); } diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index e21e330f6..e5f90cf4b 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -95,7 +95,7 @@ public: public slots: void slotClearStatusText(); - void slotSeStatusBarText(const TQString &c); + void slotSetStatusBarText(const TQString &c); protected: /** diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index 6fc5a6bd7..e40b50b2b 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -144,7 +144,7 @@ void SearchBar::slotClearSearch() } } -void SearchBar::slotSeStatus(int status) +void SearchBar::slotSetStatus(int status) { d->searchCombo->setCurrentItem(status); slotSearchComboChanged(status); diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index a13a78ca0..ee919ae6b 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -59,7 +59,7 @@ class SearchBar : public TQHBox public slots: void slotClearSearch(); - void slotSeStatus(int status); + void slotSetStatus(int status); void slotSetText(const TQString& text); private slots: diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 63453a4e5..a17aca9e0 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); @@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr if ( args.size() < 2 ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising ERROR with < 2 args!" << endl; return; } const int source = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for first ERROR arg, got something else" << endl; return; } ok = false; const int code = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for second ERROR arg, got something else" << endl; return; } mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); @@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr if ( args.size() < 4 ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl; return; } const TQString what = *++it; ++it; // don't use "type"... const int cur = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"cur\", got something else" << endl; return; } ok = false; const int total = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"total\", got something else" << endl; return; } emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index be4c9f796..555a0bfe3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -63,7 +63,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index b753899a0..f409df735 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); @@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T if ( args.size() < 2 ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising ERROR with < 2 args!" << endl; return; } const int source = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for first ERROR arg, got something else" << endl; return; } ok = false; const int code = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for second ERROR arg, got something else" << endl; return; } mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); @@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T if ( args.size() < 4 ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl; return; } const TQString what = *++it; ++it; // don't use "type"... const int cur = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"cur\", got something else" << endl; return; } ok = false; const int total = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"total\", got something else" << endl; return; } emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index 0c775a015..73fae9982 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -68,7 +68,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index 8f1a65229..055a874b2 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -54,7 +54,7 @@ public: private slots: void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); - void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotProcessExited( KProcess * ); private: diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index ec88fd813..c65afffc4 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { @@ -102,7 +102,7 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) { for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it ) append( "<b>stderr: " + escape( *it ) + "</b>" ); } -void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { +void GnuPGViewer::slotStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" ); } void GnuPGViewer::slotProcessExited( KProcess * proc ) { diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.hpp index d8a357779..cfaff2302 100644 --- a/indexlib/boost-compat/config/requires_threads.hpp +++ b/indexlib/boost-compat/config/requires_threads.hpp @@ -4,8 +4,8 @@ // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_CONFIG_RETQUIRES_THREADS_HPP -#define BOOST_CONFIG_RETQUIRES_THREADS_HPP +#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP +#define BOOST_CONFIG_REQUIRES_THREADS_HPP #ifndef BOOST_CONFIG_HPP # include <boost/config.hpp> @@ -89,4 +89,4 @@ #endif // BOOST_HAS_THREADS -#endif // BOOST_CONFIG_RETQUIRES_THREADS_HPP +#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP diff --git a/indexlib/quotes.h b/indexlib/quotes.h index b540db639..7852d0ddf 100644 --- a/indexlib/quotes.h +++ b/indexlib/quotes.h @@ -1,5 +1,5 @@ -#ifndef LPC_TQUOTES_H1108078052_INCLUDE_GUARD_ -#define LPC_TQUOTES_H1108078052_INCLUDE_GUARD_ +#ifndef LPC_QUOTES_H1108078052_INCLUDE_GUARD_ +#define LPC_QUOTES_H1108078052_INCLUDE_GUARD_ /* This file is part of indexlib. * Copyright (C) 2005 LuÃs Pedro Coelho <luis@luispedro.org> @@ -58,4 +58,4 @@ struct quotes : public indexlib::index { -#endif /* LPC_TQUOTES_H1108078052_INCLUDE_GUARD_ */ +#endif /* LPC_QUOTES_H1108078052_INCLUDE_GUARD_ */ diff --git a/indexlib/tests/ifile-test.cpp b/indexlib/tests/ifile-test.cpp index 955098663..9b9f92832 100644 --- a/indexlib/tests/ifile-test.cpp +++ b/indexlib/tests/ifile-test.cpp @@ -37,17 +37,17 @@ void simple() { cleanup(); ifile ifi( fname ); ifi.add( "this", "doc" ); - BOOST_CHECK_ETQUAL( ifi.search( "this" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "this" )->list()[ 0 ], 0 ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" ); + BOOST_CHECK_EQUAL( ifi.search( "this" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "this" )->list()[ 0 ], 0 ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" ); ifi.add( "that", "doc2" ); - BOOST_CHECK_ETQUAL( ifi.search( "this" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "this" )->list()[ 0 ], 0 ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" ); + BOOST_CHECK_EQUAL( ifi.search( "this" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "this" )->list()[ 0 ], 0 ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( ifi.search( "this" )->list()[ 0 ] ), "doc" ); - BOOST_CHECK_ETQUAL( ifi.search( "that" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "that" )->list()[ 0 ], 1 ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( ifi.search( "that" )->list()[ 0 ] ), "doc2" ); + BOOST_CHECK_EQUAL( ifi.search( "that" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "that" )->list()[ 0 ], 1 ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( ifi.search( "that" )->list()[ 0 ] ), "doc2" ); } void ndocs() { @@ -55,16 +55,16 @@ void ndocs() { ifile ifi( fname ); ifi.add( "one", "one" ); ifi.add( "one", "two" ); - BOOST_CHECK_ETQUAL( ifi.ndocs(), 2 ); + BOOST_CHECK_EQUAL( ifi.ndocs(), 2 ); ifi.add( "one", "three" ); ifi.add( "one", "four" ); - BOOST_CHECK_ETQUAL( ifi.ndocs(), 4 ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( 0 ), std::string( "one" ) ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( 1 ), std::string( "two" ) ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( 2 ), std::string( "three" ) ); - BOOST_CHECK_ETQUAL( ifi.lookup_docname( 3 ), std::string( "four" ) ); + BOOST_CHECK_EQUAL( ifi.ndocs(), 4 ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( 0 ), std::string( "one" ) ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( 1 ), std::string( "two" ) ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( 2 ), std::string( "three" ) ); + BOOST_CHECK_EQUAL( ifi.lookup_docname( 3 ), std::string( "four" ) ); } void space() { @@ -72,7 +72,7 @@ void space() { ifile ifi( fname ); ifi.add( "one two three", "doc" ); - BOOST_CHECK_ETQUAL( ifi.search( "two" )->list().size(), 1 ); + BOOST_CHECK_EQUAL( ifi.search( "two" )->list().size(), 1 ); } void numbers() { @@ -80,10 +80,10 @@ void numbers() { ifile ifi( fname ); ifi.add( "one 123 123456789 four444 five", "doc" ); - BOOST_CHECK_ETQUAL( ifi.search( "123" )->list().size(), 1 ); - BOOST_CHECK_ETQUAL( ifi.search( "123456789" )->list().size(), 1 ); - BOOST_CHECK_ETQUAL( ifi.search( "four444" )->list().size(), 1 ); - BOOST_CHECK_ETQUAL( ifi.search( "five" )->list().size(), 1 ); + BOOST_CHECK_EQUAL( ifi.search( "123" )->list().size(), 1 ); + BOOST_CHECK_EQUAL( ifi.search( "123456789" )->list().size(), 1 ); + BOOST_CHECK_EQUAL( ifi.search( "four444" )->list().size(), 1 ); + BOOST_CHECK_EQUAL( ifi.search( "five" )->list().size(), 1 ); } void partial() { @@ -91,17 +91,17 @@ void partial() { ifile ifi( fname ); ifi.add( "longword", "doc_0" ); - BOOST_CHECK_ETQUAL( ifi.search( "l" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "long" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "longword" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "l" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "long" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "longword" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "longword" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "longword" )->list().size(), 1u ); ifi.add( "longnord", "doc_1" ); - BOOST_CHECK_ETQUAL( ifi.search( "l" )->list().size(), 2u ); - BOOST_CHECK_ETQUAL( ifi.search( "long" )->list().size(), 2u ); - BOOST_CHECK_ETQUAL( ifi.search( "longw" )->list().size(), 1u ); - BOOST_CHECK_ETQUAL( ifi.search( "longn" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "l" )->list().size(), 2u ); + BOOST_CHECK_EQUAL( ifi.search( "long" )->list().size(), 2u ); + BOOST_CHECK_EQUAL( ifi.search( "longw" )->list().size(), 1u ); + BOOST_CHECK_EQUAL( ifi.search( "longn" )->list().size(), 1u ); } void several() { @@ -115,15 +115,15 @@ void several() { ifi.add( "else something", "5" ); ifi.add( "else four", "6" ); - BOOST_CHECK_ETQUAL( count_results( ifi, "one" ), 1u ); - BOOST_CHECK_ETQUAL( count_results( ifi, "one two three four" ), 1u ); - BOOST_CHECK_ETQUAL( count_results( ifi, "two three four" ), 2u ); + BOOST_CHECK_EQUAL( count_results( ifi, "one" ), 1u ); + BOOST_CHECK_EQUAL( count_results( ifi, "one two three four" ), 1u ); + BOOST_CHECK_EQUAL( count_results( ifi, "two three four" ), 2u ); - BOOST_CHECK_ETQUAL( count_results( ifi, "one two" ), 1u ); - BOOST_CHECK_ETQUAL( count_results( ifi, "one" ), 1u ); + BOOST_CHECK_EQUAL( count_results( ifi, "one two" ), 1u ); + BOOST_CHECK_EQUAL( count_results( ifi, "one" ), 1u ); - BOOST_CHECK_ETQUAL( count_results( ifi, "something else" ), 2u ); - BOOST_CHECK_ETQUAL( count_results( ifi, "something two" ), 2u ); + BOOST_CHECK_EQUAL( count_results( ifi, "something else" ), 2u ); + BOOST_CHECK_EQUAL( count_results( ifi, "something two" ), 2u ); } void remove_doc() { @@ -137,7 +137,7 @@ void remove_doc() { BOOST_CHECK( check_results( ifi, "one", "0", NULL ) ); BOOST_CHECK( check_results( ifi, "two", "0", NULL ) ); BOOST_CHECK( check_results( ifi, "three", "0", "2", NULL ) ); - BOOST_CHECK_ETQUAL( count_results( ifi, "four" ), 0u ); + BOOST_CHECK_EQUAL( count_results( ifi, "four" ), 0u ); } test_suite* get_suite() { diff --git a/indexlib/tests/leafdatavector-test.cpp b/indexlib/tests/leafdatavector-test.cpp index 565717f83..8763327e6 100644 --- a/indexlib/tests/leafdatavector-test.cpp +++ b/indexlib/tests/leafdatavector-test.cpp @@ -14,10 +14,10 @@ void simple() { cleanup(); leafdatavector f( fname ); f.add( 0, 1 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 1u ); - BOOST_CHECK_ETQUAL( f.get( 0 )[ 0 ], 1u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 1u ); + BOOST_CHECK_EQUAL( f.get( 0 )[ 0 ], 1u ); f.add( 0, 2 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 2u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 2u ); } void persistent() { @@ -28,7 +28,7 @@ void persistent() { } { leafdatavector f( fname ); - BOOST_CHECK_ETQUAL( f.get( 0 )[ 0 ], 1u ); + BOOST_CHECK_EQUAL( f.get( 0 )[ 0 ], 1u ); } } @@ -48,15 +48,15 @@ void complicated() { f.add( 0, 5 ); f.add( 0, 9 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 6u ); - BOOST_CHECK_ETQUAL( f.get( 1 ).size(), 3u ); - BOOST_CHECK_ETQUAL( f.get( 2 ).size(), 2u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 6u ); + BOOST_CHECK_EQUAL( f.get( 1 ).size(), 3u ); + BOOST_CHECK_EQUAL( f.get( 2 ).size(), 2u ); std::vector<unsigned> one = f.get( 1 ); std::sort( one.begin(), one.end() ); - BOOST_CHECK_ETQUAL( one.size(), 3u ); - BOOST_CHECK_ETQUAL( one[ 0 ], 3u ); - BOOST_CHECK_ETQUAL( one[ 1 ], 5u ); - BOOST_CHECK_ETQUAL( one[ 2 ], 8u ); + BOOST_CHECK_EQUAL( one.size(), 3u ); + BOOST_CHECK_EQUAL( one[ 0 ], 3u ); + BOOST_CHECK_EQUAL( one[ 1 ], 5u ); + BOOST_CHECK_EQUAL( one[ 2 ], 8u ); } void unique() { @@ -67,15 +67,15 @@ void unique() { f.add( 0, 1 ); f.add( 0, 1 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 1u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 1u ); f.add( 0, 4 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 2u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 2u ); f.add( 0, 1 ); f.add( 0, 4 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 2u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 2u ); } @@ -93,7 +93,7 @@ void large() { } for ( std::map<uint,uint>::const_iterator first = counts.begin(), past = counts.end(); first != past; ++first ) { - BOOST_CHECK_ETQUAL( first->second, f.get( first->first ).size() ); + BOOST_CHECK_EQUAL( first->second, f.get( first->first ).size() ); } } @@ -106,10 +106,10 @@ void one_zero() { f.add( 0, 1 ); f.add( 0, 3 ); - BOOST_CHECK_ETQUAL( f.get( 0 ).size(), 3u ); - BOOST_CHECK_ETQUAL( f.get( 0 )[ 0 ], 0u ); - BOOST_CHECK_ETQUAL( f.get( 0 )[ 1 ], 1u ); - BOOST_CHECK_ETQUAL( f.get( 0 )[ 2 ], 3u ); + BOOST_CHECK_EQUAL( f.get( 0 ).size(), 3u ); + BOOST_CHECK_EQUAL( f.get( 0 )[ 0 ], 0u ); + BOOST_CHECK_EQUAL( f.get( 0 )[ 1 ], 1u ); + BOOST_CHECK_EQUAL( f.get( 0 )[ 2 ], 3u ); } diff --git a/indexlib/tests/match-test.cpp b/indexlib/tests/match-test.cpp index a1a3930fa..16b8a8e95 100644 --- a/indexlib/tests/match-test.cpp +++ b/indexlib/tests/match-test.cpp @@ -11,15 +11,15 @@ void cleanup() { void simple() { cleanup(); Match m( "pat" ); - BOOST_CHECK_ETQUAL( m.process( "not here" ), false ); - BOOST_CHECK_ETQUAL( m.process( "p a t" ), false ); - BOOST_CHECK_ETQUAL( m.process( "pa t" ), false ); + BOOST_CHECK_EQUAL( m.process( "not here" ), false ); + BOOST_CHECK_EQUAL( m.process( "p a t" ), false ); + BOOST_CHECK_EQUAL( m.process( "pa t" ), false ); - BOOST_CHECK_ETQUAL( m.process( "pat" ), true ); - BOOST_CHECK_ETQUAL( m.process( "pattern" ), true ); - BOOST_CHECK_ETQUAL( m.process( " pat " ), true ); - BOOST_CHECK_ETQUAL( m.process( "zpat patx ipato " ), true ); + BOOST_CHECK_EQUAL( m.process( "pat" ), true ); + BOOST_CHECK_EQUAL( m.process( "pattern" ), true ); + BOOST_CHECK_EQUAL( m.process( " pat " ), true ); + BOOST_CHECK_EQUAL( m.process( "zpat patx ipato " ), true ); } void empty() { @@ -40,28 +40,28 @@ void string() { cleanup(); Match m( std::string( "pat" ) ); - BOOST_CHECK_ETQUAL( m.process( std::string( "not here" ) ), false ); - BOOST_CHECK_ETQUAL( m.process( std::string( "here pattern" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "not here" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "here pattern" ) ), true ); } void casesensitive() { cleanup(); Match m( std::string( "pat" ), ~Match::caseinsensitive ); - BOOST_CHECK_ETQUAL( m.process( std::string( "PAT" ) ), false ); - BOOST_CHECK_ETQUAL( m.process( std::string( "aPATa" ) ), false ); - BOOST_CHECK_ETQUAL( m.process( std::string( "pAt" ) ), false ); - BOOST_CHECK_ETQUAL( m.process( std::string( "pattern" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "PAT" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "aPATa" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "pAt" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "pattern" ) ), true ); } void caseinsensitive() { cleanup(); Match m( std::string( "pat" ), Match::caseinsensitive ); - BOOST_CHECK_ETQUAL( m.process( std::string( "PAT" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "aPATa" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "pAt" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "pattern" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "PAT" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "aPATa" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "pAt" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "pattern" ) ), true ); } @@ -69,16 +69,16 @@ void verylarge() { cleanup(); Match m( std::string( "pat0123456789012345678901234567890" ) ); - BOOST_CHECK_ETQUAL( m.process( std::string( "pat0123456789012345678901234567890" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890xxxxxxxx" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat01234x6789012345678901234567890xxxxxxxx" ) ), false ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "pat0123456789012345678901234567890" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat0123456789012345678901234567890xxxxxxxx" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat01234x6789012345678901234567890xxxxxxxx" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false ); m = Match( std::string( "12345678901234567890123456789012" ) ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012xxxxxxxxx" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012" ) ), true ); - BOOST_CHECK_ETQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012xxxxxxxxx" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat012345678901234567890123456789012" ) ), true ); + BOOST_CHECK_EQUAL( m.process( std::string( "xxxxxxpat01234x678901234567890123456789xxxxxxxxx" ) ), false ); } diff --git a/indexlib/tests/mempool-test.cpp b/indexlib/tests/mempool-test.cpp index d0c4ba299..a0895243c 100644 --- a/indexlib/tests/mempool-test.cpp +++ b/indexlib/tests/mempool-test.cpp @@ -28,7 +28,7 @@ void deallocate() { pointers.push_back( pool.allocate( 16 ) ); leafdata::init( pointers.back() ); } - BOOST_CHECK_ETQUAL( size, pool.size() ); + BOOST_CHECK_EQUAL( size, pool.size() ); } void large() { diff --git a/indexlib/tests/memvector-test.cpp b/indexlib/tests/memvector-test.cpp index 648d8e469..60023a4d1 100644 --- a/indexlib/tests/memvector-test.cpp +++ b/indexlib/tests/memvector-test.cpp @@ -19,7 +19,7 @@ void test_size() { test.push_back( 2 ); test.push_back( 3 ); test.push_back( 4 ); - BOOST_CHECK_ETQUAL( test.size(), 4u ); + BOOST_CHECK_EQUAL( test.size(), 4u ); } template <typename T> @@ -30,7 +30,7 @@ void test_put_recover() { test.push_back( T( i*13 + i*i*45 + 23 ) ); } for ( int i = 0; i != 20; ++i ) { - BOOST_CHECK_ETQUAL( test[ i ], T( i*13 + i*i*45 + 23 ) ); + BOOST_CHECK_EQUAL( test[ i ], T( i*13 + i*i*45 + 23 ) ); } } @@ -39,7 +39,7 @@ void resize() { memvector<uint32_t> test( fname ); test.push_back( 1 ); test.resize( 50 ); - BOOST_CHECK_ETQUAL( test.size(), 50u ); + BOOST_CHECK_EQUAL( test.size(), 50u ); } @@ -55,9 +55,9 @@ void test_persistent() { } { memvector<uint32_t> test( fname ); - BOOST_CHECK_ETQUAL( test.size(), 5u ); + BOOST_CHECK_EQUAL( test.size(), 5u ); for ( unsigned i = 0; i != test.size(); ++i ) - BOOST_CHECK_ETQUAL( test[ i ], i + 1 ); + BOOST_CHECK_EQUAL( test[ i ], i + 1 ); } } @@ -71,12 +71,12 @@ void test_insert() { test.insert( test.begin() + 2, 13 ); - BOOST_CHECK_ETQUAL( test.size(), 5u ); - BOOST_CHECK_ETQUAL( test[ 0 ], 12u ); - BOOST_CHECK_ETQUAL( test[ 1 ], 12u ); - BOOST_CHECK_ETQUAL( test[ 2 ], 13u ); - BOOST_CHECK_ETQUAL( test[ 3 ], 12u ); - BOOST_CHECK_ETQUAL( test[ 4 ], 12u ); + BOOST_CHECK_EQUAL( test.size(), 5u ); + BOOST_CHECK_EQUAL( test[ 0 ], 12u ); + BOOST_CHECK_EQUAL( test[ 1 ], 12u ); + BOOST_CHECK_EQUAL( test[ 2 ], 13u ); + BOOST_CHECK_EQUAL( test[ 3 ], 12u ); + BOOST_CHECK_EQUAL( test[ 4 ], 12u ); } void test_iterator() { @@ -85,38 +85,38 @@ void test_iterator() { test.push_back( 1 ); test.push_back( 2 ); - BOOST_CHECK_ETQUAL( test[ 0 ], 1u ); - BOOST_CHECK_ETQUAL( test[ 1 ], 2u ); + BOOST_CHECK_EQUAL( test[ 0 ], 1u ); + BOOST_CHECK_EQUAL( test[ 1 ], 2u ); - BOOST_CHECK_ETQUAL( *test.begin(), 1u ); - BOOST_CHECK_ETQUAL( *( test.begin() + 1 ), 2u ); + BOOST_CHECK_EQUAL( *test.begin(), 1u ); + BOOST_CHECK_EQUAL( *( test.begin() + 1 ), 2u ); memvector<unsigned>::iterator iter = test.begin(); - BOOST_CHECK_ETQUAL( *iter, 1u ); + BOOST_CHECK_EQUAL( *iter, 1u ); BOOST_CHECK( test.begin() == iter ); *iter= 3; - BOOST_CHECK_ETQUAL( test[ 0 ], 3u ); - BOOST_CHECK_ETQUAL( *iter, 3u ); - BOOST_CHECK_ETQUAL( *test.begin(), 3u ); + BOOST_CHECK_EQUAL( test[ 0 ], 3u ); + BOOST_CHECK_EQUAL( *iter, 3u ); + BOOST_CHECK_EQUAL( *test.begin(), 3u ); ++iter; - BOOST_CHECK_ETQUAL( *iter, 2u ); + BOOST_CHECK_EQUAL( *iter, 2u ); *iter = 5; - BOOST_CHECK_ETQUAL( *iter, 5u ); - BOOST_CHECK_ETQUAL( test[ 1 ], 5u ); + BOOST_CHECK_EQUAL( *iter, 5u ); + BOOST_CHECK_EQUAL( test[ 1 ], 5u ); - BOOST_CHECK_ETQUAL( std::distance( test.begin(), test.end() ) , test.size() ); + BOOST_CHECK_EQUAL( std::distance( test.begin(), test.end() ) , test.size() ); test.push_back( 5 ); - BOOST_CHECK_ETQUAL( std::distance( test.begin(), test.end() ) , test.size() ); + BOOST_CHECK_EQUAL( std::distance( test.begin(), test.end() ) , test.size() ); test.push_back( 5 ); - BOOST_CHECK_ETQUAL( std::distance( test.begin(), test.end() ) , test.size() ); + BOOST_CHECK_EQUAL( std::distance( test.begin(), test.end() ) , test.size() ); } void test_iteration() { @@ -133,15 +133,15 @@ void test_iteration() { BOOST_CHECK( iter == test.begin() ); BOOST_CHECK( iter != test.end() ); - BOOST_CHECK_ETQUAL( *iter, 1u ); + BOOST_CHECK_EQUAL( *iter, 1u ); ++iter; - BOOST_CHECK_ETQUAL( *iter, 2u ); + BOOST_CHECK_EQUAL( *iter, 2u ); iter += 2; - BOOST_CHECK_ETQUAL( *iter, 3u ); + BOOST_CHECK_EQUAL( *iter, 3u ); *iter = 7; - BOOST_CHECK_ETQUAL( *iter, 7u ); + BOOST_CHECK_EQUAL( *iter, 7u ); --iter; - BOOST_CHECK_ETQUAL( *iter, 5u ); + BOOST_CHECK_EQUAL( *iter, 5u ); BOOST_CHECK( iter != test.end() ); iter += 2; BOOST_CHECK( iter == test.end() ); @@ -160,20 +160,20 @@ void test_sort() { test.push_back( 3 ); - BOOST_CHECK_ETQUAL( *std::min_element( test.begin(), test.end() ), 0 ); + BOOST_CHECK_EQUAL( *std::min_element( test.begin(), test.end() ), 0 ); BOOST_CHECK( std::min_element( test.begin(), test.end() ) == test.begin() + 1 ); - BOOST_CHECK_ETQUAL( *std::max_element( test.begin(), test.end() ), 14 ); + BOOST_CHECK_EQUAL( *std::max_element( test.begin(), test.end() ), 14 ); BOOST_CHECK( std::max_element( test.begin(), test.end() ) == test.begin() + 2 ); std::sort( test.begin(), test.end() ); - BOOST_CHECK_ETQUAL( test[ 0 ], 0 ); - BOOST_CHECK_ETQUAL( test[ 1 ], 3 ); - BOOST_CHECK_ETQUAL( test[ 2 ], 4 ); - BOOST_CHECK_ETQUAL( test[ 3 ], 5 ); - BOOST_CHECK_ETQUAL( test[ 4 ], 8 ); - BOOST_CHECK_ETQUAL( test[ 5 ], 10 ); - BOOST_CHECK_ETQUAL( test[ 6 ], 12 ); - BOOST_CHECK_ETQUAL( test[ 7 ], 14 ); + BOOST_CHECK_EQUAL( test[ 0 ], 0 ); + BOOST_CHECK_EQUAL( test[ 1 ], 3 ); + BOOST_CHECK_EQUAL( test[ 2 ], 4 ); + BOOST_CHECK_EQUAL( test[ 3 ], 5 ); + BOOST_CHECK_EQUAL( test[ 4 ], 8 ); + BOOST_CHECK_EQUAL( test[ 5 ], 10 ); + BOOST_CHECK_EQUAL( test[ 6 ], 12 ); + BOOST_CHECK_EQUAL( test[ 7 ], 14 ); } void remove() { @@ -181,11 +181,11 @@ void remove() { cleanup(); memvector<unsigned> test( fname ); test.push_back( 1 ); - BOOST_CHECK_ETQUAL( test.size(), 1 ); + BOOST_CHECK_EQUAL( test.size(), 1 ); } memvector<unsigned>::remove( fname ); memvector<unsigned> test( fname ); - BOOST_CHECK_ETQUAL( test.size(), 0 ); + BOOST_CHECK_EQUAL( test.size(), 0 ); } void assign() { @@ -193,7 +193,7 @@ void assign() { memvector<uint32_t> test( fname ); test.push_back( 2 ); test[ 0 ] = 3; - BOOST_CHECK_ETQUAL( test[ 0 ], 3u ); + BOOST_CHECK_EQUAL( test[ 0 ], 3u ); } void erase() { @@ -205,20 +205,20 @@ void erase() { test.push_back( 16 ); test.push_back( 32 ); - BOOST_CHECK_ETQUAL( test.size(), 5u ); + BOOST_CHECK_EQUAL( test.size(), 5u ); test.erase( test.begin() + 1 ); - BOOST_CHECK_ETQUAL( test[ 0 ], 2u ); - BOOST_CHECK_ETQUAL( test[ 1 ], 8u ); - BOOST_CHECK_ETQUAL( test[ 2 ], 16u ); - BOOST_CHECK_ETQUAL( test[ 3 ], 32u ); - BOOST_CHECK_ETQUAL( test.size(), 4u ); + BOOST_CHECK_EQUAL( test[ 0 ], 2u ); + BOOST_CHECK_EQUAL( test[ 1 ], 8u ); + BOOST_CHECK_EQUAL( test[ 2 ], 16u ); + BOOST_CHECK_EQUAL( test[ 3 ], 32u ); + BOOST_CHECK_EQUAL( test.size(), 4u ); test.erase( test.begin() + 3 ); - BOOST_CHECK_ETQUAL( test[ 0 ], 2u ); - BOOST_CHECK_ETQUAL( test[ 1 ], 8u ); - BOOST_CHECK_ETQUAL( test[ 2 ], 16u ); - BOOST_CHECK_ETQUAL( test.size(), 3u ); + BOOST_CHECK_EQUAL( test[ 0 ], 2u ); + BOOST_CHECK_EQUAL( test[ 1 ], 8u ); + BOOST_CHECK_EQUAL( test[ 2 ], 16u ); + BOOST_CHECK_EQUAL( test.size(), 3u ); } @@ -234,7 +234,7 @@ void clear() { test.clear(); - BOOST_CHECK_ETQUAL( test.size(), 0u ); + BOOST_CHECK_EQUAL( test.size(), 0u ); } test_suite* get_suite() { diff --git a/indexlib/tests/stringarray-test.cpp b/indexlib/tests/stringarray-test.cpp index 110b82c9a..d0f5ecefa 100644 --- a/indexlib/tests/stringarray-test.cpp +++ b/indexlib/tests/stringarray-test.cpp @@ -17,21 +17,21 @@ void test_size() { test.add( "one" ); test.add( "one" ); test.add( "one" ); - //BOOST_CHECK_ETQUAL( test.size(), 4 ); + //BOOST_CHECK_EQUAL( test.size(), 4 ); cleanup(); } void test_put_recover() { stringarray test( fname ); - BOOST_CHECK_ETQUAL( test.add( "one" ), 0 ); - BOOST_CHECK_ETQUAL( test.add( "two" ), 1 ); - BOOST_CHECK_ETQUAL( test.add( "three" ), 2 ); - BOOST_CHECK_ETQUAL( test.add( "four" ), 3 ); + BOOST_CHECK_EQUAL( test.add( "one" ), 0 ); + BOOST_CHECK_EQUAL( test.add( "two" ), 1 ); + BOOST_CHECK_EQUAL( test.add( "three" ), 2 ); + BOOST_CHECK_EQUAL( test.add( "four" ), 3 ); - BOOST_CHECK_ETQUAL( test.get( 0 ), "one" ); - BOOST_CHECK_ETQUAL( test.get( 1 ), "two" ); - BOOST_CHECK_ETQUAL( test.get( 2 ), "three" ); - BOOST_CHECK_ETQUAL( test.get( 3 ), "four" ); + BOOST_CHECK_EQUAL( test.get( 0 ), "one" ); + BOOST_CHECK_EQUAL( test.get( 1 ), "two" ); + BOOST_CHECK_EQUAL( test.get( 2 ), "three" ); + BOOST_CHECK_EQUAL( test.get( 3 ), "four" ); cleanup(); } @@ -39,19 +39,19 @@ void test_put_recover() { void test_persistent() { { stringarray test( fname ); - BOOST_CHECK_ETQUAL( test.add( "one" ), 0 ); - BOOST_CHECK_ETQUAL( test.add( "two" ), 1 ); - BOOST_CHECK_ETQUAL( test.add( "three" ), 2 ); - BOOST_CHECK_ETQUAL( test.add( "four" ), 3 ); + BOOST_CHECK_EQUAL( test.add( "one" ), 0 ); + BOOST_CHECK_EQUAL( test.add( "two" ), 1 ); + BOOST_CHECK_EQUAL( test.add( "three" ), 2 ); + BOOST_CHECK_EQUAL( test.add( "four" ), 3 ); } { stringarray test( fname ); - //BOOST_CHECK_ETQUAL( test.size(), 4 ); - BOOST_CHECK_ETQUAL( test.get( 0 ), "one" ); - BOOST_CHECK_ETQUAL( test.get( 1 ), "two" ); - BOOST_CHECK_ETQUAL( test.get( 2 ), "three" ); - BOOST_CHECK_ETQUAL( test.get( 3 ), "four" ); + //BOOST_CHECK_EQUAL( test.size(), 4 ); + BOOST_CHECK_EQUAL( test.get( 0 ), "one" ); + BOOST_CHECK_EQUAL( test.get( 1 ), "two" ); + BOOST_CHECK_EQUAL( test.get( 2 ), "three" ); + BOOST_CHECK_EQUAL( test.get( 3 ), "four" ); } cleanup(); @@ -83,9 +83,9 @@ void erase() { test.add( "four" ); test.erase( 1 ); - BOOST_CHECK_ETQUAL( test.get( 0 ), "one" ); - BOOST_CHECK_ETQUAL( test.get( 1 ), "three" ); - BOOST_CHECK_ETQUAL( test.size(), 3u ); + BOOST_CHECK_EQUAL( test.get( 0 ), "one" ); + BOOST_CHECK_EQUAL( test.get( 1 ), "three" ); + BOOST_CHECK_EQUAL( test.size(), 3u ); cleanup(); } diff --git a/indexlib/tests/stringset-test.cpp b/indexlib/tests/stringset-test.cpp index 8aed86150..56d326950 100644 --- a/indexlib/tests/stringset-test.cpp +++ b/indexlib/tests/stringset-test.cpp @@ -56,11 +56,11 @@ void iterator() { stringset::const_iterator iter = set.begin(); - BOOST_CHECK_ETQUAL( std::string( "string" ), *iter ); - BOOST_CHECK_ETQUAL( set.begin(), iter ); + BOOST_CHECK_EQUAL( std::string( "string" ), *iter ); + BOOST_CHECK_EQUAL( set.begin(), iter ); BOOST_CHECK( !( set.end() == iter ) ); ++iter; - BOOST_CHECK_ETQUAL( set.end(), iter ); + BOOST_CHECK_EQUAL( set.end(), iter ); } void order() { @@ -73,49 +73,49 @@ void order() { stringset::const_iterator iter = set.begin(); - BOOST_CHECK_ETQUAL( *iter, std::string( "one" ) ); + BOOST_CHECK_EQUAL( *iter, std::string( "one" ) ); ++iter; - BOOST_CHECK_ETQUAL( *iter, std::string( "two" ) ); + BOOST_CHECK_EQUAL( *iter, std::string( "two" ) ); ++iter; - BOOST_CHECK_ETQUAL( *iter, std::string( "wlast" ) ); + BOOST_CHECK_EQUAL( *iter, std::string( "wlast" ) ); ++iter; - BOOST_CHECK_ETQUAL( iter, set.end() ); + BOOST_CHECK_EQUAL( iter, set.end() ); } void order_of() { cleanup(); stringset set( fname ); set.add( "one" ); - BOOST_CHECK_ETQUAL( set.order_of( "one" ), 0 ); - BOOST_CHECK_ETQUAL( set.order_of( "two" ), unsigned( -1 ) ); + BOOST_CHECK_EQUAL( set.order_of( "one" ), 0 ); + BOOST_CHECK_EQUAL( set.order_of( "two" ), unsigned( -1 ) ); set.add( "two" ); - BOOST_CHECK_ETQUAL( set.order_of( "two" ), 1 ); + BOOST_CHECK_EQUAL( set.order_of( "two" ), 1 ); set.add( "before" ); - BOOST_CHECK_ETQUAL( set.order_of( "two" ), 2 ); - BOOST_CHECK_ETQUAL( set.order_of( "one" ), 1 ); - BOOST_CHECK_ETQUAL( set.order_of( "before" ), 0 ); + BOOST_CHECK_EQUAL( set.order_of( "two" ), 2 ); + BOOST_CHECK_EQUAL( set.order_of( "one" ), 1 ); + BOOST_CHECK_EQUAL( set.order_of( "before" ), 0 ); } void id_of() { cleanup(); stringset set( fname ); set.add( "one" ); - BOOST_CHECK_ETQUAL( set.id_of( "one" ), 0 ); - BOOST_CHECK_ETQUAL( set.id_of( "two" ), unsigned( -1 ) ); + BOOST_CHECK_EQUAL( set.id_of( "one" ), 0 ); + BOOST_CHECK_EQUAL( set.id_of( "two" ), unsigned( -1 ) ); set.add( "two" ); - BOOST_CHECK_ETQUAL( set.id_of( "two" ), 1 ); + BOOST_CHECK_EQUAL( set.id_of( "two" ), 1 ); set.add( "before" ); - BOOST_CHECK_ETQUAL( set.id_of( "two" ), 1 ); - BOOST_CHECK_ETQUAL( set.id_of( "one" ), 0 ); - BOOST_CHECK_ETQUAL( set.id_of( "before" ), 2 ); + BOOST_CHECK_EQUAL( set.id_of( "two" ), 1 ); + BOOST_CHECK_EQUAL( set.id_of( "one" ), 0 ); + BOOST_CHECK_EQUAL( set.id_of( "before" ), 2 ); } void add_return() { cleanup(); stringset set( fname ); - BOOST_CHECK_ETQUAL( set.add( "one" ), 0 ); - BOOST_CHECK_ETQUAL( set.add( "two" ), 1 ); - BOOST_CHECK_ETQUAL( set.add( "before" ), 2 ); + BOOST_CHECK_EQUAL( set.add( "one" ), 0 ); + BOOST_CHECK_EQUAL( set.add( "two" ), 1 ); + BOOST_CHECK_EQUAL( set.add( "before" ), 2 ); } void lower() { @@ -127,8 +127,8 @@ void lower() { set.add( "abc" ); set.add( "acc" ); - BOOST_CHECK_ETQUAL( std::string( *set.lower_bound( "ab" ) ), "aba" ); - BOOST_CHECK_ETQUAL( std::string( *set.lower_bound( "abz" ) ), "acc" ); + BOOST_CHECK_EQUAL( std::string( *set.lower_bound( "ab" ) ), "aba" ); + BOOST_CHECK_EQUAL( std::string( *set.lower_bound( "abz" ) ), "acc" ); } void lower_upper() { @@ -146,19 +146,19 @@ void lower_upper() { limits = set.upper_lower( "ab" ); - BOOST_CHECK_ETQUAL( std::distance( upper, lower ), 2u ); - BOOST_CHECK_ETQUAL( std::string( *upper ), "aba" ); + BOOST_CHECK_EQUAL( std::distance( upper, lower ), 2u ); + BOOST_CHECK_EQUAL( std::string( *upper ), "aba" ); ++upper; - BOOST_CHECK_ETQUAL( std::string( *upper ), "abc" ); + BOOST_CHECK_EQUAL( std::string( *upper ), "abc" ); ++upper; BOOST_CHECK( upper == lower ); limits = set.upper_lower( "abc" ); - BOOST_CHECK_ETQUAL( std::distance( upper, lower ), 1u ); - BOOST_CHECK_ETQUAL( std::string( *upper ), "abc" ); + BOOST_CHECK_EQUAL( std::distance( upper, lower ), 1u ); + BOOST_CHECK_EQUAL( std::string( *upper ), "abc" ); limits = set.upper_lower( "abz" ); - BOOST_CHECK_ETQUAL( std::distance( upper, lower ), 0u ); + BOOST_CHECK_EQUAL( std::distance( upper, lower ), 0u ); } void clear() { @@ -171,7 +171,7 @@ void clear() { set.add( "three" ); set.clear(); - BOOST_CHECK_ETQUAL( set.size(), 0u ); + BOOST_CHECK_EQUAL( set.size(), 0u ); } test_suite* get_suite() { diff --git a/indexlib/tests/tokenizer-test.cpp b/indexlib/tests/tokenizer-test.cpp index b5b10f399..372859d90 100644 --- a/indexlib/tests/tokenizer-test.cpp +++ b/indexlib/tests/tokenizer-test.cpp @@ -19,9 +19,9 @@ void simple() { expected.push_back( "AAACE" ); std::sort( tokens.begin(), tokens.end() ); std::sort( expected.begin(), expected.end() ); - BOOST_CHECK_ETQUAL( expected.size(), tokens.size() ); + BOOST_CHECK_EQUAL( expected.size(), tokens.size() ); for ( int i = 0; i < expected.size() && i < tokens.size(); ++i ) { - BOOST_CHECK_ETQUAL( expected[ i ], tokens[ i ] ); + BOOST_CHECK_EQUAL( expected[ i ], tokens[ i ] ); } } @@ -35,9 +35,9 @@ void with_newlines() { expected.push_back( "THREE" ); std::sort( tokens.begin(), tokens.end() ); std::sort( expected.begin(), expected.end() ); - BOOST_CHECK_ETQUAL( expected.size(), tokens.size() ); + BOOST_CHECK_EQUAL( expected.size(), tokens.size() ); for ( int i = 0; i < expected.size() && i < tokens.size(); ++i ) { - BOOST_CHECK_ETQUAL( expected.at( i ), tokens.at( i ) ); + BOOST_CHECK_EQUAL( expected.at( i ), tokens.at( i ) ); } } @@ -52,9 +52,9 @@ void with_numbers() { expected.push_back( "FOUR" ); std::sort( tokens.begin(), tokens.end() ); std::sort( expected.begin(), expected.end() ); - BOOST_CHECK_ETQUAL( expected.size(), tokens.size() ); + BOOST_CHECK_EQUAL( expected.size(), tokens.size() ); for ( int i = 0; i < expected.size() && i < tokens.size(); ++i ) { - BOOST_CHECK_ETQUAL( expected.at( i ), tokens.at( i ) ); + BOOST_CHECK_EQUAL( expected.at( i ), tokens.at( i ) ); } } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index a860b5f6f..78cdbf562 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -465,7 +465,7 @@ void CSVImportDialog::fillTable() int row, column; bool lastCharDelimiter = false; bool ignoreDups = mIgnoreDuplicates->isChecked(); - enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, + enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; TQChar x; @@ -517,7 +517,7 @@ void CSVImportDialog::fillTable() switch ( state ) { case S_START : if ( x == mTextQuote ) { - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if ( x == mDelimiter ) { if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) ) ++column; @@ -530,9 +530,9 @@ void CSVImportDialog::fillTable() state = S_MAYBE_NORMAL_FIELD; } break; - case S_TQUOTED_FIELD : + case S_QUOTED_FIELD : if ( x == mTextQuote ) { - state = S_MAYBE_END_OF_TQUOTED_FIELD; + state = S_MAYBE_END_OF_QUOTED_FIELD; } else if ( x == '\n' && mTextQuote.isNull() ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -549,10 +549,10 @@ void CSVImportDialog::fillTable() field += x; } break; - case S_MAYBE_END_OF_TQUOTED_FIELD : + case S_MAYBE_END_OF_QUOTED_FIELD : if ( x == mTextQuote ) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if ( x == mDelimiter || x == '\n' ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -566,10 +566,10 @@ void CSVImportDialog::fillTable() } state = S_START; } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; - case S_END_OF_TQUOTED_FIELD : + case S_END_OF_QUOTED_FIELD : if ( x == mDelimiter || x == '\n' ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -583,13 +583,13 @@ void CSVImportDialog::fillTable() } state = S_START; } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if ( x == mTextQuote ) { field = ""; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; break; } case S_NORMAL_FIELD : diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 25dd60f49..658919a63 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -822,7 +822,7 @@ void KAlarmApp::doQuit(TQWidget* parent) if (mDisableAlarmsIfStopped && MessageBox::warningContinueCancel(parent, KMessageBox::Cancel, i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."), - TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN + TQString(), KStdGuiItem::quit(), Preferences::QUIT_WARN ) != KMessageBox::Yes) return; quitIf(0, true); diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 383d03caf..2f32bd00d 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -539,7 +539,7 @@ void KAMail::notifyQueued(const KAEvent& event) TQString text = (Preferences::emailClient() == Preferences::KMAIL) ? i18n("An email has been queued to be sent by KMail") : i18n("An email has been queued to be sent"); - KMessageBox::information(0, text, TQString(), Preferences::EMAIL_TQUEUED_NOTIFY); + KMessageBox::information(0, text, TQString(), Preferences::EMAIL_QUEUED_NOTIFY); return; } } diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 6488c60c7..3daf433fe 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -195,9 +195,9 @@ static const TQString FROM_CONTROL_CENTRE = TQString::fromLatin1("@ControlC static const TQString FROM_KMAIL = TQString::fromLatin1("@KMail"); // Config file entry names for notification messages -const TQString Preferences::TQUIT_WARN = TQString::fromLatin1("QuitWarn"); +const TQString Preferences::QUIT_WARN = TQString::fromLatin1("QuitWarn"); const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::fromLatin1("ConfirmAlarmDeletion"); -const TQString Preferences::EMAIL_TQUEUED_NOTIFY = TQString::fromLatin1("EmailQueuedNotify"); +const TQString Preferences::EMAIL_QUEUED_NOTIFY = TQString::fromLatin1("EmailQueuedNotify"); static const int SODxor = 0x82451630; inline int Preferences::startOfDayCheck() @@ -222,9 +222,9 @@ void Preferences::initialise() read(); // Set the default button for the Quit warning message box to Cancel - MessageBox::setContinueDefault(TQUIT_WARN, KMessageBox::Cancel); - MessageBox::setDefaultShouldBeShownContinue(TQUIT_WARN, default_quitWarn); - MessageBox::setDefaultShouldBeShownContinue(EMAIL_TQUEUED_NOTIFY, default_emailQueuedNotify); + MessageBox::setContinueDefault(QUIT_WARN, KMessageBox::Cancel); + MessageBox::setDefaultShouldBeShownContinue(QUIT_WARN, default_quitWarn); + MessageBox::setDefaultShouldBeShownContinue(EMAIL_QUEUED_NOTIFY, default_emailQueuedNotify); MessageBox::setDefaultShouldBeShownContinue(CONFIRM_ALARM_DELETION, default_confirmAlarmDeletion); } } diff --git a/kalarm/preferences.h b/kalarm/preferences.h index 4b3042d25..e7e3e90a1 100644 --- a/kalarm/preferences.h +++ b/kalarm/preferences.h @@ -63,8 +63,8 @@ class Preferences : public TQObject static bool hasStartOfDayChanged() { return mStartOfDayChanged; } static bool runInSystemTray() { return mRunInSystemTray; } static bool disableAlarmsIfStopped() { return mDisableAlarmsIfStopped; } - static bool quitWarn() { return notifying(TQUIT_WARN); } - static void setQuitWarn(bool yes) { setNotify(TQUIT_WARN, yes); } + static bool quitWarn() { return notifying(QUIT_WARN); } + static void setQuitWarn(bool yes) { setNotify(QUIT_WARN, yes); } static bool autostartTrayIcon() { return mAutostartTrayIcon; } static bool confirmAlarmDeletion() { return notifying(CONFIRM_ALARM_DELETION); } static void setConfirmAlarmDeletion(bool yes){ setNotify(CONFIRM_ALARM_DELETION, yes); } @@ -77,8 +77,8 @@ class Preferences : public TQObject static int daemonTrayCheckInterval() { return mDaemonTrayCheckInterval; } static MailClient emailClient() { return mEmailClient; } static bool emailCopyToKMail() { return mEmailCopyToKMail && mEmailClient == SENDMAIL; } - static bool emailQueuedNotify() { return notifying(EMAIL_TQUEUED_NOTIFY); } - static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_TQUEUED_NOTIFY, yes); } + static bool emailQueuedNotify() { return notifying(EMAIL_QUEUED_NOTIFY); } + static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_QUEUED_NOTIFY, yes); } static MailFrom emailFrom() { return mEmailFrom; } static bool emailBccUseControlCentre() { return mEmailBccFrom == MAIL_FROM_CONTROL_CENTRE; } static TQString emailAddress(); @@ -109,9 +109,9 @@ class Preferences : public TQObject static const TQString& defaultPostAction() { return mDefaultPostAction; } // Config file entry names for notification messages - static const TQString TQUIT_WARN; + static const TQString QUIT_WARN; static const TQString CONFIRM_ALARM_DELETION; - static const TQString EMAIL_TQUEUED_NOTIFY; + static const TQString EMAIL_QUEUED_NOTIFY; // Default values for settings static const ColourList default_messageColours; diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 8e15274f2..987144954 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -1493,7 +1493,7 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) } // Returning information to the application from a special() command isn't easy. // I'm reusing the infoMessage trick seen above (for capabilities), but this - // limits me to a string instead of a stringlist. Using DTQUOTE as separator, + // limits me to a string instead of a stringlist. Using DQUOTE as separator, // because it's forbidden in userids by rfc3501 kdDebug(7116) << getResults() << endl; infoMessage(getResults().join( "\"" )); @@ -1718,7 +1718,7 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo); switch( command ) { - case 'R': // GETQUOTAROOT + case 'R': // GEQUOTAROOT { kdDebug(7116) << "QUOTAROOT " << aBox << endl; imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) ); @@ -1734,15 +1734,15 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) finished(); break; } - case 'G': // GETQUOTA + case 'G': // GEQUOTA { - kdDebug(7116) << "GETQUOTA command" << endl; + kdDebug(7116) << "GEQUOTA command" << endl; kdWarning(7116) << "UNIMPLEMENTED" << endl; break; } - case 'S': // SETQUOTA + case 'S': // SEQUOTA { - kdDebug(7116) << "SETQUOTA command" << endl; + kdDebug(7116) << "SEQUOTA command" << endl; kdWarning(7116) << "UNIMPLEMENTED" << endl; break; } diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc index 4b9faadf4..4c2ac2d19 100644 --- a/kioslaves/imap4/imapcommand.cc +++ b/kioslaves/imap4/imapcommand.cc @@ -397,7 +397,7 @@ imapCommand * imapCommand::clientGetQuotaroot( const TQString& box ) { TQString parameter = TQString("\"") + rfcDecoder::toIMAP (box) + '"'; - return new imapCommand ("GETQUOTAROOT", parameter); + return new imapCommand ("GEQUOTAROOT", parameter); } imapCommand * diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h index 9e2834424..4c9552023 100644 --- a/kioslaves/imap4/imapcommand.h +++ b/kioslaves/imap4/imapcommand.h @@ -365,9 +365,9 @@ public: static imapCommand *clientNamespace (); /** - * @brief Create a GETQUOTAROOT command + * @brief Create a GEQUOTAROOT command * @param box mailbox name - * @return a GETQUOTAROOT imapCommand + * @return a GEQUOTAROOT imapCommand */ static imapCommand *clientGetQuotaroot ( const TQString& box ); diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 674068628..6ba434a47 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -128,8 +128,8 @@ imapParser::sendCommand (imapCommand * aCmd) || command == "MYRIGHTS" || command == "GETANNOTATION" || command == "NAMESPACE" - || command == "GETQUOTAROOT" - || command == "GETQUOTA" + || command == "GEQUOTAROOT" + || command == "GEQUOTA" || command == "X-GET-OTHER-USERS" || command == "X-GET-DELEGATES" || command == "X-GET-OUT-OF-OFFICE") @@ -457,7 +457,7 @@ imapParser::parseUntagged (parseString & result) parseAnnotation (result); } break; - case 'Q': // TQUOTA or TQUOTAROOT + case 'Q': // QUOTA or QUOTAROOT if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0) { parseQuotaRoot( result ); diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 2cf9b3935..61e8a4393 100644 --- a/kioslaves/imap4/imapparser.h +++ b/kioslaves/imap4/imapparser.h @@ -290,9 +290,9 @@ public: void parseAnnotation (parseString & result); /** @brief parse a NAMESPACE line */ void parseNamespace (parseString & result); - /** @brief parse a TQUOTAROOT line */ + /** @brief parse a QUOTAROOT line */ void parseQuotaRoot (parseString & result); - /** @brief parse a TQUOTA line */ + /** @brief parse a QUOTA line */ void parseQuota (parseString & result); /** @brief parse a custom command line */ void parseCustom (parseString & result); diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 4e7e75d30..8cba6a50c 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -151,7 +151,7 @@ const TQCString& kio_sieveResponse::getExtra() const /* ---------------------------------------------------------------------------------- */ void kio_sieveResponse::setQuantity(const uint& newTQty) { - rType = TQUANTITY; + rType = QUANTITY; quantity = newTQty; } @@ -661,7 +661,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri // send the extra message off for re-processing receiveData(false, &extra); - if (r.getType() == kio_sieveResponse::TQUANTITY) { + if (r.getType() == kio_sieveResponse::QUANTITY) { // length of the error message uint len = r.getQuantity(); @@ -736,7 +736,7 @@ void kio_sieveProtocol::get(const KURL& url) if (!sendData("GETSCRIPT \"" + filename.utf8() + "\"")) return; - if (receiveData() && r.getType() == kio_sieveResponse::TQUANTITY) { + if (receiveData() && r.getType() == kio_sieveResponse::QUANTITY) { // determine script size ssize_t total_len = r.getQuantity(); totalSize( total_len ); @@ -1105,7 +1105,7 @@ bool kio_sieveProtocol::authenticate() ksDebug() << "Challenge len " << r.getQuantity() << endl; - if (r.getType() != kio_sieveResponse::TQUANTITY) { + if (r.getType() != kio_sieveResponse::QUANTITY) { sasl_dispose( &conn ); error(ERR_SLAVE_DEFINED, i18n("A protocol error occurred during authentication.\n" diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h index 4a22cbe14..d435892ec 100644 --- a/kioslaves/sieve/sieve.h +++ b/kioslaves/sieve/sieve.h @@ -30,7 +30,7 @@ class KURL; class kio_sieveResponse { public: - enum responses { NONE, KEY_VAL_PAIR, ACTION, TQUANTITY }; + enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY }; kio_sieveResponse(); 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; diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index 330199bde..dc1a299f2 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -218,7 +218,7 @@ bool KNProtocolClient::openConnection() } -// sends TQUIT-command and closes the socket +// sends QUIT-command and closes the socket void KNProtocolClient::closeConnection() { fd_set fdsW; diff --git a/knode/knprotocolclient.h b/knode/knprotocolclient.h index 4957e1334..fa4d28d5b 100644 --- a/knode/knprotocolclient.h +++ b/knode/knprotocolclient.h @@ -62,7 +62,7 @@ class KNProtocolClient : public TQThread { /** connect, handshake and authorization */ virtual bool openConnection(); bool isConnected() { return (tcpSocket!=-1); }; - /** sends TQUIT-command and closes the socket */ + /** sends QUIT-command and closes the socket */ virtual void closeConnection(); /** sends a command (one line), return code is written to rep */ diff --git a/kode/kwsdl/schema/qualifiedname.h b/kode/kwsdl/schema/qualifiedname.h index b4328911b..f879836cd 100644 --- a/kode/kwsdl/schema/qualifiedname.h +++ b/kode/kwsdl/schema/qualifiedname.h @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef SCHEMA_TQUALIFIEDNAME_H -#define SCHEMA_TQUALIFIEDNAME_H +#ifndef SCHEMA_QUALIFIEDNAME_H +#define SCHEMA_QUALIFIEDNAME_H #include <tqstring.h> #include <tqvaluelist.h> diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h index 3de543f03..875906f02 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KONTACT_UNITQUEAPPHANDLER_H -#define KONTACT_UNITQUEAPPHANDLER_H +#ifndef KONTACT_UNIQUEAPPHANDLER_H +#define KONTACT_UNIQUEAPPHANDLER_H #include <dcopobject.h> #include <plugin.h> @@ -121,4 +121,4 @@ class KDE_EXPORT UniqueAppWatcher : public TQObject } // namespace -#endif /* KONTACT_UNITQUEAPPHANDLER_H */ +#endif /* KONTACT_UNIQUEAPPHANDLER_H */ diff --git a/kontact/plugins/korganizer/korg_uniqueapp.h b/kontact/plugins/korganizer/korg_uniqueapp.h index 068fd35f2..d21f8c526 100644 --- a/kontact/plugins/korganizer/korg_uniqueapp.h +++ b/kontact/plugins/korganizer/korg_uniqueapp.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KORG_UNITQUEAPP_H -#define KORG_UNITQUEAPP_H +#ifndef KORG_UNIQUEAPP_H +#define KORG_UNIQUEAPP_H #include <uniqueapphandler.h> @@ -33,5 +33,5 @@ public: }; -#endif /* KORG_UNITQUEAPP_H */ +#endif /* KORG_UNIQUEAPP_H */ diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp index 2852eb9ce..834051c5d 100644 --- a/kresources/groupwise/soap/stdsoap2.cpp +++ b/kresources/groupwise/soap/stdsoap2.cpp @@ -399,7 +399,7 @@ static const struct soap_code_map mime_codes[] = { { SOAP_MIME_7BIT, "7bit" }, { SOAP_MIME_8BIT, "8bit" }, { SOAP_MIME_BINARY, "binary" }, - { SOAP_MIME_TQUOTED_PRINTABLE, "quoted-printable" }, + { SOAP_MIME_QUOTED_PRINTABLE, "quoted-printable" }, { SOAP_MIME_BASE64, "base64" }, { SOAP_MIME_IETF_TOKEN, "ietf-token" }, { SOAP_MIME_X_TOKEN, "x-token" }, @@ -2493,7 +2493,7 @@ soap_ssl_server_context(struct soap *soap, unsigned short flags, const char *key soap->rsa = 1; } soap->randfile = randfile; - soap->require_client_auth = (flags & SOAP_SSL_RETQUIRE_CLIENT_AUTHENTICATION); + soap->require_client_auth = (flags & SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION); if (!(err = soap->fsslauth(soap))) if (sid) SSL_CTX_set_session_id_context(soap->ctx, (unsigned char*)sid, strlen(sid)); @@ -2514,7 +2514,7 @@ soap_ssl_client_context(struct soap *soap, unsigned short flags, const char *key soap->dhfile = NULL; soap->rsa = 0; soap->randfile = randfile; - soap->require_server_auth = (flags & SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION); + soap->require_server_auth = (flags & SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION); return soap->fsslauth(soap); } #endif @@ -6460,7 +6460,7 @@ soap_attr_value(struct soap *soap, const char *name, int flag) return tp->value; } else if (flag == 1 && (soap->mode & SOAP_XML_STRICT)) - soap->error = SOAP_RETQUIRED; + soap->error = SOAP_REQUIRED; return NULL; } #endif @@ -12185,7 +12185,7 @@ soap_set_fault(struct soap *soap) *s = "Zlib/gzip not installed for (de)compression: recompile with -DWITH_GZIP"; #endif break; - case SOAP_RETQUIRED: + case SOAP_REQUIRED: *s = soap_set_validation_fault(soap, "missing required attribute", NULL); break; case SOAP_PROHIBITED: diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h index 4ff4725a7..b68c24077 100644 --- a/kresources/groupwise/soap/stdsoap2.h +++ b/kresources/groupwise/soap/stdsoap2.h @@ -849,12 +849,12 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan; #define SOAP_VERSIONMISMATCH 32 #define SOAP_PLUGIN_ERROR 33 #define SOAP_DATAENCODINGUNKNOWN 34 -#define SOAP_RETQUIRED 35 +#define SOAP_REQUIRED 35 #define SOAP_PROHIBITED 36 #define SOAP_OCCURS 37 #define SOAP_LENGTH 38 -#define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_TAG_END || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_MULTI_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_RETQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF) +#define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_TAG_END || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_MULTI_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_REQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF) #define soap_soap_error_check(e) ((e) == SOAP_CLI_FAULT || (e) == SOAP_SVR_FAULT || (e) == SOAP_VERSIONMISMATCH || (e) == SOAP_MUSTUNDERSTAND || (e) == SOAP_FAULT || (e) == SOAP_NO_METHOD) #define soap_tcp_error_check(e) ((e) == SOAP_EOF || (e) == SOAP_TCP_ERROR) #define soap_ssl_error_check(e) ((e) == SOAP_SSL_ERROR) @@ -936,10 +936,10 @@ typedef soap_int32 soap_mode; /* SSL client/server authentication settings */ #define SOAP_SSL_NO_AUTHENTICATION 0x00 /* for testing purposes */ -#define SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION 0x01 /* client requires server to authenticate */ -#define SOAP_SSL_RETQUIRE_CLIENT_AUTHENTICATION 0x02 /* server requires client to authenticate */ +#define SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION 0x01 /* client requires server to authenticate */ +#define SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION 0x02 /* server requires client to authenticate */ -#define SOAP_SSL_DEFAULT SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION +#define SOAP_SSL_DEFAULT SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION /* */ @@ -1157,7 +1157,7 @@ enum soap_mime_encoding SOAP_MIME_7BIT, SOAP_MIME_8BIT, SOAP_MIME_BINARY, - SOAP_MIME_TQUOTED_PRINTABLE, + SOAP_MIME_QUOTED_PRINTABLE, SOAP_MIME_BASE64, SOAP_MIME_IETF_TOKEN, SOAP_MIME_X_TOKEN diff --git a/libkcal/versit/port.h b/libkcal/versit/port.h index 0052b7007..afc16dd42 100644 --- a/libkcal/versit/port.h +++ b/libkcal/versit/port.h @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c index 1ff36f7d2..0dfc6bff6 100644 --- a/libkcal/versit/vcc.c +++ b/libkcal/versit/vcc.c @@ -122,7 +122,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -259,7 +259,7 @@ enum LexMode { L_VTODO, L_VALUES, L_BASE64, - L_TQUOTED_PRINTABLE + L_QUOTED_PRINTABLE }; /**** Private Forward Declarations ****/ @@ -1288,7 +1288,7 @@ yyreduce: case 15: #line 259 "vcc.y" { - if (lexWithinMode(L_BASE64) || lexWithinMode(L_TQUOTED_PRINTABLE)) + if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE)) lexPopMode(0); lexPopMode(0); ;} @@ -1750,7 +1750,7 @@ static void enterAttr(const char *s1, const char *s2) lexPushMode(L_BASE64); else if (strcasecmp(p1,VCQuotedPrintableProp) == 0 || (s2 && strcasecmp(p2,VCQuotedPrintableProp)==0)) - lexPushMode(L_TQUOTED_PRINTABLE); + lexPushMode(L_QUOTED_PRINTABLE); deleteStr(s1); deleteStr(s2); } @@ -2329,7 +2329,7 @@ static int yylex() { yylval.str = p; return STRING; } - else if (lexWithinMode(L_TQUOTED_PRINTABLE)) { + else if (lexWithinMode(L_QUOTED_PRINTABLE)) { p = lexGetQuotedPrintable(); } else { diff --git a/libkcal/versit/vcc.h b/libkcal/versit/vcc.h index 0c160910e..03886d16d 100644 --- a/libkcal/versit/vcc.h +++ b/libkcal/versit/vcc.h @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libkcal/versit/vobject.c b/libkcal/versit/vobject.c index e52cecbef..0bb37041b 100644 --- a/libkcal/versit/vobject.c +++ b/libkcal/versit/vobject.c @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -1106,7 +1106,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) unsigned long trip; unsigned char b; char quad[5]; -#define MAXTQUADS 16 +#define MAXQUADS 16 quad[4] = 0; @@ -1133,8 +1133,8 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) /* now output 'quad' with appropriate whitespace and line ending */ appendsOFile(fp, (numQuads == 0 ? " " : "")); appendsOFile(fp, quad); - appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXTQUADS-1?"\n" : ""))); - numQuads = (numQuads + 1) % MAXTQUADS; + appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : ""))); + numQuads = (numQuads + 1) % MAXQUADS; } appendcOFile(fp,'\n'); diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h index e456c8815..33897381b 100644 --- a/libkcal/versit/vobject.h +++ b/libkcal/versit/vobject.h @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libkholidays/lunarphase.cpp b/libkholidays/lunarphase.cpp index 65e19562a..f1de52a3c 100644 --- a/libkholidays/lunarphase.cpp +++ b/libkholidays/lunarphase.cpp @@ -174,7 +174,7 @@ LunarPhase::Phase LunarPhase::phase( const TQDate &date ) const * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index e561eb0d8..34f8bd5d7 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -154,13 +154,13 @@ namespace KMime { */ extern TQCString LFtoCRLF(const TQCString &s) KDE_EXPORT; - /** Removes quote (DTQUOTE) characters and decodes "quoted-pairs" + /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ KDE_EXPORT extern void removeQuots(TQCString &str); - /** Removes quote (DTQUOTE) characters and decodes "quoted-pairs" + /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes diff --git a/libkmime/tests/test_mdn.cpp b/libkmime/tests/test_mdn.cpp index dd1702bb1..fa9290f20 100644 --- a/libkmime/tests/test_mdn.cpp +++ b/libkmime/tests/test_mdn.cpp @@ -52,31 +52,31 @@ int main( int argc, char * argv[] ) { long_options, &option_index ); if ( c == -1 ) break; -#define ETQUALS(x) !qstricmp( optarg, x ) +#define EQUALS(x) !qstricmp( optarg, x ) switch ( c ) { case 'a': // --action-mode - if ( ETQUALS( "manual-action" ) ) + if ( EQUALS( "manual-action" ) ) actionMode = ManualAction; - else if ( ETQUALS( "automatic-action" ) ) + else if ( EQUALS( "automatic-action" ) ) actionMode = AutomaticAction; else usage( "unknown action mode!" ); break; case 'd': // --disposition-type - if ( ETQUALS( "displayed" ) ) + if ( EQUALS( "displayed" ) ) dispositionType = Displayed; - else if ( ETQUALS( "deleted" ) ) + else if ( EQUALS( "deleted" ) ) dispositionType = Deleted; - else if ( ETQUALS( "dispatched" ) ) + else if ( EQUALS( "dispatched" ) ) dispositionType = Dispatched; - else if ( ETQUALS( "processed" ) ) + else if ( EQUALS( "processed" ) ) dispositionType = Processed; - else if ( ETQUALS( "denied" ) ) + else if ( EQUALS( "denied" ) ) dispositionType = Denied; - else if ( ETQUALS( "failed" ) ) + else if ( EQUALS( "failed" ) ) dispositionType = Failed; else usage( "unknown disposition type!" ); @@ -97,15 +97,15 @@ int main( int argc, char * argv[] ) { break; case 'm': // --disposition-modifier - if ( ETQUALS( "error" ) ) + if ( EQUALS( "error" ) ) dispositionModifiers << Error; - else if ( ETQUALS( "warning" ) ) + else if ( EQUALS( "warning" ) ) dispositionModifiers << Warning; - else if ( ETQUALS( "superseded" ) ) + else if ( EQUALS( "superseded" ) ) dispositionModifiers << Superseded; - else if ( ETQUALS( "expired" ) ) + else if ( EQUALS( "expired" ) ) dispositionModifiers << Expired; - else if ( ETQUALS( "mailbox-terminated" ) ) + else if ( EQUALS( "mailbox-terminated" ) ) dispositionModifiers << MailboxTerminated; else usage( "unknwon disposition modifier!" ); @@ -119,9 +119,9 @@ int main( int argc, char * argv[] ) { break; case 's': // --sending-mode - if ( ETQUALS( "MDN-sent-manually" ) ) + if ( EQUALS( "MDN-sent-manually" ) ) sendingMode = SentManually; - else if ( ETQUALS( "MDN-sent-automatically" ) ) + else if ( EQUALS( "MDN-sent-automatically" ) ) sendingMode = SentAutomatically; else usage( "unknown sending mode" ); diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index bb947b3bd..046225afc 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -528,7 +528,7 @@ TQString Identity::fullEmailAddr(void) const TQString result; - // add DTQUOTE's if necessary: + // add DQUOTE's if necessary: bool needsQuotes=false; for (unsigned int i=0; i < mFullName.length(); i++) { if ( specials.contains( mFullName[i] ) ) diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp index ec868ece4..93c5732a1 100644 --- a/libksieve/parser/lexer.cpp +++ b/libksieve/parser/lexer.cpp @@ -499,8 +499,8 @@ namespace KSieve { } bool Lexer::Impl::parseNumber( TQString & result ) { - // number := 1*DIGIT [TQUANTIFIER] - // TQUANTIFIER := "K" / "M" / "G" + // number := 1*DIGIT [QUANTIFIER] + // QUANTIFIER := "K" / "M" / "G" assert( isdigit( *mState.cursor ) ); @@ -608,7 +608,7 @@ namespace KSieve { } bool Lexer::Impl::parseQuotedString( TQString & result ) { - // quoted-string := DTQUOTE *CHAR DTQUOTE + // quoted-string := DQUOTE *CHAR DQUOTE // check that caller plays by the rules: assert( *(mState.cursor-1) == '"' ); diff --git a/libtdenetwork/libgpg-error-copy/err-codes.h.in b/libtdenetwork/libgpg-error-copy/err-codes.h.in index 167de9c75..de9e9df34 100644 --- a/libtdenetwork/libgpg-error-copy/err-codes.h.in +++ b/libtdenetwork/libgpg-error-copy/err-codes.h.in @@ -216,7 +216,7 @@ 203 GPG_ERR_SEXP_UNMATCHED_PAREN Unmatched parentheses in S-expression 204 GPG_ERR_SEXP_NOT_CANONICAL S-expression not canonical 205 GPG_ERR_SEXP_BAD_CHARACTER Bad character in S-expression -206 GPG_ERR_SEXP_BAD_TQUOTATION Bad quotation in S-expression +206 GPG_ERR_SEXP_BAD_QUOTATION Bad quotation in S-expression 207 GPG_ERR_SEXP_ZERO_PREFIX Zero prefix in S-expression 208 GPG_ERR_SEXP_NESTED_DH Nested display hints in S-expression 209 GPG_ERR_SEXP_UNMATCHED_DH Unmatched display hints @@ -237,7 +237,7 @@ 263 GPG_ERR_ASS_LINE_TOO_LONG Line passed to IPC too long 264 GPG_ERR_ASS_NESTED_COMMANDS Nested IPC commands 265 GPG_ERR_ASS_NO_DATA_CB No data callback in IPC -266 GPG_ERR_ASS_NO_INTQUIRE_CB No inquire callback in IPC +266 GPG_ERR_ASS_NO_INQUIRE_CB No inquire callback in IPC 267 GPG_ERR_ASS_NOT_A_SERVER Not an IPC server 268 GPG_ERR_ASS_NOT_A_CLIENT Not an IPC client 269 GPG_ERR_ASS_SERVER_START Problem starting IPC server @@ -252,7 +252,7 @@ 278 GPG_ERR_ASS_NO_INPUT No input source for IPC 279 GPG_ERR_ASS_NO_OUTPUT No output source for IPC 280 GPG_ERR_ASS_PARAMETER IPC parameter error -281 GPG_ERR_ASS_UNKNOWN_INTQUIRE Unknown IPC inquire +281 GPG_ERR_ASS_UNKNOWN_INQUIRE Unknown IPC inquire # 282 to 299 are reserved for future assuan codes. diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c b/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c index 7a1879877..b06025b46 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c @@ -488,7 +488,7 @@ _assuan_cookie_write_flush (void *cookie) * data out @buffer may be passed as NULL (in which case @length must * also be 0); however when used by a client this flush operation does * also send the terminating "END" command to terminate the reponse on - * a INTQUIRE response. However, when assuan_transact() is used, this + * a INQUIRE response. However, when assuan_transact() is used, this * function takes care of sending END itself. * * Return value: 0 on success or an error code diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c b/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c index 897e0773b..d8c52d09a 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c @@ -141,7 +141,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword, { assuan_error_t rc; struct membuf mb; - char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INTQUIRE ")+CR,LF) */ + char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INQUIRE ")+CR,LF) */ unsigned char *line, *p; int linelen; int nodataexpected; @@ -162,7 +162,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword, else init_membuf (&mb, maxlen? maxlen:1024, maxlen); - strcpy (stpcpy (cmdbuf, "INTQUIRE "), keyword); + strcpy (stpcpy (cmdbuf, "INQUIRE "), keyword); rc = assuan_write_line (ctx, cmdbuf); if (rc) goto leave; diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index d7e5675eb..60d5c24f6 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows ) mData.clear(); int row, column; - enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, + enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; TQChar m_textquote = '"'; @@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows ) case S_START : if (x == m_textquote) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == mSeparator) { ++column; } else if (x == '\n') { @@ -358,10 +358,10 @@ void KImportDialog::readFile( int rows ) state = S_MAYBE_NORMAL_FIELD; } break; - case S_TQUOTED_FIELD : + case S_QUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_MAYBE_END_OF_TQUOTED_FIELD; + state = S_MAYBE_END_OF_QUOTED_FIELD; } else if (x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -376,10 +376,10 @@ void KImportDialog::readFile( int rows ) field += x; } break; - case S_MAYBE_END_OF_TQUOTED_FIELD : + case S_MAYBE_END_OF_QUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == mSeparator || x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -391,10 +391,10 @@ void KImportDialog::readFile( int rows ) } state = S_START; } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; - case S_END_OF_TQUOTED_FIELD : + case S_END_OF_QUOTED_FIELD : if (x == mSeparator || x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -406,13 +406,13 @@ void KImportDialog::readFile( int rows ) } state = S_START; } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = ""; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } case S_NORMAL_FIELD : if (x == mSeparator || x == '\n') { diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index e48f565d9..97451d58b 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KRSTQUEEZEDTEXTLABEL_H -#define KRSTQUEEZEDTEXTLABEL_H +#ifndef KRSQUEEZEDTEXTLABEL_H +#define KRSQUEEZEDTEXTLABEL_H #include <tqlabel.h> #include <tdepimmacros.h> @@ -72,4 +72,4 @@ protected: }; -#endif // KRSTQUEEZEDTEXTLABEL_H +#endif // KRSQUEEZEDTEXTLABEL_H diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index 3bcbd7fd4..94e8c155e 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -409,7 +409,7 @@ KScoringExpression::KScoringExpression(const TQString& h, const TQString& t, con expr.setCaseSensitive( true ); } else if (t == "CONTAINS" ) cond = CONTAINS; - else if (t == "ETQUALS" ) cond = ETQUALS; + else if (t == "EQUALS" ) cond = EQUALS; else if (t == "GREATER") { cond = GREATER; expr_int = expr_str.toInt(); @@ -435,7 +435,7 @@ int KScoringExpression::getConditionForName(const TQString& s) if (s == getNameForCondition(CONTAINS)) return CONTAINS; else if (s == getNameForCondition(MATCH)) return MATCH; else if (s == getNameForCondition(MATCHCS)) return MATCHCS; - else if (s == getNameForCondition(ETQUALS)) return ETQUALS; + else if (s == getNameForCondition(EQUALS)) return EQUALS; else if (s == getNameForCondition(SMALLER)) return SMALLER; else if (s == getNameForCondition(GREATER)) return GREATER; else { @@ -452,7 +452,7 @@ TQString KScoringExpression::getNameForCondition(int cond) case CONTAINS: return i18n("Contains Substring"); case MATCH: return i18n("Matches Regular Expression"); case MATCHCS: return i18n("Matches Regular Expression (Case Sensitive)"); - case ETQUALS: return i18n("Is Exactly the Same As"); + case EQUALS: return i18n("Is Exactly the Same As"); case SMALLER: return i18n("Less Than"); case GREATER: return i18n("Greater Than"); default: @@ -469,7 +469,7 @@ TQStringList KScoringExpression::conditionNames() l << getNameForCondition(CONTAINS); l << getNameForCondition(MATCH); l << getNameForCondition(MATCHCS); - l << getNameForCondition(ETQUALS); + l << getNameForCondition(EQUALS); l << getNameForCondition(SMALLER); l << getNameForCondition(GREATER); return l; @@ -510,7 +510,7 @@ bool KScoringExpression::match(ScorableArticle& a) const if (!head.isEmpty()) { switch (cond) { - case ETQUALS: + case EQUALS: res = (head.lower() == expr_str.lower()); break; case CONTAINS: @@ -569,7 +569,7 @@ TQString KScoringExpression::getTypeString(int cond) case CONTAINS: return "CONTAINS"; case MATCH: return "MATCH"; case MATCHCS: return "MATCHCS"; - case ETQUALS: return "ETQUALS"; + case EQUALS: return "EQUALS"; case SMALLER: return "SMALLER"; case GREATER: return "GREATER"; default: diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h index 7225eb93f..1b6e2d3c7 100644 --- a/libtdepim/kscoring.h +++ b/libtdepim/kscoring.h @@ -186,7 +186,7 @@ class KDE_EXPORT KScoringExpression { friend class KScoringRule; public: - enum Condition { CONTAINS, MATCH, ETQUALS, SMALLER, GREATER, MATCHCS }; + enum Condition { CONTAINS, MATCH, EQUALS, SMALLER, GREATER, MATCHCS }; KScoringExpression(const TQString&,const TQString&,const TQString&, const TQString&); ~KScoringExpression(); diff --git a/mimelib/address.cpp b/mimelib/address.cpp index b6c830c3f..6d64abce8 100644 --- a/mimelib/address.cpp +++ b/mimelib/address.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/addrlist.cpp b/mimelib/addrlist.cpp index 3f041f205..ab444744b 100644 --- a/mimelib/addrlist.cpp +++ b/mimelib/addrlist.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/attach.cpp b/mimelib/attach.cpp index 47365785b..27b35dfdf 100644 --- a/mimelib/attach.cpp +++ b/mimelib/attach.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/attach.h b/mimelib/attach.h index f4415e26e..1ababc56a 100644 --- a/mimelib/attach.h +++ b/mimelib/attach.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/basicmsg.cpp b/mimelib/basicmsg.cpp index fde3c0f9f..2e04a04af 100644 --- a/mimelib/basicmsg.cpp +++ b/mimelib/basicmsg.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/basicmsg.h b/mimelib/basicmsg.h index cc0c42ed5..d578a7580 100644 --- a/mimelib/basicmsg.h +++ b/mimelib/basicmsg.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/body.cpp b/mimelib/body.cpp index 9b2cbf506..f5a56772f 100644 --- a/mimelib/body.cpp +++ b/mimelib/body.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/bodypart.cpp b/mimelib/bodypart.cpp index 69c6d781e..fac2bba20 100644 --- a/mimelib/bodypart.cpp +++ b/mimelib/bodypart.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/boyermor.cpp b/mimelib/boyermor.cpp index 13d8f4c9a..5ee007ae8 100644 --- a/mimelib/boyermor.cpp +++ b/mimelib/boyermor.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/datetime.cpp b/mimelib/datetime.cpp index 40536bbb4..64f2eef2e 100644 --- a/mimelib/datetime.cpp +++ b/mimelib/datetime.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/disptype.cpp b/mimelib/disptype.cpp index c1cf36c8f..f93dc21be 100644 --- a/mimelib/disptype.cpp +++ b/mimelib/disptype.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/doc/nntp.html b/mimelib/doc/nntp.html index b8cf80307..75b8b71fb 100644 --- a/mimelib/doc/nntp.html +++ b/mimelib/doc/nntp.html @@ -354,7 +354,7 @@ returns zero. <P> <FONT COLOR="teal"><B> int <A NAME="Quit">Quit</A>() </B></FONT> <P> -Sends the NNTP TQUIT command and returns the reply code received from the +Sends the NNTP QUIT command and returns the reply code received from the server. If no response is received, perhaps because of an error, the function returns zero. <P> diff --git a/mimelib/doc/pop.html b/mimelib/doc/pop.html index f3cbc1cf3..5bb4ed67c 100644 --- a/mimelib/doc/pop.html +++ b/mimelib/doc/pop.html @@ -224,7 +224,7 @@ If no response is received, the function returns zero. <P> <FONT COLOR="teal"><B> int <A NAME="Quit">Quit</A>() </B></FONT> <P> -Sends the TQUIT command and returns the status code received from the server. +Sends the QUIT command and returns the status code received from the server. If no response is received, the function returns zero. <P> <FONT COLOR="teal"><B> int <A NAME="Stat">Stat</A>() </B></FONT> diff --git a/mimelib/dw_cte.cpp b/mimelib/dw_cte.cpp index 9714d2520..127a29aa8 100644 --- a/mimelib/dw_cte.cpp +++ b/mimelib/dw_cte.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/dw_date.cpp b/mimelib/dw_date.cpp index 5d8b3c338..e4436bbe7 100644 --- a/mimelib/dw_date.cpp +++ b/mimelib/dw_date.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/dw_mime.cpp b/mimelib/dw_mime.cpp index a5637c397..cca2fdede 100644 --- a/mimelib/dw_mime.cpp +++ b/mimelib/dw_mime.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp index 9a46bfa8b..749f7c8ee 100644 --- a/mimelib/dwstring.cpp +++ b/mimelib/dwstring.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/entity.cpp b/mimelib/entity.cpp index 2858c3c41..a97d96e57 100644 --- a/mimelib/entity.cpp +++ b/mimelib/entity.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/field.cpp b/mimelib/field.cpp index f1b07c85e..a9f140b89 100644 --- a/mimelib/field.cpp +++ b/mimelib/field.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/fieldbdy.cpp b/mimelib/fieldbdy.cpp index 5b1729cd7..9c3871691 100644 --- a/mimelib/fieldbdy.cpp +++ b/mimelib/fieldbdy.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/group.cpp b/mimelib/group.cpp index 9d2e76453..319e78449 100644 --- a/mimelib/group.cpp +++ b/mimelib/group.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/headers.cpp b/mimelib/headers.cpp index 44f53001e..7598ec7ea 100644 --- a/mimelib/headers.cpp +++ b/mimelib/headers.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mailbox.cpp b/mimelib/mailbox.cpp index e4fbe17d6..b5dc7cc3f 100644 --- a/mimelib/mailbox.cpp +++ b/mimelib/mailbox.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mboxlist.cpp b/mimelib/mboxlist.cpp index 880151859..9dde322b3 100644 --- a/mimelib/mboxlist.cpp +++ b/mimelib/mboxlist.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mechansm.cpp b/mimelib/mechansm.cpp index ac72f28d7..bf9d37071 100644 --- a/mimelib/mechansm.cpp +++ b/mimelib/mechansm.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mediatyp.cpp b/mimelib/mediatyp.cpp index e0a6ea79a..87ee345e4 100644 --- a/mimelib/mediatyp.cpp +++ b/mimelib/mediatyp.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/message.cpp b/mimelib/message.cpp index d36c52d16..608e4fa5a 100644 --- a/mimelib/message.cpp +++ b/mimelib/message.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/address.h b/mimelib/mimelib/address.h index f4ec3a7d2..7ed56ba8c 100644 --- a/mimelib/mimelib/address.h +++ b/mimelib/mimelib/address.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/addrlist.h b/mimelib/mimelib/addrlist.h index 5db647256..5d26736a7 100644 --- a/mimelib/mimelib/addrlist.h +++ b/mimelib/mimelib/addrlist.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/binhex.h b/mimelib/mimelib/binhex.h index 3ccc747df..468dcfd70 100644 --- a/mimelib/mimelib/binhex.h +++ b/mimelib/mimelib/binhex.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h index 654812d45..2133a724e 100644 --- a/mimelib/mimelib/body.h +++ b/mimelib/mimelib/body.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/bodypart.h b/mimelib/mimelib/bodypart.h index d2cda16e1..9ed7f672e 100644 --- a/mimelib/mimelib/bodypart.h +++ b/mimelib/mimelib/bodypart.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/boyermor.h b/mimelib/mimelib/boyermor.h index e23e6ae6a..f04e573be 100644 --- a/mimelib/mimelib/boyermor.h +++ b/mimelib/mimelib/boyermor.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/config.h b/mimelib/mimelib/config.h index e47fb8dea..9467d30d1 100644 --- a/mimelib/mimelib/config.h +++ b/mimelib/mimelib/config.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/datetime.h b/mimelib/mimelib/datetime.h index da7f62597..d23eba0b9 100644 --- a/mimelib/mimelib/datetime.h +++ b/mimelib/mimelib/datetime.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/debug.h b/mimelib/mimelib/debug.h index bb52ca609..95325af54 100644 --- a/mimelib/mimelib/debug.h +++ b/mimelib/mimelib/debug.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/disptype.h b/mimelib/mimelib/disptype.h index e1e90b3b3..59c740cbe 100644 --- a/mimelib/mimelib/disptype.h +++ b/mimelib/mimelib/disptype.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h index e555f6ad1..e809c2820 100644 --- a/mimelib/mimelib/entity.h +++ b/mimelib/mimelib/entity.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/enum.h b/mimelib/mimelib/enum.h index 7f2e2c444..93cfe0106 100644 --- a/mimelib/mimelib/enum.h +++ b/mimelib/mimelib/enum.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/field.h b/mimelib/mimelib/field.h index f53c2b023..9ada823cb 100644 --- a/mimelib/mimelib/field.h +++ b/mimelib/mimelib/field.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/fieldbdy.h b/mimelib/mimelib/fieldbdy.h index 229bc7bc5..e5f3243a7 100644 --- a/mimelib/mimelib/fieldbdy.h +++ b/mimelib/mimelib/fieldbdy.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/group.h b/mimelib/mimelib/group.h index e823500f9..21cf930b8 100644 --- a/mimelib/mimelib/group.h +++ b/mimelib/mimelib/group.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h index a34531bd8..f545a3db2 100644 --- a/mimelib/mimelib/headers.h +++ b/mimelib/mimelib/headers.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h index 9c472c487..7e38ae4b4 100644 --- a/mimelib/mimelib/mailbox.h +++ b/mimelib/mimelib/mailbox.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/mboxlist.h b/mimelib/mimelib/mboxlist.h index 3cfe1c6d6..723a8c55d 100644 --- a/mimelib/mimelib/mboxlist.h +++ b/mimelib/mimelib/mboxlist.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/mechansm.h b/mimelib/mimelib/mechansm.h index bb8f55e12..05a80fe95 100644 --- a/mimelib/mimelib/mechansm.h +++ b/mimelib/mimelib/mechansm.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/mediatyp.h b/mimelib/mimelib/mediatyp.h index 02ec6e135..f57b9aa3d 100644 --- a/mimelib/mimelib/mediatyp.h +++ b/mimelib/mimelib/mediatyp.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h index 73996664e..5dbd7cc46 100644 --- a/mimelib/mimelib/message.h +++ b/mimelib/mimelib/message.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/mimepp.h b/mimelib/mimelib/mimepp.h index bf40108f6..cecb20446 100644 --- a/mimelib/mimelib/mimepp.h +++ b/mimelib/mimelib/mimepp.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h index 00b7cb9f7..c9e6707ee 100644 --- a/mimelib/mimelib/msgcmp.h +++ b/mimelib/mimelib/msgcmp.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/msgid.h b/mimelib/mimelib/msgid.h index 185e860e9..de066cdbc 100644 --- a/mimelib/mimelib/msgid.h +++ b/mimelib/mimelib/msgid.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/nntp.h b/mimelib/mimelib/nntp.h index d98ebb5e3..bd617903b 100644 --- a/mimelib/mimelib/nntp.h +++ b/mimelib/mimelib/nntp.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // @@ -329,7 +329,7 @@ public: //. the function returns zero. int Quit(); - //. Sends the NNTP TQUIT command and returns the reply code received from + //. Sends the NNTP QUIT command and returns the reply code received from //. the server. If no response is received, perhaps because of an error, //. the function returns zero. diff --git a/mimelib/mimelib/param.h b/mimelib/mimelib/param.h index c5ab6a143..94458a7a2 100644 --- a/mimelib/mimelib/param.h +++ b/mimelib/mimelib/param.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/pop.h b/mimelib/mimelib/pop.h index b5627e4d0..5bd90ea7a 100644 --- a/mimelib/mimelib/pop.h +++ b/mimelib/mimelib/pop.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // @@ -213,7 +213,7 @@ public: //. {\tt aPasswd} is the password, which is sent in the command. int Quit(); - //. Sends the TQUIT command and returns the status code received from + //. Sends the QUIT command and returns the status code received from //. the server. If no response is received, the function returns zero. int Stat(); diff --git a/mimelib/mimelib/protocol.h b/mimelib/mimelib/protocol.h index 847b02fb0..32186a82b 100644 --- a/mimelib/mimelib/protocol.h +++ b/mimelib/mimelib/protocol.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/string.h b/mimelib/mimelib/string.h index 35cf4f8dd..35be8e0b6 100644 --- a/mimelib/mimelib/string.h +++ b/mimelib/mimelib/string.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/text.h b/mimelib/mimelib/text.h index 14fd8f7d1..89b908ad0 100644 --- a/mimelib/mimelib/text.h +++ b/mimelib/mimelib/text.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/token.h b/mimelib/mimelib/token.h index 771cef979..7168ea091 100644 --- a/mimelib/mimelib/token.h +++ b/mimelib/mimelib/token.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/utility.h b/mimelib/mimelib/utility.h index 15a8e58e6..8cda35ea6 100644 --- a/mimelib/mimelib/utility.h +++ b/mimelib/mimelib/utility.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/mimelib/uuencode.h b/mimelib/mimelib/uuencode.h index e44d41df2..c87efbdaf 100644 --- a/mimelib/mimelib/uuencode.h +++ b/mimelib/mimelib/uuencode.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/msgcmp.cpp b/mimelib/msgcmp.cpp index fcaaaa4e6..4b154dc3d 100644 --- a/mimelib/msgcmp.cpp +++ b/mimelib/msgcmp.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/msgid.cpp b/mimelib/msgid.cpp index bfd9487da..46656280d 100644 --- a/mimelib/msgid.cpp +++ b/mimelib/msgid.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/multipar.cpp b/mimelib/multipar.cpp index ab675e928..07514fcf7 100644 --- a/mimelib/multipar.cpp +++ b/mimelib/multipar.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/multipar.h b/mimelib/multipar.h index 41c3ca2d9..f6de628aa 100644 --- a/mimelib/multipar.h +++ b/mimelib/multipar.h @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/nntp.cpp b/mimelib/nntp.cpp index 0dd9e7768..a89293ae6 100644 --- a/mimelib/nntp.cpp +++ b/mimelib/nntp.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/param.cpp b/mimelib/param.cpp index a289603e4..f928be558 100644 --- a/mimelib/param.cpp +++ b/mimelib/param.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/pop.cpp b/mimelib/pop.cpp index bec5d60b6..78bb64753 100644 --- a/mimelib/pop.cpp +++ b/mimelib/pop.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/protocol.cpp b/mimelib/protocol.cpp index 733b87928..b0685aa72 100644 --- a/mimelib/protocol.cpp +++ b/mimelib/protocol.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/test/exampl01.cpp b/mimelib/test/exampl01.cpp index 3ab827e2a..497383bf9 100644 --- a/mimelib/test/exampl01.cpp +++ b/mimelib/test/exampl01.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/test/exampl02.cpp b/mimelib/test/exampl02.cpp index 263f3f713..600df8a6b 100644 --- a/mimelib/test/exampl02.cpp +++ b/mimelib/test/exampl02.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/test/exampl03.cpp b/mimelib/test/exampl03.cpp index 6dd4462cc..02350e9db 100644 --- a/mimelib/test/exampl03.cpp +++ b/mimelib/test/exampl03.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/test/exampl04.cpp b/mimelib/test/exampl04.cpp index a7cac1a77..7a0b5d078 100644 --- a/mimelib/test/exampl04.cpp +++ b/mimelib/test/exampl04.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/test/exampl05.cpp b/mimelib/test/exampl05.cpp index e75d9612a..5e3b16d86 100644 --- a/mimelib/test/exampl05.cpp +++ b/mimelib/test/exampl05.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/text.cpp b/mimelib/text.cpp index c3b390d4c..81fe1a718 100644 --- a/mimelib/text.cpp +++ b/mimelib/text.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/token.cpp b/mimelib/token.cpp index 8a79e46f2..654d764f7 100644 --- a/mimelib/token.cpp +++ b/mimelib/token.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // diff --git a/mimelib/uuencode.cpp b/mimelib/uuencode.cpp index 8a7317e7a..bbd3c8563 100644 --- a/mimelib/uuencode.cpp +++ b/mimelib/uuencode.cpp @@ -8,7 +8,7 @@ // All rights reserved. // // IN NO EVENT SHALL DOUGLAS W. SAUDER BE LIABLE TO ANY PARTY FOR DIRECT, -// INDIRECT, SPECIAL, INCIDENTAL, OR CONSETQUENTIAL DAMAGES ARISING OUT OF +// INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF // THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF DOUGLAS W. SAUDER // HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // |