diff options
Diffstat (limited to 'kmailcvt')
| -rw-r--r-- | kmailcvt/CMakeL10n.txt | 5 | ||||
| -rw-r--r-- | kmailcvt/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | kmailcvt/Makefile.am | 42 | ||||
| -rw-r--r-- | kmailcvt/README | 18 | ||||
| -rw-r--r-- | kmailcvt/filter_evolution.cpp (renamed from kmailcvt/filter_evolution.cxx) | 4 | ||||
| -rw-r--r-- | kmailcvt/filter_evolution.h (renamed from kmailcvt/filter_evolution.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_evolution_v2.cpp (renamed from kmailcvt/filter_evolution_v2.cxx) | 6 | ||||
| -rw-r--r-- | kmailcvt/filter_evolution_v2.h (renamed from kmailcvt/filter_evolution_v2.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_kmail_archive.cpp (renamed from kmailcvt/filter_kmail_archive.cxx) | 2 | ||||
| -rw-r--r-- | kmailcvt/filter_kmail_archive.h (renamed from kmailcvt/filter_kmail_archive.hxx) | 6 | ||||
| -rw-r--r-- | kmailcvt/filter_kmail_maildir.cpp (renamed from kmailcvt/filter_kmail_maildir.cxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_kmail_maildir.h (renamed from kmailcvt/filter_kmail_maildir.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_lnotes.cpp (renamed from kmailcvt/filter_lnotes.cxx) | 10 | ||||
| -rw-r--r-- | kmailcvt/filter_lnotes.h (renamed from kmailcvt/filter_lnotes.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_mailapp.cpp (renamed from kmailcvt/filter_mailapp.cxx) | 4 | ||||
| -rw-r--r-- | kmailcvt/filter_mailapp.h (renamed from kmailcvt/filter_mailapp.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_mbox.cpp (renamed from kmailcvt/filter_mbox.cxx) | 6 | ||||
| -rw-r--r-- | kmailcvt/filter_mbox.h (renamed from kmailcvt/filter_mbox.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_oe.cpp (renamed from kmailcvt/filter_oe.cxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_oe.h (renamed from kmailcvt/filter_oe.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_opera.cpp (renamed from kmailcvt/filter_opera.cxx) | 4 | ||||
| -rw-r--r-- | kmailcvt/filter_opera.h (renamed from kmailcvt/filter_opera.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_outlook.cpp (renamed from kmailcvt/filter_outlook.cxx) | 4 | ||||
| -rw-r--r-- | kmailcvt/filter_outlook.h (renamed from kmailcvt/filter_outlook.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_plain.cpp (renamed from kmailcvt/filter_plain.cxx) | 4 | ||||
| -rw-r--r-- | kmailcvt/filter_plain.h (renamed from kmailcvt/filter_plain.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_pmail.cpp (renamed from kmailcvt/filter_pmail.cxx) | 4 | ||||
| -rw-r--r-- | kmailcvt/filter_pmail.h (renamed from kmailcvt/filter_pmail.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_sylpheed.cpp (renamed from kmailcvt/filter_sylpheed.cxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_sylpheed.h (renamed from kmailcvt/filter_sylpheed.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_thebat.cpp (renamed from kmailcvt/filter_thebat.cxx) | 6 | ||||
| -rw-r--r-- | kmailcvt/filter_thebat.h (renamed from kmailcvt/filter_thebat.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filter_thunderbird.cpp (renamed from kmailcvt/filter_thunderbird.cxx) | 6 | ||||
| -rw-r--r-- | kmailcvt/filter_thunderbird.h (renamed from kmailcvt/filter_thunderbird.hxx) | 8 | ||||
| -rw-r--r-- | kmailcvt/filters.cpp (renamed from kmailcvt/filters.cxx) | 18 | ||||
| -rw-r--r-- | kmailcvt/filters.h (renamed from kmailcvt/filters.hxx) | 6 | ||||
| -rw-r--r-- | kmailcvt/kimportpage.cpp | 2 | ||||
| -rw-r--r-- | kmailcvt/kimportpage.h | 2 | ||||
| -rw-r--r-- | kmailcvt/kmailcvt.cpp | 4 | ||||
| -rw-r--r-- | kmailcvt/kmailcvt.h | 2 | ||||
| -rw-r--r-- | kmailcvt/kselfilterpage.cpp | 38 | ||||
| -rw-r--r-- | kmailcvt/kselfilterpage.h | 2 |
42 files changed, 174 insertions, 179 deletions
diff --git a/kmailcvt/CMakeL10n.txt b/kmailcvt/CMakeL10n.txt index cf11083b..a5d59794 100644 --- a/kmailcvt/CMakeL10n.txt +++ b/kmailcvt/CMakeL10n.txt @@ -1,6 +1,3 @@ ##### create translation templates ############## -tde_l10n_create_template( - CATALOG "kmailcvt" - SOURCES "." "*.cxx" "*.hxx" -) +tde_l10n_create_template( "kmailcvt" ) diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt index 9a566690..ac96928a 100644 --- a/kmailcvt/CMakeLists.txt +++ b/kmailcvt/CMakeLists.txt @@ -38,12 +38,12 @@ install( tde_add_executable( kmailcvt AUTOMOC SOURCES kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui - kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp main.cpp - filter_pmail.cxx filter_plain.cxx filter_outlook.cxx filter_mbox.cxx - filter_evolution.cxx filter_mailapp.cxx filter_evolution_v2.cxx - filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx - filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx - filter_kmail_archive.cxx + kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp main.cpp + filter_pmail.cpp filter_plain.cpp filter_outlook.cpp filter_mbox.cpp + filter_evolution.cpp filter_mailapp.cpp filter_evolution_v2.cpp + filter_opera.cpp filter_thunderbird.cpp filter_kmail_maildir.cpp + filter_sylpheed.cpp filter_thebat.cpp filter_lnotes.cpp + filter_kmail_archive.cpp LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am index 84777d75..af5a8feb 100644 --- a/kmailcvt/Makefile.am +++ b/kmailcvt/Makefile.am @@ -1,32 +1,32 @@ bin_PROGRAMS = kmailcvt kmailcvt_SOURCES = kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui \ - kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp \ - main.cpp filter_pmail.cxx filter_plain.cxx filter_outlook.cxx \ - filter_mbox.cxx filter_evolution.cxx filter_mailapp.cxx \ - filter_evolution_v2.cxx filter_opera.cxx filter_thunderbird.cxx \ - filter_kmail_maildir.cxx filter_sylpheed.cxx filter_thebat.cxx \ - filter_lnotes.cxx filter_kmail_archive.cxx + kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp \ + main.cpp filter_pmail.cpp filter_plain.cpp filter_outlook.cpp \ + filter_mbox.cpp filter_evolution.cpp filter_mailapp.cpp \ + filter_evolution_v2.cpp filter_opera.cpp filter_thunderbird.cpp \ + filter_kmail_maildir.cpp filter_sylpheed.cpp filter_thebat.cpp \ + filter_lnotes.cpp filter_kmail_archive.cpp kmailcvt_LDADD = $(LIB_TDEFILE) EXTRA_DIST = main.cpp kmailcvt.cpp kimportpage.cpp kimportpage.h \ kselfilterpage.cpp kselfilterpage.h kmailcvt.h \ - kmailcvt.desktop filter_oe.cxx filter_oe.hxx \ - filters.cxx filters.hxx \ + kmailcvt.desktop filter_oe.cpp filter_oe.h \ + filters.cpp filters.h \ PAB_format.html sv9429424.gif \ - filter_pmail.cxx filter_pmail.hxx \ - filter_plain.cxx filter_plain.hxx \ - filter_mbox.cxx filter_mbox.hxx \ - filter_evolution.cxx filter_evolution.hxx \ - filter_mailapp.hxx filter_mailapp.cxx \ - filter_opera.hxx filter_opera.cxx \ - filter_evolution_v2.hxx filter_evolution_v2.cxx \ - filter_thunderbird.hxx filter_thunderbird.cxx \ - filter_kmail_maildir.hxx filter_kmail_maildir.cxx \ - filter_sylpheed.hxx filter_sylpheed.cxx \ - filter_thebat.hxx filter_thebat.cxx filter_lnotes.hxx filter_lnotes.cxx \ - filter_kmail_archive.cxx fitler_kmail_archive.hxx + filter_pmail.cpp filter_pmail.h \ + filter_plain.cpp filter_plain.h \ + filter_mbox.cpp filter_mbox.h \ + filter_evolution.cpp filter_evolution.h \ + filter_mailapp.h filter_mailapp.cpp \ + filter_opera.h filter_opera.cpp \ + filter_evolution_v2.h filter_evolution_v2.cpp \ + filter_thunderbird.h filter_thunderbird.cpp \ + filter_kmail_maildir.h filter_kmail_maildir.cpp \ + filter_sylpheed.h filter_sylpheed.cpp \ + filter_thebat.h filter_thebat.cpp filter_lnotes.h filter_lnotes.cpp \ + filter_kmail_archive.cpp fitler_kmail_archive.h install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Utilities @@ -45,7 +45,7 @@ kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE KDE_ICON=AUTO messages: rc.cpp - LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + LIST=`find . -name \*.h -o -name \*.cpp`; \ if test -n "$$LIST"; then \ $(XGETTEXT) $$LIST -o $(podir)/kmailcvt.pot; \ fi diff --git a/kmailcvt/README b/kmailcvt/README index d8322ed4..1f778afe 100644 --- a/kmailcvt/README +++ b/kmailcvt/README @@ -7,23 +7,23 @@ with KMail via its DCOP interface to add messages. Writing a filter ---------------- -...is very easy. Create two files filter_myformat.cxx and filter_myformat.hxx -and add "filter_myformat.cxx" to the end of the kmailcvt_SOURCES line in -Makefile.am and "filter_myformat.cxx filter_myformat.hxx" to the end of the +...is very easy. Create two files filter_myformat.cpp and filter_myformat.h +and add "filter_myformat.cpp" to the end of the kmailcvt_SOURCES line in +Makefile.am and "filter_myformat.cpp filter_myformat.h" to the end of the EXTRA_DIST line in Makefile.am. Now run "make -f Makefile.cvs; ./configure" in your tdepim source directory. In the import method of your filter you are passed a FilterInfo object. This has the following methods that you may want to use: - void setFrom( const QString& from ); // Set to file importing from - void setTo( const QString& to ); // Set to folder importing into - void setCurrent( const QString& current ); // What we are doing + void setFrom( const TQString& from ); // Set to file importing from + void setTo( const TQString& to ); // Set to folder importing into + void setCurrent( const TQString& current ); // What we are doing void setCurrent( int percent = 0 ); // Set percentage of current file void setOverall( int percent = 0 ); // Set overall percentage - void addLog( const QString& log ); // Add a message for the user to see - void alert( const QString& message ); // Tell user something has gone wrong - QWidget *parent(); // The parent widget + void addLog( const TQString& log ); // Add a message for the user to see + void alert( const TQString& message ); // Tell user something has gone wrong + TQWidget *parent(); // The parent widget bool removeDupMsg; // true, if user selected 'remove duplicated messages' diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cpp index b4443d14..a372058e 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cpp @@ -1,5 +1,5 @@ /* - * filter_evolution.cxx + * filter_evolution.cpp * Author : Simon MARTIN <simartin@users.sourceforge.net> * Copyright (c) 2004 Simon MARTIN * @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "filter_evolution.hxx" +#include "filter_evolution.h" #include <config.h> #include <tdelocale.h> diff --git a/kmailcvt/filter_evolution.hxx b/kmailcvt/filter_evolution.h index 1aa5184f..83fb4155 100644 --- a/kmailcvt/filter_evolution.hxx +++ b/kmailcvt/filter_evolution.h @@ -1,5 +1,5 @@ /* - * filter_evolution.hxx + * filter_evolution.h * Author : Simon MARTIN <simartin@users.sourceforge.net> * Copyright (c) 2004 Simon MARTIN * @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FILTER_EVOLUTION_HXX -#define FILTER_EVOLUTION_HXX +#ifndef FILTER_EVOLUTION_H +#define FILTER_EVOLUTION_H -#include "filters.hxx" +#include "filters.h" /** * Imports Evolution mboxes recursively, keeping the folder structure. diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cpp index b6ee8a57..e0eb6d31 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_evolution_v2.cxx - Evolution 2.0.x mail import + filter_evolution_v2.cpp - Evolution 2.0.x mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -16,7 +16,7 @@ * * ***************************************************************************/ -#include "filter_evolution_v2.hxx" +#include "filter_evolution_v2.h" #include <config.h> #include <tdelocale.h> @@ -208,7 +208,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName, if(!targetDir.isNull()) { if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); - destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName; + destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(true); // mboxName; } else { destFolder = "Evolution-Import/" + rootDir; if(destFolder.contains(".sbd")) diff --git a/kmailcvt/filter_evolution_v2.hxx b/kmailcvt/filter_evolution_v2.h index da58b4fe..2c93bba8 100644 --- a/kmailcvt/filter_evolution_v2.hxx +++ b/kmailcvt/filter_evolution_v2.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_evolution_v2.hxx - Evolution 2.0.x mail import + filter_evolution_v2.h - Evolution 2.0.x mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -16,10 +16,10 @@ * * ***************************************************************************/ -#ifndef FILTER_EVOLUTION_V2_HXX -#define FILTER_EVOLUTION_V2_HXX +#ifndef FILTER_EVOLUTION_V2_H +#define FILTER_EVOLUTION_V2_H -#include "filters.hxx" +#include "filters.h" /** * Imports Evolution v2.x mail folder recursively, keeping the folder structure. diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cpp index 3c7c20d0..49325d2a 100644 --- a/kmailcvt/filter_kmail_archive.cxx +++ b/kmailcvt/filter_kmail_archive.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "filter_kmail_archive.hxx" +#include "filter_kmail_archive.h" #include <tdelocale.h> diff --git a/kmailcvt/filter_kmail_archive.hxx b/kmailcvt/filter_kmail_archive.h index 755d3cc2..a1f74925 100644 --- a/kmailcvt/filter_kmail_archive.hxx +++ b/kmailcvt/filter_kmail_archive.h @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FILTER_KMAIL_ARCHIVE_HXX -#define FILTER_KMAIL_ARCHIVE_HXX +#ifndef FILTER_KMAIL_ARCHIVE_H +#define FILTER_KMAIL_ARCHIVE_H -#include "filters.hxx" +#include "filters.h" class FilterKMailArchive : public Filter { diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cpp index 9d642814..df432925 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_kmail_maildir.cxx - Kmail maildir mail import + filter_kmail_maildir.cpp - Kmail maildir mail import ------------------- begin : April 06 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_kmail_maildir.hxx" +#include "filter_kmail_maildir.h" #include <config.h> #include <tdelocale.h> @@ -176,8 +176,8 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(!generatedPath) { _path = "KMail-Import"; TQString _tmp = dir.filePath(*mailFile); - _tmp = _tmp.remove( mailDir ,TRUE); - TQStringList subFList = TQStringList::split("/",_tmp,FALSE); + _tmp = _tmp.remove( mailDir ,true); + TQStringList subFList = TQStringList::split("/",_tmp,false); for ( TQStringList::Iterator it = subFList.begin(); it != subFList.end(); ++it ) { TQString _cat = *it; if(!(_cat == *mailFile)) { diff --git a/kmailcvt/filter_kmail_maildir.hxx b/kmailcvt/filter_kmail_maildir.h index 66f44490..f0d8c6ac 100644 --- a/kmailcvt/filter_kmail_maildir.hxx +++ b/kmailcvt/filter_kmail_maildir.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_kmail_maildir.hxx - Kmail maildir mail import + filter_kmail_maildir.h - Kmail maildir mail import ------------------- begin : April 06 2005 copyright : (C) 2005 by Danny Kukawka @@ -14,10 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef FILTER_KMAIL_MAILDIR_HXX -#define FILTER_KMAIL_MAILDIR_HXX +#ifndef FILTER_KMAIL_MAILDIR_H +#define FILTER_KMAIL_MAILDIR_H -#include "filters.hxx" +#include "filters.h" /** * Imports KMail mail folder with maildir format recursively, recreating the folder structure. diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cpp index af92e1b4..7c50f4c1 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_lnotes.cxx - Lotus Notes Structured Text mail import + filter_lnotes.cpp - Lotus Notes Structured Text mail import ------------------- begin : Wed Feb 16, 2005 copyright : (C) 2005 by Robert Rockers @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tqfileinfo.h> -#include "filter_lnotes.hxx" +#include "filter_lnotes.h" /** Default constructor. */ FilterLNotes::FilterLNotes() : @@ -57,7 +57,7 @@ void FilterLNotes::import(FilterInfo *info) { totalFiles = filenames.count(); inf->setOverall(0); - // See filter_mbox.cxx for better reference. + // See filter_mbox.cpp for better reference. for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) { ++currentFile; @@ -75,7 +75,7 @@ void FilterLNotes::import(FilterInfo *info) { */ void FilterLNotes::ImportLNotes(const TQString& file) { - // See Filter_pmail.cxx for better reference + // See Filter_pmail.cpp for better reference // Format of a Lotus Notes 5 Structured Text Document w form feed // Each email begins with a custom Header Principal: @@ -95,7 +95,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { // Get folder name TQFileInfo filenameInfo( file ); - TQString folder("LNotes-Import/" + filenameInfo.baseName(TRUE)); + TQString folder("LNotes-Import/" + filenameInfo.baseName(true)); inf->setTo(folder); // State machine to read the data in. The fgetc usage is probably terribly slow ... diff --git a/kmailcvt/filter_lnotes.hxx b/kmailcvt/filter_lnotes.h index 430ae83e..bf5cd91c 100644 --- a/kmailcvt/filter_lnotes.hxx +++ b/kmailcvt/filter_lnotes.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_lnotes.hxx - Lotus Notes Structured Text mail import + filter_lnotes.h - Lotus Notes Structured Text mail import ------------------- begin : Wed Feb 16, 2005 copyright : (C) 2005 by Robert Rockers @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_LNOTES_HXX -#define FILTER_LNOTES_HXX +#ifndef FILTER_LNOTES_H +#define FILTER_LNOTES_H -#include "filters.hxx" +#include "filters.h" /**imports Lotus Notes Structured Text Archives and archvies messages into KMail *@author Robert Rockers diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cpp index fded411d..1da632ec 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mailapp.cxx - OS X Mail App import + filter_mailapp.cpp - OS X Mail App import ------------------- copyright : (C) 2004 by Chris Howells email : howells@kde.org @@ -26,7 +26,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_mailapp.hxx" +#include "filter_mailapp.h" FilterMailApp::FilterMailApp() : Filter( i18n("Import From OS X Mail"), diff --git a/kmailcvt/filter_mailapp.hxx b/kmailcvt/filter_mailapp.h index 571f77ff..e562dbf7 100644 --- a/kmailcvt/filter_mailapp.hxx +++ b/kmailcvt/filter_mailapp.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mailapp.hxx - OS X Mail App import + filter_mailapp.h - OS X Mail App import ------------------- copyright : (C) 2004 by Chris Howells email : howells@kde.org @@ -10,10 +10,10 @@ ***************************************************************************/ -#ifndef FILTER_MAILAPP_HXX -#define FILTER_MAILAPP_HXX +#ifndef FILTER_MAILAPP_H +#define FILTER_MAILAPP_H -#include "filters.hxx" +#include "filters.h" /** *imports mbox archives messages into KMail diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cpp index 19afccf2..feb62a51 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mbox.cxx - mbox mail import + filter_mbox.cpp - mbox mail import ------------------- begin : Sat Apr 5 2003 copyright : (C) 2003 by Laurence Anderson @@ -21,7 +21,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_mbox.hxx" +#include "filter_mbox.h" FilterMBox::FilterMBox() : @@ -54,7 +54,7 @@ void FilterMBox::import(FilterInfo *info) info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); - TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); + TQString folderName( "MBOX-" + filenameInfo.baseName(true) ); info->setCurrent(0); info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); diff --git a/kmailcvt/filter_mbox.hxx b/kmailcvt/filter_mbox.h index e1c5e967..f1f376de 100644 --- a/kmailcvt/filter_mbox.hxx +++ b/kmailcvt/filter_mbox.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mbox.hxx - mbox mail import + filter_mbox.h - mbox mail import ------------------- begin : Sat Apr 5 2003 copyright : (C) 2003 by Laurence Anderson @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_MBOX_HXX -#define FILTER_MBOX_HXX +#ifndef FILTER_MBOX_H +#define FILTER_MBOX_H -#include "filters.hxx" +#include "filters.h" /** * imports mbox archives messages into KMail diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cpp index afd96527..476b09d2 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_oe.cxx - Outlook Express mail import + filter_oe.cpp - Outlook Express mail import ------------------- begin : Sat Feb 1 2003 copyright : (C) 2003 by Laurence Anderson @@ -25,7 +25,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_oe.hxx" +#include "filter_oe.h" #define OE4_SIG_1 0x36464d4a #define OE4_SIG_2 0x00010003 @@ -126,7 +126,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) TQ_UINT32 sig_block1, sig_block2; mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { - folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); + folderName = "OE-Import/" + mailfileinfo.baseName(true); info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); mbxImport(info, mailbox); @@ -136,7 +136,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox >> sig_block3 >> sig_block4; if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) { if (sig_block2 == OE5_EMAIL_SIG_2) { - folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); + folderName = "OE-Import/" + mailfileinfo.baseName(true); if(parsedFolder) { TQString _tmpFolder = getFolderName(_nameOfFile); if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder; diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.h index 821aa5df..2a46854f 100644 --- a/kmailcvt/filter_oe.hxx +++ b/kmailcvt/filter_oe.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_oe.hxx - Outlook Express mail import + filter_oe.h - Outlook Express mail import ------------------- begin : Sat Feb 1 2003 copyright : (C) 2003 by Laurence Anderson @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_OE_HXX -#define FILTER_OE_HXX +#ifndef FILTER_OE_H +#define FILTER_OE_H -#include "filters.hxx" +#include "filters.h" /** *imports outlook text messages into KMail diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cpp index 90aef382..ff537695 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.cxx - Opera mail import + filter_opera.cpp - Opera mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -21,7 +21,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_opera.hxx" +#include "filter_opera.h" FilterOpera::FilterOpera() : diff --git a/kmailcvt/filter_opera.hxx b/kmailcvt/filter_opera.h index 27ded4cc..7da80afa 100644 --- a/kmailcvt/filter_opera.hxx +++ b/kmailcvt/filter_opera.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.hxx - Opera mail import + filter_opera.h - Opera mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_OPERA_HXX -#define FILTER_OPERA_HXX +#ifndef FILTER_OPERA_H +#define FILTER_OPERA_H -#include "filters.hxx" +#include "filters.h" /** *imports opera account-archives into KMail diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cpp index 10483d09..bb395918 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.cxx - Outlook mail import + filter_opera.cpp - Outlook mail import ------------------- begin : February 01 2005 copyright : (C) 2005 by Danny Kukawka @@ -22,7 +22,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_outlook.hxx" +#include "filter_outlook.h" FilterOutlook::FilterOutlook() : Filter( i18n("Import Outlook Emails"), diff --git a/kmailcvt/filter_outlook.hxx b/kmailcvt/filter_outlook.h index bad7d5ee..ec762066 100644 --- a/kmailcvt/filter_outlook.hxx +++ b/kmailcvt/filter_outlook.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.hxx - Outlook mail import + filter_opera.h - Outlook mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_OUTLOOK_HXX -#define FILTER_OUTLOOK_HXX +#ifndef FILTER_OUTLOOK_H +#define FILTER_OUTLOOK_H -#include "filters.hxx" +#include "filters.h" /** * imports mails from Outlook pst-files into KMail diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cpp index 9f78b939..01554c87 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPlain.cxx - Plain mail import + FilterPlain.cpp - Plain mail import ------------------- begin : Fri Jun 14 2002 copyright : (C) 2002 by Laurence Anderson @@ -20,7 +20,7 @@ #include <tdefiledialog.h> #include <libgen.h> -#include "filter_plain.hxx" +#include "filter_plain.h" FilterPlain::FilterPlain() : diff --git a/kmailcvt/filter_plain.hxx b/kmailcvt/filter_plain.h index ddd9d494..2319e888 100644 --- a/kmailcvt/filter_plain.hxx +++ b/kmailcvt/filter_plain.h @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPlain.hxx - Plain mail import + FilterPlain.h - Plain mail import ------------------- begin : Fri Jun 24 2002 copyright : (C) 2002 by Laurence Anderson @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_PLAIN_HXX -#define FILTER_PLAIN_HXX +#ifndef FILTER_PLAIN_H +#define FILTER_PLAIN_H -#include "filters.hxx" +#include "filters.h" /** *imports Plain text messages into KMail diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cpp index e48e062d..b45a0be4 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPMail.cxx - Pegasus-Mail import + FilterPMail.cpp - Pegasus-Mail import ------------------- begin : Sat Jan 6 2001 copyright : (C) 2001 by Holger Schurig @@ -24,7 +24,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_pmail.hxx" +#include "filter_pmail.h" FilterPMail::FilterPMail() : diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.h index 664fdcc1..07f62a36 100644 --- a/kmailcvt/filter_pmail.hxx +++ b/kmailcvt/filter_pmail.h @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPMail.hxx - Pegasus-Mail import + FilterPMail.h - Pegasus-Mail import ------------------- begin : Sat Jan 6 2001 copyright : (C) 2001 by Holger Schurig @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#ifndef FILTER_PMAIL_HXX -#define FILTER_PMAIL_HXX +#ifndef FILTER_PMAIL_H +#define FILTER_PMAIL_H #include <tqdir.h> #include <tqvaluelist.h> -#include "filters.hxx" +#include "filters.h" class FilterPMail : public Filter { diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cpp index 1fc008d4..9d8570e3 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_sylpheed.hxx - Sylpheed maildir mail import + filter_sylpheed.h - Sylpheed maildir mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_sylpheed.hxx" +#include "filter_sylpheed.h" #include <config.h> #include <tdelocale.h> @@ -135,7 +135,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) _path = "Sylpheed-Import/"; TQString _tmp = dir.filePath(*mailFile); _tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1); - _path += _tmp.remove( mailDir ,TRUE); + _path += _tmp.remove( mailDir ,true); TQString _info = _path; info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15))); @@ -187,7 +187,7 @@ void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDic TQDataStream stream(&file); - if (Q_BYTE_ORDER == Q_LITTLE_ENDIAN) + if (TQ_BYTE_ORDER == TQ_LITTLE_ENDIAN) stream.setByteOrder(TQDataStream::LittleEndian); diff --git a/kmailcvt/filter_sylpheed.hxx b/kmailcvt/filter_sylpheed.h index fcc3af85..1d92adf0 100644 --- a/kmailcvt/filter_sylpheed.hxx +++ b/kmailcvt/filter_sylpheed.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_sylpheed.hxx - Sylpheed maildir mail import + filter_sylpheed.h - Sylpheed maildir mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -14,12 +14,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef FILTER_SYLPHEED_HXX -#define FILTER_SYLPHEED_HXX +#ifndef FILTER_SYLPHEED_H +#define FILTER_SYLPHEED_H #include <tqdict.h> -#include "filters.hxx" +#include "filters.h" /** * Imports Sylpheed mail folder with maildir format recursively, recreating the folder structure. diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cpp index eaf16461..6a9642a1 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thebat.hxx - TheBat! mail import + filter_thebat.h - TheBat! mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_thebat.hxx" +#include "filter_thebat.h" #include <config.h> @@ -194,7 +194,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) TQString _path = "TheBat-Import/"; TQString _tmp = FileName; _tmp = _tmp.remove(_tmp.length() - 13, 13); - _path += _tmp.remove( mailDir ,TRUE); + _path += _tmp.remove( mailDir ,true); TQString _info = _path; info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14))); info->setTo(_path); diff --git a/kmailcvt/filter_thebat.hxx b/kmailcvt/filter_thebat.h index 7d62018d..ef69c231 100644 --- a/kmailcvt/filter_thebat.hxx +++ b/kmailcvt/filter_thebat.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thebat.hxx - TheBat! mail import + filter_thebat.h - TheBat! mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -14,10 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef FILTER_THEBAT_HXX -#define FILTER_THEBAT_HXX +#ifndef FILTER_THEBAT_H +#define FILTER_THEBAT_H -#include "filters.hxx" +#include "filters.h" /** * Imports The Bat! mail folder recursively, recreating the folder structure. diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cpp index 50f6355f..69aacca4 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thunderbird.cxx - Thunderbird mail import + filter_thunderbird.cpp - Thunderbird mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_thunderbird.hxx" +#include "filter_thunderbird.h" #include <config.h> #include <tdelocale.h> @@ -209,7 +209,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c if(!targetDir.isNull()) { if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); - destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName; + destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(true);// mboxName; } else { destFolder = "Thunderbird-Import/" + rootDir; if(destFolder.contains(".sbd")) diff --git a/kmailcvt/filter_thunderbird.hxx b/kmailcvt/filter_thunderbird.h index d3bcd7f9..333e2380 100644 --- a/kmailcvt/filter_thunderbird.hxx +++ b/kmailcvt/filter_thunderbird.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thunderbird.hxx - Thunderbird mail import + filter_thunderbird.h - Thunderbird mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_THUNDERBIRD_HXX -#define FILTER_THUNDERBIRD_HXX +#ifndef FILTER_THUNDERBIRD_H +#define FILTER_THUNDERBIRD_H -#include "filters.hxx" +#include "filters.h" /** * Imports Thinderbird mail folder recursively, keeping the folder structure. diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cpp index d7af7705..0b5c9937 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filters.cxx - description + filters.cpp - description ------------------- begin : Fri Jun 30 2000 copyright : (C) 2000 by Hans Dijkema @@ -22,7 +22,7 @@ #include <kurl.h> #include <kdebug.h> -#include "filters.hxx" +#include "filters.h" #include "kmailcvt.h" @@ -65,13 +65,13 @@ void FilterInfo::setTo( const TQString& to ) void FilterInfo::setCurrent( const TQString& current ) { m_dlg->_current->setText( current ); - kapp->processEvents(); + tdeApp->processEvents(); } void FilterInfo::setCurrent( int percent ) { m_dlg->_done_current->setProgress( percent ); - kapp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button + tdeApp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button } void FilterInfo::setOverall( int percent ) @@ -84,7 +84,7 @@ void FilterInfo::addLog( const TQString& log ) m_dlg->_log->insertItem( log ); m_dlg->_log->setCurrentItem( m_dlg->_log->count() - 1 ); m_dlg->_log->centerCurrentItem(); - kapp->processEvents(); + tdeApp->processEvents(); } void FilterInfo::clear() @@ -135,7 +135,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, KURL msgURL; msgURL.setPath( msgPath ); - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags ); @@ -171,7 +171,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName KURL msgURL; msgURL.setPath( msgPath ); - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags ); @@ -199,7 +199,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName void Filter::showKMailImportArchiveDialog( FilterInfo* info ) { - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" ); @@ -214,5 +214,3 @@ bool Filter::needsSecondPage() { return true; } - -// vim: ts=2 sw=2 et diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.h index d6c33f42..f9261bcb 100644 --- a/kmailcvt/filters.hxx +++ b/kmailcvt/filters.h @@ -1,5 +1,5 @@ /*************************************************************************** - filters.hxx - description + filters.h - description ------------------- begin : Fri Jun 30 2000 copyright : (C) 2000 by Hans Dijkema @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef FILTERS_HXX -#define FILTERS_HXX +#ifndef FILTERS_H +#define FILTERS_H #ifndef MAX_LINE #define MAX_LINE 4096 diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp index 90da2e9c..bc6d784d 100644 --- a/kmailcvt/kimportpage.cpp +++ b/kmailcvt/kimportpage.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlabel.h> #include "kimportpage.h" diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h index 9541b5d4..1b9fcdc5 100644 --- a/kmailcvt/kimportpage.h +++ b/kmailcvt/kimportpage.h @@ -21,7 +21,7 @@ #include "kimportpagedlg.h" class KImportPage : public KImportPageDlg { - Q_OBJECT + TQ_OBJECT public: KImportPage(TQWidget *parent=0, const char *name=0); diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index d34e0641..6ae6982d 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -20,7 +20,7 @@ #include <dcopclient.h> #include <dcopref.h> #include <kdebug.h> -#include "filters.hxx" +#include "filters.h" KMailCVT::KMailCVT(TQWidget *parent, const char *name) : KWizard(parent, name, true) { @@ -40,7 +40,7 @@ KMailCVT::~KMailCVT() { } void KMailCVT::endImport() { - if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) ) TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", TQString(), TQString(), TQString()); diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h index 7253d5ac..0f6704b0 100644 --- a/kmailcvt/kmailcvt.h +++ b/kmailcvt/kmailcvt.h @@ -26,7 +26,7 @@ /** KMailCVT is the base class of the project */ class KMailCVT : public KWizard { - Q_OBJECT + TQ_OBJECT public: KMailCVT(TQWidget* parent=0, const char *name=0); diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index 7d97fcfd..f121ff77 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -15,35 +15,35 @@ * * ***************************************************************************/ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextedit.h> #include <tqcheckbox.h> #include <tdelocale.h> -#include "filters.hxx" +#include "filters.h" -#include "filter_mbox.hxx" -#include "filter_oe.hxx" -#include "filter_outlook.hxx" -#include "filter_pmail.hxx" -#include "filter_plain.hxx" -#include "filter_evolution.hxx" -#include "filter_mailapp.hxx" -#include "filter_evolution_v2.hxx" -#include "filter_opera.hxx" -#include "filter_thunderbird.hxx" -#include "filter_kmail_maildir.hxx" -#include "filter_kmail_archive.hxx" -#include "filter_sylpheed.hxx" -#include "filter_thebat.hxx" -#include "filter_lnotes.hxx" +#include "filter_mbox.h" +#include "filter_oe.h" +#include "filter_outlook.h" +#include "filter_pmail.h" +#include "filter_plain.h" +#include "filter_evolution.h" +#include "filter_mailapp.h" +#include "filter_evolution_v2.h" +#include "filter_opera.h" +#include "filter_thunderbird.h" +#include "filter_kmail_maildir.h" +#include "filter_kmail_archive.h" +#include "filter_sylpheed.h" +#include "filter_thebat.h" +#include "filter_lnotes.h" #include "kselfilterpage.h" KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); - mFilterList.setAutoDelete( TRUE ); - connect(mFilterCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(filterSelected(int))); + mFilterList.setAutoDelete( true ); + connect(mFilterCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(filterSelected(int))); // Add new filters below. If this annoys you, please rewrite the stuff to use a factory. // The former approach was overengineered and only worked around problems in the design diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h index 127dc816..1dc208e6 100644 --- a/kmailcvt/kselfilterpage.h +++ b/kmailcvt/kselfilterpage.h @@ -24,7 +24,7 @@ class Filter; template <class T> class TQPtrList; class KSelFilterPage : public KSelFilterPageDlg { - Q_OBJECT + TQ_OBJECT public: KSelFilterPage(TQWidget *parent=0, const char *name=0); |