Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

10 files changed, 41 insertions, 41 deletions

diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index 562c40f9..496e8ff9 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -347,7 +347,7 @@ static const uchar bitflip[256] = {
   15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
 };                                                                              
 
-static TQ_UINT32	bit_tqmasks[33] = {
+static TQ_UINT32	bit_masks[33] = {
 	0x0,		0x1,		0x3,		0x7,
 	0xf,		0x1f,		0x3f,		0x7f,
 	0xff,		0x1ff,		0x3ff,		0x7ff,
@@ -595,12 +595,12 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	    h_bit -= count;
 	    word_weight -= count;
 	    if (paint_switch)
-	      word |= bit_tqmasks[count] << word_weight;
+	      word |= bit_masks[count] << word_weight;
 	    count = 0;
 	  } else 
 	    if (count >= h_bit && h_bit <= word_weight) {
 	      if (paint_switch)
-		word |= bit_tqmasks[h_bit] << (word_weight - h_bit);
+		word |= bit_masks[h_bit] << (word_weight - h_bit);
 	      *cp++ = word;
 	      /* "output" row(s) */
 	      for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -615,7 +615,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	      h_bit = characterBitmaps[ch]->w;
 	    } else {
 	      if (paint_switch)
-		word |= bit_tqmasks[word_weight];
+		word |= bit_masks[word_weight];
 	      *cp++ = word;
 	      word = 0;
 	      count -= word_weight;
@@ -679,14 +679,14 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	while (count > 0) {
 	  if (count < word_weight && count < h_bit) {
 	    if (paint_switch)
-	      word |= bit_tqmasks[count] << (32 - word_weight);
+	      word |= bit_masks[count] << (32 - word_weight);
 	    h_bit -= count;
 	    word_weight -= count;
 	    count = 0;
 	  } else 
 	    if (count >= h_bit && h_bit <= word_weight) {
 	      if (paint_switch)
-		word |= bit_tqmasks[h_bit] << (32 - word_weight);
+		word |= bit_masks[h_bit] << (32 - word_weight);
 	      *cp++ = word;
 	      /* "output" row(s) */
 	      for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -701,7 +701,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	      h_bit = characterBitmaps[ch]->w;
 	    } else {
 	      if (paint_switch)
-		word |= bit_tqmasks[word_weight] << (32 - word_weight);
+		word |= bit_masks[word_weight] << (32 - word_weight);
 	      *cp++ = word;
 	      word = 0;
 	      count -= word_weight;
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index 5133b2ab..40463d36 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -79,7 +79,7 @@ dviRenderer::dviRenderer(TQWidget *par)
 
   connect(&font_pool, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) );
 
-  tqparentWidget = par;
+  parentWidget = par;
   shrinkfactor = 3;
   current_page = 0;
   resolutionInDPI = 0.0;
@@ -206,7 +206,7 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page)
   
   page->isEmpty = false;
   if (errorMsg.isEmpty() != true) {
-    KMessageBox::detailedError(tqparentWidget,
+    KMessageBox::detailedError(parentWidget,
 			       i18n("<qt><strong>File corruption!</strong> KDVI had trouble interpreting your DVI file. Most "
 				    "likely this means that the DVI file is broken.</qt>"),
 			       errorMsg, i18n("DVI File Error"));
@@ -260,7 +260,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
   
   if (showMsg) {
     KDialogBase *dialog= new KDialogBase(i18n("KDVI: Information"), KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes,
-					 tqparentWidget, "information", true, true,KStdGuiItem::ok() );
+					 parentWidget, "information", true, true,KStdGuiItem::ok() );
     
     TQVBox *topcontents = new TQVBox (dialog);
     topcontents->setSpacing(KDialog::spacingHint()*2);
@@ -311,7 +311,7 @@ void dviRenderer::embedPostScript()
   if (!dviFile)
     return;
 
-  embedPS_progress = new KProgressDialog(tqparentWidget, "embedPSProgressDialog",
+  embedPS_progress = new KProgressDialog(parentWidget, "embedPSProgressDialog",
 					 i18n("Embedding PostScript Files"), TQString(), true);
   if (!embedPS_progress)
     return;
@@ -342,10 +342,10 @@ void dviRenderer::embedPostScript()
 
   if (!errorMsg.isEmpty()) {
     errorMsg = "<qt>" + errorMsg + "</qt>";
-    KMessageBox::detailedError(tqparentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
+    KMessageBox::detailedError(parentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
     errorMsg = TQString();
   } else
-    KMessageBox::information(tqparentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
+    KMessageBox::information(parentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
 						 "will probably want to save the DVI file now.") + "</qt>",
 			     TQString(), "embeddingDone");
 
@@ -435,7 +435,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   
   // Make sure the file actually exists.
   if (!fi.exists() || fi.isDir()) {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
 			     "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
 			i18n("File Error!"));
@@ -448,7 +448,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   // the multipage.
   TQString mimetype( KMimeMagic::self()->findFileType( fname )->mimeType() );
   if (mimetype != "application/x-dvi") {
-    KMessageBox::sorry( tqparentWidget,
+    KMessageBox::sorry( parentWidget,
 			i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
 			      "type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
 			.tqarg( fname )
@@ -459,7 +459,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   // Check if the file is a valid DVI file.
   if (!isValidFile(filename))
   {
-    KMessageBox::sorry( tqparentWidget,
+    KMessageBox::sorry( parentWidget,
                         i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
                              "likely this means that the DVI file is broken.</qt>")
                         .tqarg( fname ) );
@@ -477,7 +477,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   if ((dviFile_new->dvi_Data() == NULL)||(dviFile_new->errorMsg.isEmpty() != true)) {
     TQApplication::restoreOverrideCursor();
     if (dviFile_new->errorMsg.isEmpty() != true)
-      KMessageBox::detailedError(tqparentWidget,
+      KMessageBox::detailedError(parentWidget,
 				 i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
 				      "likely this means that the DVI file is broken.</qt>"),
 				 dviFile_new->errorMsg, i18n("DVI File Error"));
@@ -637,7 +637,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
     TQString  refFileName   = splitter.filePath();
     
     if (sourceHyperLinkAnchors.isEmpty()) {
-      KMessageBox::sorry(tqparentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
+      KMessageBox::sorry(parentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
 				    "line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI file "
 				    "does not contain the necessary source file information. "
 				    "We refer to the manual of KDVI for a detailed explanation on how to include this "
@@ -680,7 +680,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
       return Anchor(bestMatch->page, bestMatch->distance_from_top);
     } else
       if (anchorForRefFileFound == false)
-	KMessageBox::sorry(tqparentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
+	KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
 					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
 			   i18n( "Could Not Find Reference" ));
       else {
@@ -733,7 +733,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
   TQString TeXfile = splitter.filePath();
   if ( ! splitter.fileExists() )
   {
-      KMessageBox::sorry(tqparentWidget, TQString("<qt>") +
+      KMessageBox::sorry(parentWidget, TQString("<qt>") +
 			 i18n("The DVI-file refers to the TeX-file "
 			      "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
 			 TQString("</qt>"),
@@ -743,7 +743,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
   
   TQString command = editorCommand;
   if (command.isEmpty() == true) {
-    int r = KMessageBox::warningContinueCancel(tqparentWidget, TQString("<qt>") +
+    int r = KMessageBox::warningContinueCancel(parentWidget, TQString("<qt>") +
 					       i18n("You have not yet specified an editor for inverse search. "
 						    "Please choose your favorite editor in the "
 						    "<strong>DVI options dialog</strong> "
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index 2e862803..d23a15ce 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -96,12 +96,12 @@ void dviRenderer::exportPDF()
   TQString suggestedName = dviFile->filename;
   suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".pdf";
 
-  TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), tqparentWidget, i18n("Export File As"));
+  TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), parentWidget, i18n("Export File As"));
   if (fileName.isEmpty())
     return;
   TQFileInfo finfo(fileName);
   if (finfo.exists()) {
-    int r = KMessageBox::warningContinueCancel (tqparentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
 				       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -116,7 +116,7 @@ void dviRenderer::exportPDF()
 					  "a while because dvipdfm needs to generate its own bitmap fonts "
 					  "Please be patient."),
 				     i18n("Waiting for dvipdfm to finish..."),
-				     tqparentWidget, i18n("dvipdfm progress dialog"), false );
+				     parentWidget, i18n("dvipdfm progress dialog"), false );
   if (progress != 0) {
     progress->TextLabel2->setText( i18n("Please be patient") );
     progress->setTotalSteps( dviFile->total_pages );
@@ -177,7 +177,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
     return;
 
   if (dviFile->numberOfExternalNONPSFiles != 0) {
-    KMessageBox::sorry( tqparentWidget, 
+    KMessageBox::sorry( parentWidget, 
 			i18n("<qt><P>This DVI file refers to external graphic files which are not in PostScript format, and cannot be handled by the "
 			     "<strong>dvips</strong> program that KDVI uses interally to print or to export to PostScript. The functionality that "
 			     "you require is therefore unavailable in this version of KDVI.</p>"
@@ -195,12 +195,12 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
     TQString suggestedName = dviFile->filename;
     suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".ps";
 
-    fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), tqparentWidget, i18n("Export File As"));
+    fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), parentWidget, i18n("Export File As"));
     if (fileName.isEmpty())
       return;
     TQFileInfo finfo(fileName);
     if (finfo.exists()) {
-      int r = KMessageBox::warningYesNo (tqparentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+      int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
 					 i18n("Overwrite File"));
       if (r == KMessageBox::No)
 	return;
@@ -219,7 +219,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
 					  "a while because dvips needs to generate its own bitmap fonts "
 					  "Please be patient."),
 				     i18n("Waiting for dvips to finish..."),
-				     tqparentWidget, i18n("dvips progress dialog"), false );
+				     parentWidget, i18n("dvips progress dialog"), false );
   if (progress != 0) {
     progress->TextLabel2->setText( i18n("Please be patient") );
     progress->setTotalSteps( dviFile->total_pages );
@@ -341,7 +341,7 @@ void dviRenderer::dvips_terminated(KProcess *sproc)
   // export_errorString, does not correspond to sproc. In that case,
   // we ingore the return status silently.
   if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
-    KMessageBox::error( tqparentWidget, export_errorString );
+    KMessageBox::error( parentWidget, export_errorString );
 
   if (export_printer != 0)
     export_printer->printFiles( TQStringList(export_fileName), true );
@@ -359,7 +359,7 @@ void dviRenderer::editorCommand_terminated(KProcess *sproc)
   // export_errorString, does not correspond to sproc. In that case,
   // we ingore the return status silently.
   if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
-    KMessageBox::error( tqparentWidget, export_errorString );
+    KMessageBox::error( parentWidget, export_errorString );
 
   // Let's hope that this is not all too nasty... killing a
   // KShellProcess from a slot that was called from the KShellProcess
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index 32b75afd..17bc4a3d 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -77,7 +77,7 @@ fontPool::fontPool()
   // pixmaps. Experiments show that --depending of the configuration
   // of QT at compile and runtime or the availability of the XFt
   // extension, alpha channels are either supported, or silently
-  // converted to 1-bit tqmasks.
+  // converted to 1-bit masks.
   TQImage start(1, 1, 32); // Generate a 1x1 image, black with alpha=0x10
   start.setAlphaBuffer(true);
   TQ_UINT32 *destScanLine = (TQ_UINT32 *)start.scanLine(0);
diff --git a/kdvi/fontpool.h b/kdvi/fontpool.h
index 753f95e1..e39dc690 100644
--- a/kdvi/fontpool.h
+++ b/kdvi/fontpool.h
@@ -125,7 +125,7 @@ public:
       channel of pixmaps. Experiments show that --depending of the
       configuration of QT at compile and runtime or the availability
       of the XFt extension, alpha channels are either supported, or
-      silently converted to 1-bit tqmasks. The redering routines in the
+      silently converted to 1-bit masks. The redering routines in the
       TeXFont implementation use this flag to choose the apropriate
       drawing routines for the different setups. */
   bool TQPixmapSupportsAlpha;
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index b1995b88..9fc5703d 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
 
 
 
-KDVIMultiPage::KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                              const char *name, const TQStringList& args)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), DVIRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), DVIRenderer(parentWidget)
 {
   Q_UNUSED(args);
 #ifdef PERFORMANCE_MEASUREMENT
@@ -239,7 +239,7 @@ void KDVIMultiPage::print()
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
+  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
     return;
 
   // This funny method call is necessary for the KPrinter to return
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index cbc7d125..ee50e218 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -15,7 +15,7 @@ class KDVIMultiPage : public KMultiPage
   TQ_OBJECT
 
 public:
-  KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                 const char *name, const TQStringList& args = TQStringList());
   virtual ~KDVIMultiPage();
 
diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui
index 22f7a119..766f6b98 100644
--- a/kdvi/optionDialogFontsWidget_base.ui
+++ b/kdvi/optionDialogFontsWidget_base.ui
@@ -59,6 +59,6 @@
 <Q_SLOTS>
     <slot>buttonGroup1_clicked(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui
index 62cb4f6d..e821d761 100644
--- a/kdvi/optionDialogSpecialWidget_base.ui
+++ b/kdvi/optionDialogSpecialWidget_base.ui
@@ -199,7 +199,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 94a7a5ca..5bd082cb 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -650,11 +650,11 @@ void dviRenderer::applicationDoSpecial(char *cp)
     // line break is encountered) 
     if (special_command.startsWith("ps:SDict begin [") && special_command.endsWith(" pdfmark end")) {
       if (!currentlyDrawnPage->hyperLinkList.isEmpty()) {
-        // Parse the PostScript literal text string inside tqparentheses
+        // Parse the PostScript literal text string inside parentheses
         // and store it into 'targetName'.  The scanner works
         // according to "PostScript language reference, third edition"
         // - Sec. 3.2.2. The specification is implemented completely:
-        // balanced tqparentheses and all escape sequences are
+        // balanced parentheses and all escape sequences are
         // considered.
         TQString tmpTargetName = special_command.section('(', 1);
         TQString targetName;