TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index a8c8f8f0..cf2ea6d0 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -501,9 +501,9 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING); ++n;
   if (app->getFullScreen()) {
     XtSetArg(args[n], XmNmwmDecorations, 0); ++n;
-    XtSetArg(args[n], XmNgeometry, "+0+0"); ++n;
+    XtSetArg(args[n], XmNtqgeometry, "+0+0"); ++n;
   } else if (app->getGeometry()) {
-    XtSetArg(args[n], XmNgeometry, app->getGeometry()->getCString()); ++n;
+    XtSetArg(args[n], XmNtqgeometry, app->getGeometry()->getCString()); ++n;
   }
   win = XtCreatePopupShell("win", topLevelShellWidgetClass,
 			   app->getAppShell(), args, n);
@@ -633,7 +633,7 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n;
   s = XmStringCreateLocalized(" of 00000");
   XtSetArg(args[n], XmNlabelString, s); ++n;
-  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
   XtSetArg(args[n], XmNrecomputeSize, False); ++n;
   pageCountLabel = XmCreateLabel(toolBar, "pageCountLabel", args, n);
   XmStringFree(s);
@@ -690,7 +690,7 @@ void XPDFViewer::initWindow() {
   zoomMenu = XmCreateOptionMenu(toolBar, "zoomMenu", args, n);
   XtManageChild(zoomMenu);
 
-  // find/print/about buttons
+  // tqfind/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, "find", args, n);
+  findBtn = XmCreatePushButton(toolBar, "tqfind", args, n);
   XtManageChild(findBtn);
   XtAddCallback(findBtn, XmNactivateCallback,
 		&findCbk, (XtPointer)this);
@@ -751,7 +751,7 @@ void XPDFViewer::initWindow() {
   s = XmStringCreateLocalized("");
   XtSetArg(args[n], XmNlabelString, s); ++n;
   XtSetArg(args[n], XmNrecomputeSize, True); ++n;
-  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
   linkLabel = XmCreateLabel(toolBar, "linkLabel", args, n);
   XmStringFree(s);
   XtManageChild(linkLabel);
@@ -1484,7 +1484,7 @@ void XPDFViewer::setupOutline() {
   XtManageChildren(outlineLabels, outlineLabelsLength);
 }
 
-void XPDFViewer::setupOutlineItems(GList *items, Widget parent,
+void XPDFViewer::setupOutlineItems(GList *items, Widget tqparent,
 				   UnicodeMap *uMap) {
   OutlineItem *item;
   GList *kids;
@@ -1504,8 +1504,8 @@ void XPDFViewer::setupOutlineItems(GList *items, Widget parent,
     }
     n = 0;
     XtSetArg(args[n], XPDFNentryPosition, i); ++n;
-    if (parent) {
-      XtSetArg(args[n], XPDFNentryParent, parent); ++n;
+    if (tqparent) {
+      XtSetArg(args[n], XPDFNentryParent, tqparent); ++n;
     }
     XtSetArg(args[n], XPDFNentryExpanded, item->isOpen()); ++n;
     s = XmStringCreateLocalized(title->getCString());
@@ -1741,7 +1741,7 @@ void XPDFViewer::openOkCbk(Widget widget, XtPointer ptr,
 }
 
 //------------------------------------------------------------------------
-// GUI code: "find" dialog
+// GUI code: "tqfind" dialog
 //------------------------------------------------------------------------
 
 void XPDFViewer::initFindDialog() {
@@ -1780,7 +1780,7 @@ void XPDFViewer::initFindDialog() {
   findText = XmCreateTextField(row1, "text", args, n);
   XtManageChild(findText);
 
-  //----- "find" and "close" buttons
+  //----- "tqfind" 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->find(XmTextFieldGetString(viewer->findText));
+  viewer->core->tqfind(XmTextFieldGetString(viewer->findText));
 }
 
 void XPDFViewer::findCloseCbk(Widget widget, XtPointer ptr,