summaryrefslogtreecommitdiffstats
path: root/filters/kword/pdf
diff options
context:
space:
mode:
Diffstat (limited to 'filters/kword/pdf')
-rw-r--r--filters/kword/pdf/misc.cpp20
-rw-r--r--filters/kword/pdf/xpdf/goo/GHash.cc12
-rw-r--r--filters/kword/pdf/xpdf/goo/GHash.h4
-rw-r--r--filters/kword/pdf/xpdf/xpdf/CMap.cc2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/CMap.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Dict.cc8
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Dict.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc10
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Link.cc2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Link.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/PDFDoc.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFCore.cc4
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFCore.h4
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc10
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFViewer.h2
15 files changed, 43 insertions, 43 deletions
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 86eb81f67..0ffc9dbad 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -177,17 +177,17 @@ static const KnownData KNOWN_DATA[] = {
void Font::init(const TQString &n)
{
// check if font already parsed
- _data = _dict->tqfind(n);
+ _data = _dict->find(n);
if ( _data==0 ) {
// kdDebug(30516) << "font " << n << endl;
TQString name = n;
- name.tqreplace("oblique", "italic");
+ name.replace("oblique", "italic");
// check if known font
_data = new Data;
uint i = 0;
while ( KNOWN_DATA[i].name!=0 ) {
- if ( name.tqfind(KNOWN_DATA[i].name)!=-1 ) {
+ if ( name.find(KNOWN_DATA[i].name)!=-1 ) {
// kdDebug(30516) << "found " << KNOWN_DATA[i].name
// << " " << isBold(KNOWN_DATA[i].style) << endl;
_data->family = FAMILY_DATA[KNOWN_DATA[i].family];
@@ -201,13 +201,13 @@ void Font::init(const TQString &n)
if ( _data->family.isEmpty() ) { // let's try harder
// simple heuristic
kdDebug(30516) << "unknown font : " << n << endl;
- if ( name.tqfind("times")!=-1 )
+ if ( name.find("times")!=-1 )
_data->family = FAMILY_DATA[Times];
- else if ( name.tqfind("helvetica")!=-1 )
+ else if ( name.find("helvetica")!=-1 )
_data->family = FAMILY_DATA[Helvetica];
- else if ( name.tqfind("courier")!=-1 )
+ else if ( name.find("courier")!=-1 )
_data->family = FAMILY_DATA[Courier];
- else if ( name.tqfind("symbol")!=-1 )
+ else if ( name.find("symbol")!=-1 )
_data->family = FAMILY_DATA[Symbol];
else { // with TQt
TQFontDatabase fdb;
@@ -223,8 +223,8 @@ void Font::init(const TQString &n)
}
}
- bool italic = ( name.tqfind("italic")!=-1 );
- bool bold = ( name.tqfind("bold")!=-1 );
+ bool italic = ( name.find("italic")!=-1 );
+ bool bold = ( name.find("bold")!=-1 );
_data->style = toStyle(bold, italic);
_data->latex = false;
}
@@ -233,7 +233,7 @@ void Font::init(const TQString &n)
}
// check if TQFont already created
- if ( !_data->height.tqcontains(_pointSize) ) {
+ if ( !_data->height.contains(_pointSize) ) {
TQFont font(_data->family, _pointSize,
(isBold(_data->style) ? TQFont::Bold : TQFont::Normal),
isItalic(_data->style));
diff --git a/filters/kword/pdf/xpdf/goo/GHash.cc b/filters/kword/pdf/xpdf/goo/GHash.cc
index b8f511e0f..d336f88e3 100644
--- a/filters/kword/pdf/xpdf/goo/GHash.cc
+++ b/filters/kword/pdf/xpdf/goo/GHash.cc
@@ -97,7 +97,7 @@ void *GHash::lookup(const GString *key) {
GHashBucket *p;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
return p->val;
@@ -107,7 +107,7 @@ void *GHash::lookup(const char *key) {
GHashBucket *p;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
return p->val;
@@ -119,7 +119,7 @@ void *GHash::remove(const GString *key) {
void *val;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
q = &tab[h];
@@ -142,7 +142,7 @@ void *GHash::remove(const char *key) {
void *val;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
q = &tab[h];
@@ -190,7 +190,7 @@ void GHash::killIter(GHashIter **iter) {
*iter = NULL;
}
-GHashBucket *GHash::tqfind(const GString *key, int *h) {
+GHashBucket *GHash::find(const GString *key, int *h) {
GHashBucket *p;
*h = hash(key);
@@ -202,7 +202,7 @@ GHashBucket *GHash::tqfind(const GString *key, int *h) {
return NULL;
}
-GHashBucket *GHash::tqfind(const char *key, int *h) {
+GHashBucket *GHash::find(const char *key, int *h) {
GHashBucket *p;
*h = hash(key);
diff --git a/filters/kword/pdf/xpdf/goo/GHash.h b/filters/kword/pdf/xpdf/goo/GHash.h
index 426428c1d..79d9a7eaa 100644
--- a/filters/kword/pdf/xpdf/goo/GHash.h
+++ b/filters/kword/pdf/xpdf/goo/GHash.h
@@ -37,8 +37,8 @@ public:
private:
- GHashBucket *tqfind(const GString *key, int *h);
- GHashBucket *tqfind(const char *key, int *h);
+ GHashBucket *find(const GString *key, int *h);
+ GHashBucket *find(const char *key, int *h);
int hash(const GString *key);
int hash(const char *key);
diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.cc b/filters/kword/pdf/xpdf/xpdf/CMap.cc
index 21f0af227..b00021835 100644
--- a/filters/kword/pdf/xpdf/xpdf/CMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/CMap.cc
@@ -61,7 +61,7 @@ CMap *CMap::parse(CMapCache *cache, GString *collectionA,
return new CMap(collectionA->copy(), cMapNameA->copy(), 1);
}
- error(-1, "Couldn't tqfind '%s' CMap file for '%s' collection",
+ error(-1, "Couldn't find '%s' CMap file for '%s' collection",
cMapNameA->getCString(), collectionA->getCString());
return NULL;
}
diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.h b/filters/kword/pdf/xpdf/xpdf/CMap.h
index 5ece26359..ce926baf3 100644
--- a/filters/kword/pdf/xpdf/xpdf/CMap.h
+++ b/filters/kword/pdf/xpdf/xpdf/CMap.h
@@ -45,7 +45,7 @@ public:
GBool match(GString *collectionA, GString *cMapNameA);
// Return the CID corresponding to the character code starting at
- // <s>, which tqcontains <len> bytes. Sets *<nUsed> to the number of
+ // <s>, which contains <len> bytes. Sets *<nUsed> to the number of
// bytes used by the char code.
CID getCID(char *s, int len, int *nUsed);
diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.cc b/filters/kword/pdf/xpdf/xpdf/Dict.cc
index 048ce80aa..351c23a02 100644
--- a/filters/kword/pdf/xpdf/xpdf/Dict.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Dict.cc
@@ -50,7 +50,7 @@ void Dict::add(char *key, Object *val) {
++length;
}
-inline DictEntry *Dict::tqfind(const char *key) {
+inline DictEntry *Dict::find(const char *key) {
int i;
for (i = 0; i < length; ++i) {
@@ -63,19 +63,19 @@ inline DictEntry *Dict::tqfind(const char *key) {
GBool Dict::is(const char *type) {
DictEntry *e;
- return (e = tqfind("Type")) && e->val.isName(type);
+ return (e = find("Type")) && e->val.isName(type);
}
Object *Dict::lookup(const char *key, Object *obj) {
DictEntry *e;
- return (e = tqfind(key)) ? e->val.fetch(xref, obj) : obj->initNull();
+ return (e = find(key)) ? e->val.fetch(xref, obj) : obj->initNull();
}
Object *Dict::lookupNF(const char *key, Object *obj) {
DictEntry *e;
- return (e = tqfind(key)) ? e->val.copy(obj) : obj->initNull();
+ return (e = find(key)) ? e->val.copy(obj) : obj->initNull();
}
char *Dict::getKey(int i) {
diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.h b/filters/kword/pdf/xpdf/xpdf/Dict.h
index cc66161e5..4bc4408ec 100644
--- a/filters/kword/pdf/xpdf/xpdf/Dict.h
+++ b/filters/kword/pdf/xpdf/xpdf/Dict.h
@@ -71,7 +71,7 @@ private:
int length; // number of entries in dictionary
int ref; // reference count
- DictEntry *tqfind(const char *key);
+ DictEntry *find(const char *key);
};
#endif
diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
index c5d5450b8..ec76e1ccf 100644
--- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
@@ -1121,7 +1121,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= ((src1 ^ 0xff) >> s1) & m2;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (dest & ~m3) | ((src1 >> s1) & m3);
break;
}
@@ -1144,7 +1144,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= (src1 ^ 0xff) & m2;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (src1 & m2) | (dest & m1);
break;
}
@@ -1174,7 +1174,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= (src1 ^ 0xff) >> s1;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (dest & (0xff << s2)) | (src1 >> s1);
break;
}
@@ -1206,7 +1206,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= src ^ 0xff;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = src;
break;
}
@@ -1231,7 +1231,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= (src ^ 0xff) & m2;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (src & m2) | (dest & m1);
break;
}
diff --git a/filters/kword/pdf/xpdf/xpdf/Link.cc b/filters/kword/pdf/xpdf/xpdf/Link.cc
index b660c0359..345e7296a 100644
--- a/filters/kword/pdf/xpdf/xpdf/Link.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Link.cc
@@ -713,7 +713,7 @@ Links::~Links() {
gfree(links);
}
-LinkAction *Links::tqfind(double x, double y) {
+LinkAction *Links::find(double x, double y) {
int i;
for (i = numLinks - 1; i >= 0; --i) {
diff --git a/filters/kword/pdf/xpdf/xpdf/Link.h b/filters/kword/pdf/xpdf/xpdf/Link.h
index 651618764..17eab2c79 100644
--- a/filters/kword/pdf/xpdf/xpdf/Link.h
+++ b/filters/kword/pdf/xpdf/xpdf/Link.h
@@ -357,7 +357,7 @@ public:
// If point <x>,<y> is in a link, return the associated action;
// else return NULL.
- LinkAction *tqfind(double x, double y);
+ LinkAction *find(double x, double y);
// Return true if <x>,<y> is in a link.
GBool onLink(double x, double y);
diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDoc.h b/filters/kword/pdf/xpdf/xpdf/PDFDoc.h
index 64c6cd2ad..ff6e359ce 100644
--- a/filters/kword/pdf/xpdf/xpdf/PDFDoc.h
+++ b/filters/kword/pdf/xpdf/xpdf/PDFDoc.h
@@ -103,7 +103,7 @@ public:
// If point <x>,<y> is in a link, return the associated action;
// else return NULL.
- LinkAction *findLink(double x, double y) { return links->tqfind(x, y); }
+ LinkAction *findLink(double x, double y) { return links->find(x, y); }
// Return true if <x>,<y> is in a link.
GBool onLink(double x, double y) { return links->onLink(x, y); }
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
index 2aa620d62..5c53ade12 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
@@ -1231,10 +1231,10 @@ void XPDFCore::runCommand(GString *cmdFmt, GString *arg) {
//------------------------------------------------------------------------
-// tqfind
+// find
//------------------------------------------------------------------------
-void XPDFCore::tqfind(char *s) {
+void XPDFCore::find(char *s) {
Unicode *u;
TextOutputDev *textOut;
int xMin, yMin, xMax, yMax;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
index 4c250704a..adc7f5073 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
@@ -142,9 +142,9 @@ public:
void doAction(LinkAction *action);
- //----- tqfind
+ //----- find
- void tqfind(char *s);
+ void find(char *s);
//----- simple modal dialogs
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index cf2ea6d01..a75830b83 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -690,7 +690,7 @@ void XPDFViewer::initWindow() {
zoomMenu = XmCreateOptionMenu(toolBar, "zoomMenu", args, n);
XtManageChild(zoomMenu);
- // tqfind/print/about buttons
+ // find/print/about buttons
n = 0;
XtSetArg(args[n], XmNleftAttachment, XmATTACH_WIDGET); ++n;
XtSetArg(args[n], XmNleftWidget, zoomMenu); ++n;
@@ -698,7 +698,7 @@ void XPDFViewer::initWindow() {
XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n;
XtSetArg(args[n], XmNmarginWidth, 6); ++n;
XtSetArg(args[n], XmNlabelString, emptyString); ++n;
- findBtn = XmCreatePushButton(toolBar, "tqfind", args, n);
+ findBtn = XmCreatePushButton(toolBar, "find", args, n);
XtManageChild(findBtn);
XtAddCallback(findBtn, XmNactivateCallback,
&findCbk, (XtPointer)this);
@@ -1741,7 +1741,7 @@ void XPDFViewer::openOkCbk(Widget widget, XtPointer ptr,
}
//------------------------------------------------------------------------
-// GUI code: "tqfind" dialog
+// GUI code: "find" dialog
//------------------------------------------------------------------------
void XPDFViewer::initFindDialog() {
@@ -1780,7 +1780,7 @@ void XPDFViewer::initFindDialog() {
findText = XmCreateTextField(row1, "text", args, n);
XtManageChild(findText);
- //----- "tqfind" and "close" buttons
+ //----- "find" and "close" buttons
n = 0;
XtSetArg(args[n], XmNtopAttachment, XmATTACH_WIDGET); ++n;
XtSetArg(args[n], XmNtopWidget, row1); ++n;
@@ -1816,7 +1816,7 @@ void XPDFViewer::findFindCbk(Widget widget, XtPointer ptr,
XtPointer callData) {
XPDFViewer *viewer = (XPDFViewer *)ptr;
- viewer->core->tqfind(XmTextFieldGetString(viewer->findText));
+ viewer->core->find(XmTextFieldGetString(viewer->findText));
}
void XPDFViewer::findCloseCbk(Widget widget, XtPointer ptr,
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
index df6063952..b9b0b2dab 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
@@ -139,7 +139,7 @@ private:
static void openOkCbk(Widget widget, XtPointer ptr,
XtPointer callData);
- //----- GUI code: "tqfind" dialog
+ //----- GUI code: "find" dialog
void initFindDialog();
static void findFindCbk(Widget widget, XtPointer ptr,
XtPointer callData);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 07:08:47 +0000