summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------cmake0
-rw-r--r--config.h.cmake2
-rw-r--r--kamera/CMakeLists.txt3
-rw-r--r--kamera/Makefile.am2
-rw-r--r--kamera/pics/CMakeLists.txt13
-rw-r--r--kamera/pics/Makefile.am1
-rw-r--r--kamera/pics/cr16-action-camera_test.pngbin537 -> 0 bytes
-rw-r--r--kamera/pics/cr16-app-camera-photo.pngbin657 -> 0 bytes
-rw-r--r--kamera/pics/cr16-device-camera-photo.pngbin657 -> 0 bytes
-rw-r--r--kamera/pics/cr22-device-camera-photo.pngbin875 -> 0 bytes
-rw-r--r--kamera/pics/cr22-filesys-camera-photo.pngbin875 -> 0 bytes
-rw-r--r--kamera/pics/cr32-device-camera-photo.pngbin1396 -> 0 bytes
-rw-r--r--kamera/pics/cr32-filesys-camera-photo.pngbin1396 -> 0 bytes
-rw-r--r--kdvi/TeXFont_PK.cpp12
-rw-r--r--kdvi/util.cpp4
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c88
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GBitmap.h4
-rw-r--r--kviewshell/plugins/djvu/libdjvu/MMX.h4
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake2
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc32
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-private.h13
-rw-r--r--tdeiconedit/tdeicongrid.cpp2
22 files changed, 97 insertions, 85 deletions
diff --git a/cmake b/cmake
-Subproject 8668335711fa13cec276552d75bfbb4285c7edb
+Subproject 6574bc5ae92f85d97705d1f41cf52709246122e
diff --git a/config.h.cmake b/config.h.cmake
index 71f8a47a..30f9fcec 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,6 +1,8 @@
#cmakedefine VERSION "@VERSION@"
// poppler-tqt
+#cmakedefine HAVE_POPPLER_083
+#cmakedefine HAVE_POPPLER_082
#cmakedefine HAVE_POPPLER_076
#cmakedefine HAVE_POPPLER_072
#cmakedefine HAVE_POPPLER_071
diff --git a/kamera/CMakeLists.txt b/kamera/CMakeLists.txt
index 56e7c70d..efba5997 100644
--- a/kamera/CMakeLists.txt
+++ b/kamera/CMakeLists.txt
@@ -12,5 +12,4 @@
include( ConfigureChecks.cmake )
add_subdirectory( tdeioslave )
-add_subdirectory( kcontrol )
-add_subdirectory( pics )
+add_subdirectory( kcontrol ) \ No newline at end of file
diff --git a/kamera/Makefile.am b/kamera/Makefile.am
index e7776502..4310a2cc 100644
--- a/kamera/Makefile.am
+++ b/kamera/Makefile.am
@@ -1 +1 @@
-SUBDIRS = kcontrol tdeioslave pics
+SUBDIRS = kcontrol tdeioslave
diff --git a/kamera/pics/CMakeLists.txt b/kamera/pics/CMakeLists.txt
deleted file mode 100644
index 34b473a7..00000000
--- a/kamera/pics/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Calvin Morrison
-# mutantturkey@gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_install_icons( camera-photo )
-tde_install_icons( camera_test )
diff --git a/kamera/pics/Makefile.am b/kamera/pics/Makefile.am
deleted file mode 100644
index 6fb78919..00000000
--- a/kamera/pics/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-KDE_ICON = camera-photo camera_test
diff --git a/kamera/pics/cr16-action-camera_test.png b/kamera/pics/cr16-action-camera_test.png
deleted file mode 100644
index c42dd048..00000000
--- a/kamera/pics/cr16-action-camera_test.png
+++ /dev/null
Binary files differ
diff --git a/kamera/pics/cr16-app-camera-photo.png b/kamera/pics/cr16-app-camera-photo.png
deleted file mode 100644
index c81e4875..00000000
--- a/kamera/pics/cr16-app-camera-photo.png
+++ /dev/null
Binary files differ
diff --git a/kamera/pics/cr16-device-camera-photo.png b/kamera/pics/cr16-device-camera-photo.png
deleted file mode 100644
index c81e4875..00000000
--- a/kamera/pics/cr16-device-camera-photo.png
+++ /dev/null
Binary files differ
diff --git a/kamera/pics/cr22-device-camera-photo.png b/kamera/pics/cr22-device-camera-photo.png
deleted file mode 100644
index b35632bd..00000000
--- a/kamera/pics/cr22-device-camera-photo.png
+++ /dev/null
Binary files differ
diff --git a/kamera/pics/cr22-filesys-camera-photo.png b/kamera/pics/cr22-filesys-camera-photo.png
deleted file mode 100644
index b35632bd..00000000
--- a/kamera/pics/cr22-filesys-camera-photo.png
+++ /dev/null
Binary files differ
diff --git a/kamera/pics/cr32-device-camera-photo.png b/kamera/pics/cr32-device-camera-photo.png
deleted file mode 100644
index ff8ed2d8..00000000
--- a/kamera/pics/cr32-device-camera-photo.png
+++ /dev/null
Binary files differ
diff --git a/kamera/pics/cr32-filesys-camera-photo.png b/kamera/pics/cr32-filesys-camera-photo.png
deleted file mode 100644
index ff8ed2d8..00000000
--- a/kamera/pics/cr32-filesys-camera-photo.png
+++ /dev/null
Binary files differ
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index 87d7de86..f84375cc 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -428,7 +428,7 @@ void TeXFont_PK::PK_skip_specials()
#endif
int i,j;
- register FILE *fp = file;
+ FILE *fp = file;
#ifdef DEBUG_PK
if (fp == 0)
@@ -478,8 +478,8 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
int row_bit_pos;
bool paint_switch;
TQ_UINT32 *cp;
- register struct glyph *g;
- register FILE *fp = file;
+ struct glyph *g;
+ FILE *fp = file;
long fpwidth;
TQ_UINT32 word = 0;
int word_weight, bytes_wide;
@@ -533,7 +533,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
{
/* width must be multiple of 16 bits for raster_op */
characterBitmaps[ch]->bytes_wide = ROUNDUP((int) characterBitmaps[ch]->w, 32) * 4;
- register unsigned int size = characterBitmaps[ch]->bytes_wide * characterBitmaps[ch]->h;
+ unsigned int size = characterBitmaps[ch]->bytes_wide * characterBitmaps[ch]->h;
characterBitmaps[ch]->bits = new char[size != 0 ? size : 1];
}
@@ -634,8 +634,8 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
// The data in the bitmap is now in the processor's bit order,
// that is, big endian. Since XWindows needs little endian, we
// need to change the bit order now.
- register unsigned char* bitmapData = (unsigned char*) characterBitmaps[ch]->bits;
- register unsigned char* endOfData = bitmapData + characterBitmaps[ch]->bytes_wide*characterBitmaps[ch]->h;
+ unsigned char* bitmapData = (unsigned char*) characterBitmaps[ch]->bits;
+ unsigned char* endOfData = bitmapData + characterBitmaps[ch]->bytes_wide*characterBitmaps[ch]->h;
while(bitmapData < endOfData) {
*bitmapData = bitflip[*bitmapData];
bitmapData++;
diff --git a/kdvi/util.cpp b/kdvi/util.cpp
index 2942cf08..bcdc3130 100644
--- a/kdvi/util.cpp
+++ b/kdvi/util.cpp
@@ -96,7 +96,7 @@ please report the problem."));
unsigned long num(FILE *fp, int size)
{
- register long x = 0;
+ long x = 0;
while (size--) x = (x << 8) | one(fp);
return x;
@@ -104,7 +104,7 @@ unsigned long num(FILE *fp, int size)
long snum(FILE *fp, int size)
{
- register long x;
+ long x;
#ifdef __STDC__
x = (signed char) getc(fp);
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 01f60976..3ed343c5 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -125,7 +125,7 @@ rgb1 (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *colorm
int width, height;
int bpl;
unsigned char *s;
- register unsigned char data;
+ unsigned char data;
unsigned char *o;
unsigned char *srow = image->data, *orow = pixels;
@@ -164,7 +164,7 @@ rgb1a (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *color
int width, height;
int bpl;
unsigned char *s;
- register unsigned char data;
+ unsigned char data;
unsigned char *o;
unsigned char *srow = image->data, *orow = pixels;
unsigned int remap[2];
@@ -216,10 +216,10 @@ rgb8 (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *colorm
int width, height;
int bpl;
unsigned int mask;
- register unsigned int data;
+ unsigned int data;
unsigned char *srow = image->data, *orow = pixels;
- register unsigned char *s;
- register unsigned char *o;
+ unsigned char *s;
+ unsigned char *o;
width = image->width;
height = image->height;
@@ -254,10 +254,10 @@ rgb8a (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *color
int width, height;
int bpl;
unsigned int mask;
- register unsigned int data;
+ unsigned int data;
unsigned int remap[256];
- register unsigned char *s; /* read 2 pixels at once */
- register unsigned int *o;
+ unsigned char *s; /* read 2 pixels at once */
+ unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@@ -307,11 +307,11 @@ rgb565lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
- register unsigned int *s; /* read 2 pixels at once */
+ unsigned int *s; /* read 2 pixels at once */
#else
- register unsigned char *s; /* read 2 pixels at once */
+ unsigned char *s; /* read 2 pixels at once */
#endif
- register unsigned short *o;
+ unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@@ -326,7 +326,7 @@ rgb565lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
#endif
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
- register unsigned int data;
+ unsigned int data;
#ifdef LITTLE
data = *s++;
*o++ = (data & 0xf800) >> 8 | (data & 0xe000) >> 13
@@ -349,7 +349,7 @@ rgb565lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
- register unsigned short data;
+ unsigned short data;
#ifdef LITTLE
data = *((short *) s);
#else
@@ -378,11 +378,11 @@ rgb565msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
- register unsigned char *s; /* need to swap data order */
+ unsigned char *s; /* need to swap data order */
#else
- register unsigned int *s; /* read 2 pixels at once */
+ unsigned int *s; /* read 2 pixels at once */
#endif
- register unsigned short *o;
+ unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@@ -397,7 +397,7 @@ rgb565msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
#endif
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
- register unsigned int data;
+ unsigned int data;
#ifdef LITTLE
/* swap endianness first */
data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
@@ -420,7 +420,7 @@ rgb565msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
- register unsigned short data;
+ unsigned short data;
#ifdef LITTLE
data = *((short *) s);
data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
@@ -449,11 +449,11 @@ rgb565alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
- register unsigned short *s; /* read 1 pixels at once */
+ unsigned short *s; /* read 1 pixels at once */
#else
- register unsigned char *s;
+ unsigned char *s;
#endif
- register unsigned int *o;
+ unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@@ -469,7 +469,7 @@ rgb565alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
#endif
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx ++) {
- register unsigned int data;
+ unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR ggggggGG bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB ggggggGG rrrrrRRR */
#ifdef LITTLE
@@ -506,11 +506,11 @@ rgb565amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
- register unsigned char *s;
+ unsigned char *s;
#else
- register unsigned short *s; /* read 1 pixels at once */
+ unsigned short *s; /* read 1 pixels at once */
#endif
- register unsigned int *o;
+ unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@@ -522,7 +522,7 @@ rgb565amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
s = srow;
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx ++) {
- register unsigned int data;
+ unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR gggggg00 bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB gggggg00 rrrrrRRR */
#ifdef LITTLE
@@ -559,11 +559,11 @@ rgb555lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
- register unsigned int *s; /* read 2 pixels at once */
+ unsigned int *s; /* read 2 pixels at once */
#else
- register unsigned char *s; /* read 2 pixels at once */
+ unsigned char *s; /* read 2 pixels at once */
#endif
- register unsigned short *o;
+ unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@@ -578,7 +578,7 @@ rgb555lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
#endif
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
- register unsigned int data;
+ unsigned int data;
#ifdef LITTLE
data = *s++;
*o++ = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12
@@ -601,7 +601,7 @@ rgb555lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
- register unsigned short data;
+ unsigned short data;
#ifdef LITTLE
data = *((short *) s);
#else
@@ -630,11 +630,11 @@ rgb555msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
- register unsigned char *s; /* read 2 pixels at once */
+ unsigned char *s; /* read 2 pixels at once */
#else
- register unsigned int *s; /* read 2 pixels at once */
+ unsigned int *s; /* read 2 pixels at once */
#endif
- register unsigned short *o;
+ unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@@ -645,7 +645,7 @@ rgb555msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
s = srow;
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
- register unsigned int data;
+ unsigned int data;
#ifdef LITTLE
/* swap endianness first */
data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
@@ -668,7 +668,7 @@ rgb555msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
- register unsigned short data;
+ unsigned short data;
#ifdef LITTLE
data = *((short *) s);
data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
@@ -697,11 +697,11 @@ rgb555alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
- register unsigned short *s; /* read 1 pixels at once */
+ unsigned short *s; /* read 1 pixels at once */
#else
- register unsigned char *s;
+ unsigned char *s;
#endif
- register unsigned int *o;
+ unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@@ -717,7 +717,7 @@ rgb555alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
#endif
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx++) {
- register unsigned int data;
+ unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR gggggGGG bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB gggggGGG rrrrrRRR */
#ifdef LITTLE
@@ -754,11 +754,11 @@ rgb555amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
- register unsigned short *s; /* read 1 pixels at once */
+ unsigned short *s; /* read 1 pixels at once */
#else
- register unsigned char *s;
+ unsigned char *s;
#endif
- register unsigned int *o;
+ unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@@ -774,7 +774,7 @@ rgb555amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
#endif
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx++) {
- register unsigned int data;
+ unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR gggggGGG bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB gggggGGG rrrrrRRR */
#ifdef LITTLE
diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
index 74669c05..22abbe06 100644
--- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h
+++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
@@ -621,7 +621,7 @@ GBitmap::euclidian_ratio(int a, int b, int &q, int &r)
inline int
GBitmap::read_run(unsigned char *&data)
{
- register int z=*data++;
+ int z=*data++;
return (z>=RUNOVERFLOWVALUE)?
((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
}
@@ -629,7 +629,7 @@ GBitmap::read_run(unsigned char *&data)
inline int
GBitmap::read_run(const unsigned char *&data)
{
- register int z=*data++;
+ int z=*data++;
return (z>=RUNOVERFLOWVALUE)?
((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
}
diff --git a/kviewshell/plugins/djvu/libdjvu/MMX.h b/kviewshell/plugins/djvu/libdjvu/MMX.h
index 41ec002f..9f432fe6 100644
--- a/kviewshell/plugins/djvu/libdjvu/MMX.h
+++ b/kviewshell/plugins/djvu/libdjvu/MMX.h
@@ -174,9 +174,9 @@ class MMXControl
#define MMXir(op,imm,dst) \
__asm { op dst,imm }
#define MMXar(op,addr,dst) \
- { register __int64 var=*(__int64*)(addr); __asm { op dst,var } }
+ { __int64 var=*(__int64*)(addr); __asm { op dst,var } }
#define MMXra(op,src,addr) \
- { register __int64 var; __asm { op [var],src }; *(__int64*)addr = var; }
+ { __int64 var; __asm { op [var],src }; *(__int64*)addr = var; }
// Probably not as efficient as GCC macros
#define MMX 1
#endif
diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
index 9f55e6be..65a62f95 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -24,7 +24,7 @@ check_cxx_source_compiles("
HAVE_POPPLER_030 )
tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 )
+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 )
string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
index 13eb5cc6..db403c5e 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
@@ -42,7 +42,12 @@ namespace Poppler {
Document *Document::load(const TQString &filePath)
{
if (!globalParams) {
- globalParams = new GlobalParams();
+ globalParams =
+#if defined(HAVE_POPPLER_083)
+ std::make_unique<GlobalParams>();
+#else
+ new GlobalParams();
+#endif
}
DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL);
@@ -127,19 +132,24 @@ TQValueList<FontInfo> Document::fonts() const
bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) const
{
- FONTS_LIST_TYPE *items = data->m_fontInfoScanner->scan( numPages );
+ FONTS_LIST_TYPE items = data->m_fontInfoScanner->scan( numPages );
+#if !defined(HAVE_POPPLER_082)
if ( NULL == items )
return false;
+#endif
+#if !defined(HAVE_POPPLER_076)
+ if ( FONTS_LIST_IS_EMPTY(items) ) {
+# if !defined(HAVE_POPPLER_082)
+ delete items;
+# endif
+ return false;
+ }
+#endif
for ( int i = 0; i < FONTS_LIST_LENGTH(items); ++i ) {
TQString fontName;
- ::FontInfo *fontInfo =
-#if defined(HAVE_POPPLER_076)
- (*items)[i];
-#else
- (::FontInfo*)items->get(i);
-#endif
+ ::FontInfo *fontInfo = FONTS_LIST_GET(items, i);
if (fontInfo->getName())
fontName = fontInfo->getName()->GOO_GET_CSTR();
@@ -149,7 +159,11 @@ bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) con
(Poppler::FontInfo::Type)(fontInfo->getType()));
fontList->append(font);
}
-# if defined(HAVE_POPPLER_076)
+# if defined(HAVE_POPPLER_082)
+ for (auto entry : items) {
+ delete entry;
+ }
+# elif defined(HAVE_POPPLER_076)
for (auto entry : *items) {
delete entry;
}
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
index 33b8cfc3..26a9bb62 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
@@ -54,14 +54,25 @@ class SplashOutputDev;
class OutlineItem;
#define OUTLINE_ITEMS_TYPE const std::vector<OutlineItem*>
#define OUTLINE_ITEMS_LENGTH(goo) goo->size()
+# if defined(HAVE_POPPLER_082)
#define FONTS_LIST_TYPE std::vector<::FontInfo*>
+#define FONTS_LIST_LENGTH(goo) goo.size()
+#define FONTS_LIST_IS_EMPTY(goo) goo.empty()
+#define FONTS_LIST_GET(goo, i) goo[i]
+# else
+#define FONTS_LIST_TYPE std::vector<::FontInfo*>*
#define FONTS_LIST_LENGTH(goo) goo->size()
+#define FONTS_LIST_IS_EMPTY(goo) goo->empty()
+#define FONTS_LIST_GET(goo, i) (*goo)[i]
+# endif
#define FIND_PAGE_ARGS(ref) ref
#else
#define OUTLINE_ITEMS_TYPE CONST_064 GooList
#define OUTLINE_ITEMS_LENGTH(goo) goo->getLength()
-#define FONTS_LIST_TYPE GooList
+#define FONTS_LIST_TYPE GooList*
#define FONTS_LIST_LENGTH(goo) goo->getLength()
+#define FONTS_LIST_IS_EMPTY(goo) (goo == NULL || goo->getLength() == 0)
+#define FONTS_LIST_GET(goo, i) (::FontInfo*)goo->get(i)
#define FIND_PAGE_ARGS(ref) ref.num, ref.gen
#endif
diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp
index 8c336428..af62db5e 100644
--- a/tdeiconedit/tdeicongrid.cpp
+++ b/tdeiconedit/tdeicongrid.cpp
@@ -1985,7 +1985,7 @@ bool TDEIconEditGrid::isMarked(int x, int y)
// Based on TQt's image conversion functions
static bool kdither_32_to_8( const TQImage *src, TQImage *dst )
{
- register TQRgb *p;
+ TQRgb *p;
uchar *b;
int y;