summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------admin0
-rw-r--r--kdvi/squeeze.c3
-rw-r--r--ksvg/impl/libs/libtext2path/libtext2path.spec41
-rw-r--r--kuickshow/kuickshow.spec69
-rw-r--r--kviewshell/plugins/djvu/djvurenderer.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/Arrays.h12
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GContainer.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GException.h3
-rw-r--r--kviewshell/plugins/djvu/libdjvu/configure.in.in2
-rw-r--r--tdefile-plugins/bmp/tdefile_bmp.cpp5
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp10
-rw-r--r--tdefile-plugins/ico/tdefile_ico.cpp6
-rw-r--r--tdefile-plugins/tga/tdefile_tga.cpp6
-rw-r--r--tdefile-plugins/xbm/tdefile_xbm.cpp4
14 files changed, 15 insertions, 150 deletions
diff --git a/admin b/admin
-Subproject afaec96a4101e0771fb9969690e20ce5f6df90e
+Subproject c5527c8d97c5c97320ea07d88590ff2c43c76bc
diff --git a/kdvi/squeeze.c b/kdvi/squeeze.c
index d0e2515f..90268241 100644
--- a/kdvi/squeeze.c
+++ b/kdvi/squeeze.c
@@ -35,7 +35,9 @@
* as a constant string.
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+
#define LINELENGTH (72)
#define BUFLENGTH (1000)
#undef putchar
@@ -107,7 +109,6 @@ int main(int argc, char *argv[])
int c ;
char *b ;
char seeking ;
- extern void exit() ;
if (argc > 3 || (in=(argc < 2 ? stdin : fopen(argv[1], "r")))==NULL ||
(out=(argc < 3 ? stdout : fopen(argv[2], "w")))==NULL) {
diff --git a/ksvg/impl/libs/libtext2path/libtext2path.spec b/ksvg/impl/libs/libtext2path/libtext2path.spec
deleted file mode 100644
index e0c217bd..00000000
--- a/ksvg/impl/libs/libtext2path/libtext2path.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-%define distversion %( perl -e 'Creating /home/nikoz/Projects/libtext2path/libtext2path.spec...=\<\>;/(\d+)\.(\d)\.?(\d)?/; print "".(||0)' /etc/*-release)
-Name: libtext2path
-Summary: libtext2path -- Some description
-Version: 0.1
-Release: %{_vendor}_%{distversion}
-Copyright: GPL
-Group: X11/KDE/Utilities
-Source: ftp://ftp.kde.org/pub/kde/unstable/apps/utils/%{name}-%{version}.tar.gz
-Packager: Nikolas Zimmermann <[email protected]>
-BuildRoot: /tmp/%{name}-%{version}
-Prefix: /usr/kde/cvs
-
-%description
-A long description
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -n %{name}-%{version}
-CFLAGS="" CXXFLAGS="" ./configure --disable-debug --enable-final --prefix=%{prefix}
-
-%build
-# Setup for parallel builds
-numprocs=1
-if [ "" = "0" ]; then
- numprocs=1
-fi
-
-make -j
-
-%install
-make install-strip DESTDIR=$RPM_BUILD_ROOT
-
-cd
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list
-find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list
-
-%clean
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-rm -rf $RPM_BUILD_DIR/-master.list
-
-%files -f $RPM_BUILD_DIR/%{name}-master.list
diff --git a/kuickshow/kuickshow.spec b/kuickshow/kuickshow.spec
deleted file mode 100644
index 2e2565f1..00000000
--- a/kuickshow/kuickshow.spec
+++ /dev/null
@@ -1,69 +0,0 @@
-%define version 0.8.5
-%define release 1
-%define serial 1
-%define prefix /opt/trinity
-
-Name: kuickshow
-Summary: KuickShow -- A very fast image viewer/browser
-Version: %{version}
-Release: %{release}
-Serial: %{serial}
-Source: http://devel-home.kde.org/~pfeiffer/kuickshow/kuickshow-%{version}.tar.gz
-URL: http://devel-home.kde.org/~pfeiffer/kuickshow/
-Copyright: GPL
-Packager: Carsten Pfeiffer <[email protected]>
-Group: X11/KDE/Graphics
-BuildRoot: /tmp/kuickshow-%{version}-root
-Prefix: %{prefix}
-
-%description
-KuickShow is a very fast image viewer, that lets you easily
-browse large galleries. A builtin filebrowser and manager
-is also available. Usage is somewhat inspired by ACDSee.
-It supports many fileformats, e.g. jpeg, gif, png, psd, bmp,
-tiff, xpm, xbm, xcf, eim, ...
-
-KuickShow has a nice user interface, that allows you to browse large amounts
-of images in a short time. It can zoom, mirror, rotate images, adjust
-brightness, contrast and gamma and can do a slideshow, of course.
-It is fully configurable through dialogs.
-
-Besides that, it offers a nice filebrowser with basic filemanager capabilities
-like renaming, deleting, creating directories, ...
-
-Install with '--prefix $TDEDIR' unless you have the tde-config program.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup -n kuickshow-%{version}
-
-%build
-PREFIX=""
-which tde-config || PREFIX=%{prefix}
-if test -z "$PREFIX"; then
- PREFIX=`tde-config --prefix`
-fi
-
-export TDEDIR="$PREFIX"
-CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -pipe" LDFLAGS=-s ./configure --prefix="$PREFIX" --enable-final --disable-debug
-mkdir -p $RPM_BUILD_ROOT
-make
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-cd $RPM_BUILD_ROOT
-
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
-
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm -f $RPM_BUILD_DIR/file.list.%{name}
-
-%files -f ../file.list.%{name}
-
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index c9e52c1e..2bac1743 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -27,7 +27,7 @@
#include <tqfileinfo.h>
#include <tqimage.h>
#include <tqpainter.h>
-#include <kapp.h>
+#include <tdeapplication.h>
#include "GBitmap.h"
#include "BSByteStream.h"
diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h
index 2e16520c..ca0b1771 100644
--- a/kviewshell/plugins/djvu/libdjvu/Arrays.h
+++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h
@@ -478,10 +478,8 @@ public:
subscript range, you must stop using the pointers returned by prior
invocation of this conversion operator. */
operator const TYPE* () const;
-
-#ifndef __MWERKS__ //MCW can't compile
operator const TYPE* ();
-#endif
+
/** Insert new elements into an array. This function inserts
#howmany# elements at position #n# into the array. The initial value #val#
is copied into the new elements. All array elements previously located at subscripts
@@ -528,14 +526,12 @@ ArrayBaseT<TYPE>::operator TYPE* ()
return &((TYPE *) rep->data)[-rep->minlo];
}
-#ifndef __MWERKS__ //MCW can't compile
template <class TYPE> inline
ArrayBaseT<TYPE>::operator const TYPE* ()
{
const ArrayRep * rep=(const ArrayRep *) get();
return &((const TYPE *) rep->data)[-rep->minlo];
}
-#endif
template <class TYPE> inline
ArrayBaseT<TYPE>::operator const TYPE* () const
@@ -903,11 +899,7 @@ public:
const GP<TYPE>& operator[](int n) const;
// -- CONVERSION
operator GP<TYPE>* ();
-
-#ifndef __MWERKS__ //MCW can't compile
operator const GP<TYPE>* ();
-#endif
-
operator const GP<TYPE>* () const;
// -- ALTERATION
void ins(int n, const GP<TYPE> &val, unsigned int howmany=1);
@@ -952,13 +944,11 @@ inline DPArray<TYPE>::operator GP<TYPE>* ()
return (GP<TYPE> *) DArray<GPBase>::operator GPBase*();
}
-#ifndef __MWERKS__ //MCW can't compile
template<class TYPE>
inline DPArray<TYPE>::operator const GP<TYPE>* ()
{
return (const GP<TYPE> *) DArray<GPBase>::operator const GPBase*();
}
-#endif
template<class TYPE>
inline DPArray<TYPE>::operator const GP<TYPE>* () const
diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h
index 9a298b04..5b55b15d 100644
--- a/kviewshell/plugins/djvu/libdjvu/GContainer.h
+++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h
@@ -96,8 +96,6 @@ namespace DJVU {
#define GCONTAINER_NO_MEMBER_TEMPLATES 1
#elif defined(_MSC_VER) && !defined(__ICL)
#define GCONTAINER_NO_MEMBER_TEMPLATES 1
-#elif defined(__MWERKS__)
-#define GCONTAINER_NO_MEMBER_TEMPLATES 1
#else
#define GCONTAINER_NO_MEMBER_TEMPLATES 0
#endif
diff --git a/kviewshell/plugins/djvu/libdjvu/GException.h b/kviewshell/plugins/djvu/libdjvu/GException.h
index 822b668e..41a8b9a8 100644
--- a/kviewshell/plugins/djvu/libdjvu/GException.h
+++ b/kviewshell/plugins/djvu/libdjvu/GException.h
@@ -229,9 +229,6 @@ private:
#if defined(_MSC_VER)
#define CPP_SUPPORTS_EXCEPTIONS
#endif
-#if defined(__MWERKS__)
-#define CPP_SUPPORTS_EXCEPTIONS
-#endif
#if defined(__EXCEPTIONS)
#define CPP_SUPPORTS_EXCEPTIONS
#endif
diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in
index 05cf6bc5..88cd71bc 100644
--- a/kviewshell/plugins/djvu/libdjvu/configure.in.in
+++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in
@@ -335,7 +335,7 @@ if test "x$acx_pthread_ok" = xyes; then
flag=no
case "${host_cpu}-${host_os}" in
*-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
- *solaris* | alpha*-osf*) flag="-D_REENTRANT";;
+ *solaris*) flag="-D_REENTRANT";;
esac
AC_MSG_RESULT(${flag})
if test "x$flag" != xno; then
diff --git a/tdefile-plugins/bmp/tdefile_bmp.cpp b/tdefile-plugins/bmp/tdefile_bmp.cpp
index 5349edb0..90784379 100644
--- a/tdefile-plugins/bmp/tdefile_bmp.cpp
+++ b/tdefile-plugins/bmp/tdefile_bmp.cpp
@@ -32,12 +32,7 @@
#include <tqfile.h>
#include <tqdatetime.h>
-#if !defined(__osf__)
#include <inttypes.h>
-#else
-typedef unsigned long uint32_t;
-typedef unsigned short uint16_t;
-#endif
typedef KGenericFactory<KBmpPlugin> BmpFactory;
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
index 54f198e9..a2463362 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
@@ -124,7 +124,11 @@ TQImage Page::renderToImage(double xres, double yres, bool doLinks) const
TQString Page::getText(const Rectangle &r) const
{
TextOutputDev *output_dev;
+# if (POPPLER_VERSION_C >= 25001000)
+ GooString s;
+# else
GooString *s;
+# endif
const PDFRectangle *rect;
TQString result;
::Page *p;
@@ -151,10 +155,16 @@ TQString Page::getText(const Rectangle &r) const
s = output_dev->getText(r.m_x1, y1, r.m_x2, y2);
}
+# if (POPPLER_VERSION_C >= 25001000)
+ result = TQString::fromUtf8(s.GOO_GET_CSTR());
+# else
result = TQString::fromUtf8(s->GOO_GET_CSTR());
+# endif
delete output_dev;
+# if (POPPLER_VERSION_C < 25001000)
delete s;
+# endif
return result;
}
diff --git a/tdefile-plugins/ico/tdefile_ico.cpp b/tdefile-plugins/ico/tdefile_ico.cpp
index 057fe0a8..6780ed98 100644
--- a/tdefile-plugins/ico/tdefile_ico.cpp
+++ b/tdefile-plugins/ico/tdefile_ico.cpp
@@ -32,13 +32,7 @@
#include <tqfile.h>
#include <tqdatetime.h>
-#if !defined(__osf__)
#include <inttypes.h>
-#else
-typedef unsigned long uint32_t;
-typedef unsigned short uint16_t;
-typedef unsigned char uint8_t;
-#endif
typedef KGenericFactory<KIcoPlugin> IcoFactory;
diff --git a/tdefile-plugins/tga/tdefile_tga.cpp b/tdefile-plugins/tga/tdefile_tga.cpp
index 5263af48..dab2184d 100644
--- a/tdefile-plugins/tga/tdefile_tga.cpp
+++ b/tdefile-plugins/tga/tdefile_tga.cpp
@@ -32,13 +32,7 @@
#include <tqfile.h>
#include <tqdatetime.h>
-#if !defined(__osf__)
#include <inttypes.h>
-#else
-typedef unsigned long uint32_t;
-typedef unsigned short uint16_t;
-typedef unsigned char uint8_t;
-#endif
typedef KGenericFactory<KTgaPlugin> TgaFactory;
diff --git a/tdefile-plugins/xbm/tdefile_xbm.cpp b/tdefile-plugins/xbm/tdefile_xbm.cpp
index 1e9937a3..cfd899af 100644
--- a/tdefile-plugins/xbm/tdefile_xbm.cpp
+++ b/tdefile-plugins/xbm/tdefile_xbm.cpp
@@ -32,11 +32,7 @@
#include <tqfile.h>
#include <tqdatetime.h>
-#if !defined(__osf__)
#include <inttypes.h>
-#else
-typedef unsigned short uint32_t;
-#endif
typedef KGenericFactory<KXbmPlugin> XbmFactory;
generated by cgit v1.2.1 (git 2.18.0) at 2025-03-02 15:54:56 +0000