diff options
Diffstat (limited to 'akregator/src/mk4storage')
19 files changed, 26 insertions, 334 deletions
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 501b8b26..8a4af99c 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace Akregator { namespace Backend { diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 160c4bad..edd5f861 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -1686,5 +1686,3 @@ ALSO LISTED IN THE RELEASE HISTORY Moves do not involve any data copying w.r.t. subviews and memo's. The old release history is at http://www.equi4.com/metakit/history.html - -# vim: tw=72 diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 21edd0fc..5538acc0 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -55,9 +55,7 @@ INSTALLATION All platform builds and language bindings are designed to work from a single common "builds/" directory. Where possible, that is - it turns out to be -impossible to keep build side-effects limited to *just* this directory -(CodeWarrior can't be told where to place its temp data, and Visual C++ still -alters a few files next to the project ".dsw" file, to name two offenders). +impossible to keep build side-effects limited to *just* this directory. UNIX @@ -86,7 +84,7 @@ WINDOWS There is a "win/" directory which contains subdirectories for a number of compiler systems. Metakit has been built with many different compilers - in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima), + in the past (Microsoft, Watcom, Symantec, Optima), only a few are maintained (there are 12 configurations for MSVC6 alone!). The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects @@ -98,14 +96,6 @@ WINDOWS To build with STL containers and strings under MSVC, define "q4_STD". To build with MFC containers and strings under MSVC, define "q4_MFC". - The Metrowerks Codewarrior project is in the "mac/" directory, and can be - used to build both Mac and Windows versions (on either Mac *or* Windows). - The core libraries are built with "mac/cw5.mcp", demos / tests are built - with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp". - - The Borland C++ Builder projects have not yet been incorporated in this - release, but the "KitViewer" application is an example of how to use BCB. - The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the unix autoconf system, and must be launched as described above for UNIX. I have upgraded to the latest development of libtool to be able to build @@ -116,14 +106,6 @@ WINDOWS efficiency on x86 hardware: "-O2 -m486 -malign-loops=2 -malign-jumps=2". I have not yet tried this myself, but am passing on the tip. -MACINTOSH CLASSIC - - The Mac version requires Metrowerks CodeWarrior 6. See the info above - in the Windows section (MWCW is multi-platform). The projects are all - located in the "mac/" folder, which is also where MWCW will place its own - "... Data" folders with intermediate results. As with all other setups, - final results are made to end up in the "builds/" directory. - LICENSE AND COPYRIGHT STATEMENT =============================== diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h index 33016dba..2b311246 100644 --- a/akregator/src/mk4storage/metakit/include/mk4.h +++ b/akregator/src/mk4storage/metakit/include/mk4.h @@ -114,19 +114,6 @@ //--------------------------------------------------------------------------- - // Borland C++ and C++ Builder -#if defined (__BORLANDC__) - // by default, if runtime is linked as a DLL, then so is Metakit -#if defined (_RTLDLL) && !defined (q4_KITDLL) -#define q4_KITDLL 1 -#endif - - // Borland 5.0 supports the bool datatype -#if __BORLANDC__ >= 0x500 -#define q4_BOOL 1 -#endif -#endif // __BORLANDC__ - // IRIX supports the bool datatype // define before gcc to cover both the gcc and MipsPRO compiler #if defined (sgi) @@ -153,17 +140,6 @@ #endif #endif - // Metrowerks CodeWarrior -#if defined (__MWERKS__) -#if __option(bool) -#define q4_BOOL 1 // bool datatype is optionally supported - // undef, these conflict with c4_Storage::c4_Storage overloading -#undef bool -#undef true -#undef false -#endif -#endif - // Microsoft Visual C++ #if defined (_MSC_VER) // MSVC 5.0 supports the bool datatype, MSVC 4.x has no namespaces diff --git a/akregator/src/mk4storage/metakit/src/Makefile.am b/akregator/src/mk4storage/metakit/src/Makefile.am index e428fe93..acd0db89 100644 --- a/akregator/src/mk4storage/metakit/src/Makefile.am +++ b/akregator/src/mk4storage/metakit/src/Makefile.am @@ -2,8 +2,8 @@ INCLUDES = -I$(srcdir)/../include noinst_LTLIBRARIES = libmetakitlocal.la -noinst_HEADERS = borc.h column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ - msvc.h mwcw.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h +noinst_HEADERS = column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ + msvc.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h libmetakitlocal_la_SOURCES = column.cpp custom.cpp derived.cpp field.cpp fileio.cpp format.cpp handler.cpp persist.cpp remap.cpp std.cpp store.cpp \ string.cpp table.cpp univ.cpp view.cpp viewx.cpp diff --git a/akregator/src/mk4storage/metakit/src/borc.h b/akregator/src/mk4storage/metakit/src/borc.h deleted file mode 100644 index 2b881fc9..00000000 --- a/akregator/src/mk4storage/metakit/src/borc.h +++ /dev/null @@ -1,33 +0,0 @@ -// borc.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Borland C++ - */ - -#define q4_BORC 1 - - // get rid of several common warning messages -#if !q4_STRICT -#pragma warn -aus // 'identifier' is assigned a value that is never used -#pragma warn -par // Parameter 'parameter' is never used. -#pragma warn -sig // Conversion may lose significant digits -#pragma warn -use // 'identifier' declared but never used -#endif - -#if __BORLANDC__ >= 0x500 -#define q4_BOOL 1 // supports the bool datatype - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#if !defined (q4_EXPORT) -#define q4_EXPORT 1 // requires export/import specifiers -#endif - -#if defined (__MT__) -#define q4_MULTI 1 // uses multi-threading -#endif diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index 2e8f24d1..1e4efb44 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -1212,8 +1212,6 @@ void c4_ColOfInts::SetAccessWidth(int bits_) if (l2bp1 > 4 && (_mustFlip || ((Persist() != 0) && Strategy()._bytesFlipped))) l2bp1 += 3; // switch to the trailing entries for byte flipping - // Metrowerks Codewarrior 11 is dumb, it requires the "&c4_ColOfInts::" - static tGetter gTab [] = { &c4_ColOfInts::Get_0b, // 0: 0 bits/entry diff --git a/akregator/src/mk4storage/metakit/src/fileio.cpp b/akregator/src/mk4storage/metakit/src/fileio.cpp index 28ff7dca..8e69ede7 100644 --- a/akregator/src/mk4storage/metakit/src/fileio.cpp +++ b/akregator/src/mk4storage/metakit/src/fileio.cpp @@ -41,127 +41,6 @@ #endif ///////////////////////////////////////////////////////////////////////////// -// -// The "Carbon" version of a build on Macintosh supports running under -// either MacOS 7..9 (which has no mmap), or MacOS X (which has mmap). -// The logic below was adapted from a contribution by Paul Snively, it -// decides at run time which case it is, and switches I/O calls to match. - -#if defined (q4_CARBON) && q4_CARBON -//#if q4_MAC && !defined (__MACH__) && (!q4_MWCW || __MWERKS__ >= 0x3000) -#undef HAVE_MMAP -#define HAVE_MMAP 1 - -#include <CFBundle.h> -#include <Folders.h> - -#define PROT_NONE 0x00 -#define PROT_READ 0x01 -#define PROT_WRITE 0x02 -#define PROT_EXEC 0x04 - -#define MAP_SHARED 0x0001 -#define MAP_PRIVATE 0x0002 - -#define MAP_FIXED 0x0010 -#define MAP_RENAME 0x0020 -#define MAP_NORESERVE 0x0040 -#define MAP_INHERIT 0x0080 -#define MAP_NOEXTEND 0x0100 -#define MAP_HASSEMAPHORE 0x0200 - -typedef unsigned long t4_u32; - -static t4_u32 sfwRefCount = 0; -static CFBundleRef systemFramework = NULL; - -static char* fake_mmap(char*, t4_u32, int, int, int, long long) - { return (char*) -1L; } -static int fake_munmap(char*, t4_u32) - { return 0; } - -static FILE* (*my_fopen)(const char*,const char*) = fopen; -static int (*my_fclose)(FILE*) = fclose; -static long (*my_ftell)(FILE*) = ftell; -static int (*my_fseek)(FILE*,long,int) = fseek; -static t4_u32 (*my_fread)(void* ptr,t4_u32,t4_u32,FILE*) = fread; -static t4_u32 (*my_fwrite)(const void* ptr,t4_u32,t4_u32,FILE*) = fwrite; -static int (*my_ferror)(FILE*) = ferror; -static int (*my_fflush)(FILE*) = fflush; -static int (*my_fileno)(FILE*) = fileno; -static char* (*my_mmap)(char*,t4_u32,int,int,int,long long) = fake_mmap; -static int (*my_munmap)(char*,t4_u32) = fake_munmap; - -static void InitializeIO() -{ - if (sfwRefCount++) return; // race condition, infinitesimal risk - - FSRef theRef; - if (FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, - false, &theRef) == noErr) { - CFURLRef fw = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &theRef); - if (fw) { - CFURLRef bd = - CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, - fw, CFSTR("System.framework"), false); - CFRelease(fw); - if (bd) { - systemFramework = CFBundleCreate(kCFAllocatorSystemDefault, bd); - CFRelease(bd); - } - } - if (!systemFramework || !CFBundleLoadExecutable(systemFramework)) - return; -#define F(x) CFBundleGetFunctionPointerForName(systemFramework, CFSTR(#x)) - my_fopen = (FILE* (*)(const char*,const char*)) F(fopen); - my_fclose = (int (*)(FILE*)) F(fclose); - my_ftell = (long (*)(FILE*)) F(ftell); - my_fseek = (int (*)(FILE*,long,int)) F(fseek); - my_fread = (t4_u32 (*)(void* ptr,t4_u32,t4_u32,FILE*)) F(fread); - my_fwrite = (t4_u32 (*)(const void* ptr,t4_u32,t4_u32,FILE*)) F(fwrite); - my_ferror = (int (*)(FILE*)) F(ferror); - my_fflush = (int (*)(FILE*)) F(fflush); - my_fileno = (int (*)(FILE*)) F(fileno); - my_mmap = (char* (*)(char*,t4_u32,int,int,int,long long)) F(mmap); - my_munmap = (int (*)(char*,t4_u32)) F(munmap); -#undef F - d4_assert(my_fopen && my_fclose && my_ftell && my_fseek && - my_fread && my_fwrite && my_ferror && my_fflush && - my_fileno && my_mmap && my_munmap); - } -} - -static void FinalizeIO() -{ - if (--sfwRefCount) return; // race condition, infinitesimal risk - - if (systemFramework) { - CFBundleUnloadExecutable(systemFramework); - CFRelease(systemFramework); - systemFramework = 0; - } -} - -#define fopen my_fopen -#define fclose my_fclose -#define ftell my_ftell -#define fseek my_fseek -#define fread my_fread -#define fwrite my_fwrite -#define ferror my_ferror -#define fflush my_fflush -#define fileno my_fileno -#define mmap my_mmap -#define munmap my_munmap - -#else - -#define InitializeIO() -#define FinalizeIO() - -#endif - -///////////////////////////////////////////////////////////////////////////// #if q4_CHECK #include <stdlib.h> @@ -209,7 +88,6 @@ bool c4_FileStream::Write(const void* buffer_, int length_) c4_FileStrategy::c4_FileStrategy (FILE* file_) : _file (file_), _cleanup (0) { - InitializeIO(); ResetFileMapping(); } @@ -222,7 +100,6 @@ c4_FileStrategy::~c4_FileStrategy () fclose(_cleanup); d4_assert(_mapStart == 0); - FinalizeIO(); } bool c4_FileStrategy::IsValid() const @@ -319,7 +196,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) { d4_assert(!_file); -#if q4_WIN32 && !q4_BORC && !q4_WINCE +#if q4_WIN32 && !q4_WINCE int flags = _O_BINARY | _O_NOINHERIT | (mode_ > 0 ? _O_RDWR : _O_RDONLY); int fd = _open(fname_, flags); if (fd != -1) @@ -330,7 +207,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) if (_file != 0) fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); #endif //q4_UNIX -#endif //q4_WIN32 && !q4_BORC && !q4_WINCE +#endif //q4_WIN32 && !q4_WINCE if (_file != 0) { ResetFileMapping(); @@ -338,7 +215,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) } if (mode_ > 0) { -#if q4_WIN32 && !q4_BORC && !q4_WINCE +#if q4_WIN32 && !q4_WINCE fd = _open(fname_, flags | _O_CREAT, _S_IREAD | _S_IWRITE); if (fd != -1) _cleanup = _file = _fdopen(fd, "w+b"); @@ -348,7 +225,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) if (_file != 0) fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); #endif //q4_UNIX -#endif //q4_WIN32 && !q4_BORC && !q4_WINCE +#endif //q4_WIN32 && !q4_WINCE } //d4_assert(_file != 0); diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h index 2f8648b8..4f62551f 100644 --- a/akregator/src/mk4storage/metakit/src/header.h +++ b/akregator/src/mk4storage/metakit/src/header.h @@ -91,14 +91,8 @@ // Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also // add '#include "file.h"' to force inclusion of a header file right here. -#if defined (__BORLANDC__) // Borland C++ -#include "borc.h" -#elif defined (__DECCXX) // DEC C++ -#define q4_DECC 1 -#elif defined (__GNUC__) // GNU C++ +#if defined (__GNUC__) // GNU C++ #include "gnuc.h" -#elif defined (__MWERKS__) // Metrowerks CodeWarrior C++ -#include "mwcw.h" #elif defined (_MSC_VER) // Microsoft Visual C++ #include "msvc.h" #elif defined (__SC__) // Symantec C++ diff --git a/akregator/src/mk4storage/metakit/src/mwcw.h b/akregator/src/mk4storage/metakit/src/mwcw.h deleted file mode 100644 index 1c863b96..00000000 --- a/akregator/src/mk4storage/metakit/src/mwcw.h +++ /dev/null @@ -1,31 +0,0 @@ -// mwcw.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Metrowerks CodeWarrior - */ - -#define q4_MWCW 1 - -///////////////////////////////////////////////////////////////////////////// - -#if q4_68K -#if !__option(IEEEdoubles) -#error Cannot build Metakit with 10-byte doubles -#endif -#endif - -#if __option(bool) -#define q4_BOOL 1 - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#undef _MSC_VER - -#pragma export on - -///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/string.cpp b/akregator/src/mk4storage/metakit/src/string.cpp index 33c8836c..e5d140ab 100644 --- a/akregator/src/mk4storage/metakit/src/string.cpp +++ b/akregator/src/mk4storage/metakit/src/string.cpp @@ -34,7 +34,7 @@ ///////////////////////////////////////////////////////////////////////////// -#if q4_MSVC || q4_WATC || q4_BORC || (q4_MWCW && __MWERKS__ < 0x3000) +#if q4_MSVC || q4_WATC #define strcasecmp stricmp #elif q4_WINCE diff --git a/akregator/src/mk4storage/metakit/src/univ.cpp b/akregator/src/mk4storage/metakit/src/univ.cpp index 81a73015..08a4ba1a 100644 --- a/akregator/src/mk4storage/metakit/src/univ.cpp +++ b/akregator/src/mk4storage/metakit/src/univ.cpp @@ -21,8 +21,7 @@ #if q4_UNIX || __MINGW32__ #define _strdup strdup -#elif !q4_BORC && !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \ - !(q4_MWCW && __MWERKS__ >= 0x3000) +#elif !q4_MSVC && !q4_WATC static char* _strdup(const char* p) { @@ -35,34 +34,6 @@ #endif - // The Borland C++ RTL does not want file handle objects to cross - // DLL boundaries, so we add special fopen/fclose hooks to this DLL. - -#if q4_BORC - #include <stdio.h> - -#if q4_WIN32 - __declspec(dllexport) FILE* -#else - FILE* __export -#endif - f4_FileOpenInDLL(const char* name_, const char* mode_) - { - return fopen(name_, mode_); - } - -#if q4_WIN32 - __declspec(dllexport) -#else - int __export -#endif - f4_FileCloseInDLL(FILE* file_) - { - return fclose(file_); - } - -#endif - ///////////////////////////////////////////////////////////////////////////// // c4_BaseArray diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 0725f57f..6724d338 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -15,11 +15,6 @@ #endif #endif -#if __profile__ - #define q4_MWCW_PROFILER 1 - #include <profiler.h> -#endif - #if q4_NOTHROW const char* msg; #endif @@ -56,10 +51,6 @@ main() DebugNewForgetLeaks(); #endif -#if q4_MWCW_PROFILER - if (!ProfilerInit(collectDetailed, bestTimeBase, 20, 5)) - { -#endif TestBasics1(); TestBasics2(); TestNotify(); @@ -77,12 +68,6 @@ main() TestMapped(); TestLimits(); -#if q4_MWCW_PROFILER - ProfilerDump("\pRegress.prof"); - ProfilerTerm(); - } -#endif - #if defined (_DEBUG) fputs("\nPress return... ", stderr); getchar(); @@ -226,18 +211,14 @@ int StartTest(int mask_, const char* name_, const char* desc_) #if q4_MFC && defined(_DEBUG) TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); - #endif + fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); return false; } #if q4_MFC && defined(_DEBUG) TRACE("%s - %s\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %s\n", name_, desc_); - #endif + fprintf(stderr, "%s - %s\n", name_, desc_); char buffer [50]; sprintf(buffer, "%s%s.txt", TESTDIR, name_); @@ -254,16 +235,12 @@ int StartTest(int mask_, const char* name_, const char* desc_) void CatchMsg(const char* msg) { - #if !q4_MWCW_PROFILER - fprintf(stderr, "\t%s\n", msg); - #endif + fprintf(stderr, "\t%s\n", msg); printf("*** %s ***\n", msg); } void CatchOther() { - #if !q4_MWCW_PROFILER - fputs("\tException!\n", stderr); - #endif + fputs("\tException!\n", stderr); printf("*** Exception ***\n"); } diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h index b5611e57..1574bc0d 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.h +++ b/akregator/src/mk4storage/metakit/tests/regress.h @@ -132,14 +132,3 @@ extern void TestStores2(); extern void TestStores3(); extern void TestStores4(); extern void TestStores5(); - - // The Borland C++ RTL does not want file handle objects to cross - // DLL boundaries, so we use special fopen/fclose hooks in the DLL. - -#if defined (__BORLANDC__) // this assumes Metakit is in a DLL! -extern FILE* f4_FileOpenInDLL(const char*, const char*); -extern int f4_FileCloseInDLL(FILE*); - -#define fopen f4_FileOpenInDLL -#define fclose f4_FileCloseInDLL -#endif diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index c028b156..09b4c2de 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -52,7 +52,7 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase() label->setEnabled(true); } filereq->setURL(MK4Config::archivePath()); - connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool))); + connect(cbUseDefault, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChkBoxUseDefault(bool))); } diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h index 194295de..797ad5c0 100644 --- a/akregator/src/mk4storage/mk4confwidget.h +++ b/akregator/src/mk4storage/mk4confwidget.h @@ -32,7 +32,7 @@ namespace Backend { class MK4ConfWidget : public MK4ConfWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index c5c837a5..9eea1d7d 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -104,9 +104,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -132,9 +129,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -170,9 +164,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 1e104bd3..9c504c2f 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -33,7 +33,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace Akregator { namespace Backend { @@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty() { d->modified = true; // commit changes after 3 seconds - TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit())); + TQTimer::singleShot(3000, this, TQ_SLOT(slotCommit())); } } diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h index d6c4a59c..8fcde1ea 100644 --- a/akregator/src/mk4storage/storagemk4impl.h +++ b/akregator/src/mk4storage/storagemk4impl.h @@ -36,7 +36,7 @@ namespace Backend { */ class StorageMK4Impl : public Storage { - Q_OBJECT + TQ_OBJECT public: |