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

30 files changed, 115 insertions, 115 deletions

diff --git a/kviewshell/documentRenderer.cpp b/kviewshell/documentRenderer.cpp
index 947bd10d..c02c3e09 100644
--- a/kviewshell/documentRenderer.cpp
+++ b/kviewshell/documentRenderer.cpp
@@ -17,7 +17,7 @@
 
 
 DocumentRenderer::DocumentRenderer(TQWidget* par)
-  : mutex(true), tqparentWidget(par), accessibilityBackground(false),
+  : mutex(true), parentWidget(par), accessibilityBackground(false),
     accessibilityBackgroundColor(TQColor(255,255,255))
 {
   numPages = 0;
diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h
index 1a43f1b5..a49b1ba7 100644
--- a/kviewshell/documentRenderer.h
+++ b/kviewshell/documentRenderer.h
@@ -447,7 +447,7 @@ protected:
   This pointer can be used by implementations e.g. to display error
   messages. This pointer can well be zero.
   */
-  TQGuardedPtr<TQWidget> tqparentWidget;
+  TQGuardedPtr<TQWidget> parentWidget;
 
   /** specifies if accessibilityBackgroundColor should be used
 
diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp
index 9ba61627..06d5d396 100644
--- a/kviewshell/empty_multipage.cpp
+++ b/kviewshell/empty_multipage.cpp
@@ -26,9 +26,9 @@
 
 K_EXPORT_COMPONENT_FACTORY(emptymultipagepart, EmptyMultiPageFactory)
 
-EmptyMultiPage::EmptyMultiPage(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name,
+EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name,
                                const TQStringList& args)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), emptyRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), emptyRenderer(parentWidget)
 {
   Q_UNUSED(args);
   setInstance(EmptyMultiPageFactory::instance());
diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h
index 5722e3e9..a77badda 100644
--- a/kviewshell/empty_multipage.h
+++ b/kviewshell/empty_multipage.h
@@ -33,7 +33,7 @@ class EmptyMultiPage : public KMultiPage
   TQ_OBJECT
 
 public:
-  EmptyMultiPage(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name,
+  EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name,
                  const TQStringList& args = TQStringList());
 
   virtual TQStringList fileFormats() const { return TQString(); }
diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp
index 39655602..36be452c 100644
--- a/kviewshell/kmultipage.cpp
+++ b/kviewshell/kmultipage.cpp
@@ -34,7 +34,7 @@
 
 //#define DEBUG_KMULTIPAGE
 
-KMultiPage::KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name)
+KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name)
   : DCOPObject("kmultipage"), KParts::ReadOnlyPart(tqparent, name)
 {
   // For reasons which I don't understand, the initialization of the
@@ -43,12 +43,12 @@ KMultiPage::KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObjec
   // This is because of the virtual inheritance. Get rid of it (but it's BC, and this is a lib...) -- DF
   setObjId("kmultipage");
 
-  tqparentWdg = tqparentWidget;
+  parentWdg = parentWidget;
   lastCurrentPage = 0;
   timer_id = -1;
   searchInProgress = false;
   
-  TQVBox* verticalBox = new TQVBox(tqparentWidget);
+  TQVBox* verticalBox = new TQVBox(parentWidget);
   verticalBox->setFocusPolicy(TQ_StrongFocus);
   setWidget(verticalBox);
   
@@ -207,7 +207,7 @@ bool KMultiPage::closeURL()
   widgetList.setAutoDelete(false);
   
   // Update ScrollView.
-  scrollView()->tqlayoutPages();
+  scrollView()->layoutPages();
   enableActions(false);
   
   // Clear Thumbnail List.
@@ -536,7 +536,7 @@ bool KMultiPage::gotoPage(const PageNumber& page, int y, bool isLink)
           if (pageWidget != 0)
             pageWidget->setPageNumber(tableauStartPage + i);
         }
-        scrollView()->tqlayoutPages();
+        scrollView()->layoutPages();
       }
     }
     // move scrollview to "page".
@@ -575,7 +575,7 @@ bool KMultiPage::gotoPage(const PageNumber& page, int y, bool isLink)
     }
 
     pageWidget->setPageNumber(page);
-    scrollView()->tqlayoutPages();
+    scrollView()->layoutPages();
     scrollView()->moveViewportToWidget(pageWidget, y);
   } else {
     // There are multiple widgets, then we are either in the
@@ -689,7 +689,7 @@ void KMultiPage::renderModeChanged()
   pageCache->clear();
 
   generateDocumentWidgets();
-  scrollView()->tqlayoutPages();
+  scrollView()->layoutPages();
 
   for (TQ_UINT16 i=0; i < widgetList.size(); i++)
   {
@@ -732,7 +732,7 @@ void KMultiPage::repaintAllVisibleWidgets()
   // re-aligned. This will automatically update all necessary
   // widgets.
   if (everResized == true)
-    scrollView()->tqlayoutPages(true);
+    scrollView()->layoutPages(true);
 }
 
 
@@ -767,7 +767,7 @@ void KMultiPage::print()
     return;
 
   // initialize the printer using the print dialog
-  if ( printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
+  if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
     // Now do the printing. 
     TQValueList<int> pageList = printer->pageList();
     if (pageList.isEmpty()) 
@@ -891,7 +891,7 @@ void KMultiPage::updateWidgetSize(const PageNumber& pageNumber)
       if (pageSize != documentWidget->pageSize())
       {
         documentWidget->setPageSize(pageSize);
-        scrollView()->tqlayoutPages();
+        scrollView()->layoutPages();
       }
       // We have just one widget per page.
       break;
diff --git a/kviewshell/kmultipage.h b/kviewshell/kmultipage.h
index 4a86f8e4..3414d10c 100644
--- a/kviewshell/kmultipage.h
+++ b/kviewshell/kmultipage.h
@@ -40,7 +40,7 @@ class KMultiPage : public KParts::ReadOnlyPart, virtual public kmultipageInterfa
   TQ_OBJECT
 
 public:
-  KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name);
+  KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name);
   virtual ~KMultiPage();
 
   /* returns the scrollview used for the display */
@@ -121,7 +121,7 @@ public:
 
   // 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)) )) {
     delete printer;
     return;
   }
@@ -155,7 +155,7 @@ public:
 
   // 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)) )) {
     delete printer;
     return;
   }
@@ -569,7 +569,7 @@ protected:
 
   This pointer is automatically set by the constructor.
   */
-  TQGuardedPtr<TQWidget> tqparentWdg;
+  TQGuardedPtr<TQWidget> parentWdg;
 
   TQPtrVector<DocumentWidget> widgetList;
 
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index eb981335..1a0902f2 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -56,7 +56,7 @@
 typedef KParts::GenericFactory<KViewPart> KViewPartFactory;
 K_EXPORT_COMPONENT_FACTORY(kviewerpart, KViewPartFactory)
 
-KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                      const char *name, const TQStringList& args)
   : KViewPart_Iface(tqparent, name), showSidebar(0), saveAction(0), partManager(0),
     multiPageLibrary(TQString()), aboutDialog(0)
@@ -71,12 +71,12 @@ KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject
   connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(fileChanged(const TQString&)));
   watch->startScan();
 
-  mainWidget = new TQHBox(tqparentWidget, widgetName);
+  mainWidget = new TQHBox(parentWidget, widgetName);
   mainWidget->setFocusPolicy(TQ_StrongFocus);
   setWidget(mainWidget);
 
   // Setup part manager
-  partManager = new KParts::PartManager(tqparentWidget, "PartManager for kviewpart");
+  partManager = new KParts::PartManager(parentWidget, "PartManager for kviewpart");
   setManager(partManager);
   // Don't switch to another part when pressing a mouse button
   partManager->setActivationButtonMask(0);
@@ -113,7 +113,7 @@ KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject
   // If still no MultiPage has been found, report an error and abort.
   if (offers.isEmpty())
   {
-    KMessageBox::error(tqparentWidget, i18n("<qt>No MultiPage found.</qt>"));
+    KMessageBox::error(parentWidget, i18n("<qt>No MultiPage found.</qt>"));
     //    return;
   }
 
diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h
index bbd6f72c..7390faa1 100644
--- a/kviewshell/kviewpart.h
+++ b/kviewshell/kviewpart.h
@@ -34,7 +34,7 @@ class KViewPart : public KViewPart_Iface
   TQ_OBJECT
 
 public:
-  KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
             const char *name, const TQStringList& args);
   virtual ~KViewPart();
 
diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h
index 5e1a04f8..9f64891c 100644
--- a/kviewshell/marklist.h
+++ b/kviewshell/marklist.h
@@ -46,7 +46,7 @@ class ThumbnailWidget : public TQWidget
   TQ_OBJECT
 
 public:
-  ThumbnailWidget(MarkListWidget* tqparent_, const PageNumber& _pageNumber, DocumentPageCache*);
+  ThumbnailWidget(MarkListWidget* parent_, const PageNumber& _pageNumber, DocumentPageCache*);
 
 private:
   virtual void paintEvent(TQPaintEvent*);
diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui
index aec982e2..09ff3af3 100644
--- a/kviewshell/optionDialogAccessibilityWidget.ui
+++ b/kviewshell/optionDialogAccessibilityWidget.ui
@@ -519,7 +519,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="5" margin="11"/>
+<layoutdefaults spacing="5" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kviewshell/optionDialogGUIWidget_base.ui b/kviewshell/optionDialogGUIWidget_base.ui
index 1d37dd34..50f8858a 100644
--- a/kviewshell/optionDialogGUIWidget_base.ui
+++ b/kviewshell/optionDialogGUIWidget_base.ui
@@ -144,5 +144,5 @@
     <tabstop>kcfg_OverviewModeRows</tabstop>
     <tabstop>kcfg_OverviewModeColumns</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kviewshell/pageSizeWidget_base.ui b/kviewshell/pageSizeWidget_base.ui
index c5ca5981..e7ddbde3 100644
--- a/kviewshell/pageSizeWidget_base.ui
+++ b/kviewshell/pageSizeWidget_base.ui
@@ -250,7 +250,7 @@
     <tabstop>widthUnits</tabstop>
     <tabstop>heightInput</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp
index 81e3ed9b..060f2d15 100644
--- a/kviewshell/pageView.cpp
+++ b/kviewshell/pageView.cpp
@@ -66,7 +66,7 @@ void PageView::addChild( TQPtrVector<DocumentWidget> *wdgList )
   }
 
   widgetList = wdgList;
-  tqlayoutPages();
+  layoutPages();
 }
 
 
@@ -237,7 +237,7 @@ void PageView::viewportResizeEvent( TQResizeEvent* e )
   if (!widgetList)
     return;
 
-  tqlayoutPages();
+  layoutPages();
 
   emit viewSizeChanged( viewport()->size() );
 }
@@ -295,7 +295,7 @@ void PageView::setFullScreenMode(bool fullScreen)
   }
 }
 
-void PageView::tqlayoutPages(bool zoomChanged)
+void PageView::layoutPages(bool zoomChanged)
 {
   // Paranoid safety check
   if (widgetList == 0)
diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h
index a7d2ad15..06995e45 100644
--- a/kviewshell/pageView.h
+++ b/kviewshell/pageView.h
@@ -108,7 +108,7 @@ public slots:
 
     /** Set tqlayout of the page widgets according to the current viewmode and zoomlevel.
         Set zoomChanged = true if the the tqlayout needs updateing because the zoomlevel has changed. */
-    void tqlayoutPages(bool zoomChanged = false);
+    void layoutPages(bool zoomChanged = false);
 
     void slotEnableMoveTool(bool enable);
 
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index dbe68aaa..90ec1969 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -47,9 +47,9 @@ typedef KParts::GenericFactory<DjVuMultiPage> DjVuMultiPageFactory;
 K_EXPORT_COMPONENT_FACTORY(djvuviewpart, DjVuMultiPageFactory)
 
 
-DjVuMultiPage::DjVuMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                              const char *name, const TQStringList&)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), djvuRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), djvuRenderer(parentWidget)
 {
   /* This is kparts wizardry that cannot be understood by man. Simply
      change the names to match your implementation.  */
@@ -162,7 +162,7 @@ void DjVuMultiPage::slotDeletePages()
   if (numberOfPages() == 0)
     return;
   
-  KDialogBase dialog( tqparentWdg, "urldialog", true, i18n("Delete Pages"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
+  KDialogBase dialog( parentWdg, "urldialog", true, i18n("Delete Pages"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
   PageRangeWidget range( 1, numberOfPages(), currentPageNumber(), &dialog, "range widget" );
   TQToolTip::add( &range, i18n( "Select the pages you wish to delete." ) );
   dialog.setButtonOK(i18n("Delete Pages"));
@@ -220,7 +220,7 @@ void DjVuMultiPage::print()
   printer->addDialogPage( conversionOptions );
   
   // initialize the printer using the print dialog
-  if ( printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
+  if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
     // Now do the printing. 
     TQValueList<int> pageList = printer->pageList();
     if (pageList.isEmpty()) 
@@ -334,7 +334,7 @@ void DjVuMultiPage::slotSave()
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
-    int r = KMessageBox::warningContinueCancel(tqparentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").tqarg(fileName),
 					       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -344,7 +344,7 @@ void DjVuMultiPage::slotSave()
 
   /*
   if (!djvuRenderer.save(fileName) == false)
-    KMessageBox::error( tqparentWdg,
+    KMessageBox::error( parentWdg,
 			i18n("<qt><strong>File error.</strong> Unable to write to the specified file '%1'. The document is <strong>not</strong> saved.</qt>").tqarg(fileName),
 			i18n("File Error"));
   */
diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h
index 83e94e40..eaad8a53 100644
--- a/kviewshell/plugins/djvu/djvumultipage.h
+++ b/kviewshell/plugins/djvu/djvumultipage.h
@@ -96,7 +96,7 @@ public:
   kmultipage. Please have a look at the constructor's source code to
   see how to adjust this for your implementation.
   */
-  DjVuMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
 		   const char *name, const TQStringList& args = TQStringList());
   
   /** Destructor
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index e1cbd044..8084e327 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -270,7 +270,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &)
   TQFileInfo fi(fname);
   TQString   filename = fi.absFilePath();
   if (!fi.exists() || fi.isDir()) {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
 			i18n("File Error"));
     // the return value 'false' indicates that this operation was not successful.
@@ -292,7 +292,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &)
   // If the above assumption was false.
   if (!document)
   {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
       i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
       i18n("File Error"));
 
@@ -577,7 +577,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa
   TQMutexLocker locker( &mutex );
   
   // Set up progress dialog
-  KProgressDialog *pdialog = new KProgressDialog(tqparentWidget, "Printing-ProgressDialog", i18n("Printing..."), i18n("Preparing pages for printing..."), true);
+  KProgressDialog *pdialog = new KProgressDialog(parentWidget, "Printing-ProgressDialog", i18n("Printing..."), i18n("Preparing pages for printing..."), true);
   pdialog->setButtonText(i18n("Abort"));
   pdialog->showCancelButton(true);
   pdialog->progressBar()->setTotalSteps(pageList.size());
@@ -634,7 +634,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to)
 
   KProgressDialog *pdialog = 0;
   if (to-from > 9) {
-    pdialog = new KProgressDialog(tqparentWidget, "Printing-ProgressDialog", i18n("Deleting pages..."), i18n("Please wait while pages are removed..."), true);
+    pdialog = new KProgressDialog(parentWidget, "Printing-ProgressDialog", i18n("Deleting pages..."), i18n("Please wait while pages are removed..."), true);
     pdialog->showCancelButton(false);
     pdialog->progressBar()->setTotalSteps(to-from+1);
     pdialog->progressBar()->setFormat(TQString());
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
index 416b7b36..bfaf546c 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
@@ -141,5 +141,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 </UI>
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
index fa6ad375..8bbc6db6 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
@@ -433,15 +433,15 @@ DjVuDocEditor::strip_incl_chunks(const GP<DataPool> & pool_in)
 }
 
 GUTF8String
-DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
+DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id,
                            int chunk_num, DjVuPort *source)
       // Will open the 'file_name' and insert it into an existing DjVuFile
-      // with ID 'tqparent_id'. Will insert the INCL chunk at position chunk_num
+      // with ID 'parent_id'. Will insert the INCL chunk at position chunk_num
       // Will NOT process ANY files included into the file being inserted.
       // Moreover it will strip out any INCL chunks in that file...
 {
    DEBUG_MSG("DjVuDocEditor::insert_file(): fname='" << file_url <<
-             "', tqparent_id='" << tqparent_id << "'\n");
+             "', parent_id='" << parent_id << "'\n");
    DEBUG_MAKE_INDENT(3);
    const GP<DjVmDir> dir(get_djvm_dir());
 
@@ -469,16 +469,16 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
    file_pool=strip_incl_chunks(file_pool);
 
       // Check if tqparent ID is valid
-   GP<DjVmDir::File> tqparent_frec(dir->id_to_file(tqparent_id));
-   if (!tqparent_frec)
-     tqparent_frec=dir->name_to_file(tqparent_id);
-   if (!tqparent_frec)
-     tqparent_frec=dir->title_to_file(tqparent_id);
-   if (!tqparent_frec)
-     G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +tqparent_id);
-   const GP<DjVuFile> tqparent_file(get_djvu_file(tqparent_id));
-   if (!tqparent_file)
-     G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+tqparent_id);
+   GP<DjVmDir::File> parent_frec(dir->id_to_file(parent_id));
+   if (!parent_frec)
+     parent_frec=dir->name_to_file(parent_id);
+   if (!parent_frec)
+     parent_frec=dir->title_to_file(parent_id);
+   if (!parent_frec)
+     G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +parent_id);
+   const GP<DjVuFile> parent_file(get_djvu_file(parent_id));
+   if (!parent_file)
+     G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+parent_id);
 
       // Now obtain ID for the new file
    const GUTF8String id(find_unique_id(file_url.fname()));
@@ -486,7 +486,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
       // Add it into the directory
    const GP<DjVmDir::File> frec(
      DjVmDir::File::create(id, id, id, DjVmDir::File::INCLUDE));
-   int pos=dir->get_file_pos(tqparent_frec);
+   int pos=dir->get_file_pos(parent_frec);
    if (pos>=0)
      ++pos;
    dir->insert_file(frec, pos);
@@ -500,7 +500,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
    }
 
       // And insert it into the tqparent DjVuFile
-   tqparent_file->insert_file(id, chunk_num);
+   parent_file->insert_file(id, chunk_num);
 
    return id;
 }
@@ -930,7 +930,7 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
 				GMap<GUTF8String, void *> & ref_map,
 				GMap<GURL, void *> & visit_map)
       // This private function is used to generate a list (implemented as map)
-      // of files referencing the given file. To get list of all tqparents
+      // of files referencing the given file. To get list of all parents
       // for file with ID 'id' iterate map obtained as
       // *((GMap<GUTF8String, void *> *) ref_map[id])
 {
@@ -944,17 +944,17 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
       for(GPosition pos=files_list;pos;++pos)
       {
          GP<DjVuFile> child_file=files_list[pos];
-            // First: add the current file to the list of tqparents for
+            // First: add the current file to the list of parents for
             // the child being processed
          GURL child_url=child_file->get_url();
          const GUTF8String child_id(
            djvm_dir->name_to_file(child_url.fname())->get_load_name());
-         GMap<GUTF8String, void *> * tqparents=0;
+         GMap<GUTF8String, void *> * parents=0;
          if (ref_map.tqcontains(child_id))
-            tqparents=(GMap<GUTF8String, void *> *) ref_map[child_id];
+            parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
          else
-            ref_map[child_id]=tqparents=new GMap<GUTF8String, void *>();
-         (*tqparents)[id]=0;
+            ref_map[child_id]=parents=new GMap<GUTF8String, void *>();
+         (*parents)[id]=0;
             // Second: go recursively
          generate_ref_map(child_file, ref_map, visit_map);
       }
@@ -972,22 +972,22 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
       // Finally, if remove_unref is TRUE, we will go down the files
       // hierarchy removing every file, which becomes unreferenced.
       //
-      // ref_map will be used to find out list of tqparents referencing
+      // ref_map will be used to find out list of parents referencing
       // this file (required when removing INCL chunks)
 {
-      // First get rid of INCL chunks in tqparents
-   GMap<GUTF8String, void *> * tqparents=(GMap<GUTF8String, void *> *) ref_map[id];
-   if (tqparents)
+      // First get rid of INCL chunks in parents
+   GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[id];
+   if (parents)
    {
-      for(GPosition pos=*tqparents;pos;++pos)
+      for(GPosition pos=*parents;pos;++pos)
       {
-         const GUTF8String tqparent_id((*tqparents).key(pos));
-         const GP<DjVuFile> tqparent(get_djvu_file(tqparent_id));
+         const GUTF8String parent_id((*parents).key(pos));
+         const GP<DjVuFile> tqparent(get_djvu_file(parent_id));
          if (tqparent)
            tqparent->unlink_file(id);
       }
-      delete tqparents;
-      tqparents=0;
+      delete parents;
+      parents=0;
       ref_map.del(id);
    }
 
@@ -1006,10 +1006,10 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
             GURL child_url=child_file->get_url();
             const GUTF8String child_id(
               djvm_dir->name_to_file(child_url.fname())->get_load_name());
-            GMap<GUTF8String, void *> * tqparents=(GMap<GUTF8String, void *> *) ref_map[child_id];
-            if (tqparents) tqparents->del(id);
+            GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
+            if (parents) parents->del(id);
 
-            if (remove_unref && (!tqparents || !tqparents->size()))
+            if (remove_unref && (!parents || !parents->size()))
                remove_file(child_id, remove_unref, ref_map);
          }
       } G_CATCH(exc) {
@@ -1041,7 +1041,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref)
    if (!djvm_dir->id_to_file(id))
       G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t"+id);
 
-      // First generate a map of references (containing the list of tqparents
+      // First generate a map of references (containing the list of parents
       // including this particular file. This will speed things up
       // significatly.
    GMap<GUTF8String, void *> ref_map;        // GMap<GUTF8String, GMap<GUTF8String, void *> *> in fact
@@ -1058,8 +1058,8 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref)
    GPosition pos;
    while((pos=ref_map))
    {
-      GMap<GUTF8String, void *> * tqparents=(GMap<GUTF8String, void *> *) ref_map[pos];
-      delete tqparents;
+      GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[pos];
+      delete parents;
       ref_map.del(pos);
    }
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h
index 96b18a06..7bf6124a 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h
@@ -199,7 +199,7 @@ public:
 	  an exception is thrown. */
    GUTF8String	page_to_id(int page_num) const;
    
-   GUTF8String	insert_file(const GURL &url, const GUTF8String &tqparent_id,
+   GUTF8String	insert_file(const GURL &url, const GUTF8String &parent_id,
 			    int chunk_num=1, DjVuPort *source=0);
       /** Inserts the referenced file into this DjVu document.
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
index 0ba922b3..ed998923 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
@@ -1328,7 +1328,7 @@ DjVuDocument::get_thumbnail(int page_num, bool dont_decode)
       }
    }
 
-      // Aptqparently we're out of luck and need to decode the requested
+      // Apparently we're out of luck and need to decode the requested
       // page (unless it's already done and if it's allowed) and render
       // it into the thumbnail. If dont_decode is true, do not attempt
       // to create this file (because this will result in a request for data)
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index acba10f2..e6e1c2ce 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
@@ -91,7 +91,7 @@ namespace DJVU {
 //// DJVUIMAGE: CONSTRUCTION
 
 DjVuImage::DjVuImage(void) 
-: rotate_count(-1),retqlayout_sent(false)
+: rotate_count(-1),relayout_sent(false)
 {
 }
 
@@ -423,13 +423,13 @@ DjVuImage::get_long_description() const
 void
 DjVuImage::notify_chunk_done(const DjVuPort *, const GUTF8String & name)
 {
-   if (!retqlayout_sent &&
+   if (!relayout_sent &&
      ( !name.cmp("INFO", 4) ||
        !name.cmp("PMxx", 2) ||
        !name.cmp("BMxx", 2)  ) )
    {
       DjVuPort::get_portcaster()->notify_retqlayout(this);
-      retqlayout_sent=true;
+      relayout_sent=true;
    } 
    else if (!name.cmp("Sxxx", 1) ||
             !name.cmp("BGxx", 2) ||
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
index 7f2e836a..30fc9898 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
@@ -414,7 +414,7 @@ public:
 private:
   GP<DjVuFile>		file;
   int			rotate_count;
-  bool			retqlayout_sent;
+  bool			relayout_sent;
   
   // HELPERS
   int stencil(GPixmap *pm, const GRect &rect, int subs, double gcorr) const;
diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
index a898d4dd..9da00dfe 100644
--- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
@@ -325,24 +325,24 @@ GIFFChunk::get_chunks_number(const GUTF8String &name)
 //************************************************************************
 
 void
-GIFFManager::add_chunk(GUTF8String tqparent_name, const GP<GIFFChunk> & chunk,
+GIFFManager::add_chunk(GUTF8String parent_name, const GP<GIFFChunk> & chunk,
 		       int pos)
-      // tqparent_name is the fully qualified name of the PARENT
+      // parent_name is the fully qualified name of the PARENT
       //             IT MAY BE EMPTY
       // All the required chunks will be created
       // pos=-1 means to append the chunk
 {
-  DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << tqparent_name << "'\n");
+  DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << parent_name << "'\n");
   DEBUG_MAKE_INDENT(3);
    
   if (!top_level->get_name().length())
   {
-    if ((!tqparent_name.length())||(tqparent_name[0]!='.'))
+    if ((!parent_name.length())||(parent_name[0]!='.'))
       G_THROW( ERR_MSG("GIFFManager.no_top_name") );
-    if (tqparent_name.length() < 2)
+    if (parent_name.length() < 2)
     {
       // 'chunk' is actually the new top-level chunk
-      DEBUG_MSG("since tqparent_name=='.', making the chunk top-level\n");
+      DEBUG_MSG("since parent_name=='.', making the chunk top-level\n");
       if (!chunk->is_container())
         G_THROW( ERR_MSG("GIFFManager.no_top_cont") );
       top_level=chunk;
@@ -350,33 +350,33 @@ GIFFManager::add_chunk(GUTF8String tqparent_name, const GP<GIFFChunk> & chunk,
     }
 
     DEBUG_MSG("Setting the name of the top-level chunk\n");
-    const int next_dot=tqparent_name.search('.',1);
+    const int next_dot=parent_name.search('.',1);
     if(next_dot>=0)
     {
-      top_level->set_name(tqparent_name.substr(1,next_dot-1));
+      top_level->set_name(parent_name.substr(1,next_dot-1));
     }else
     {
-      top_level->set_name(tqparent_name.substr(1,(unsigned int)-1));
+      top_level->set_name(parent_name.substr(1,(unsigned int)-1));
     }
   }
 
   DEBUG_MSG("top level chunk name='" << top_level->get_name() << "'\n");
    
-  if (tqparent_name.length() && tqparent_name[0] == '.')
+  if (parent_name.length() && parent_name[0] == '.')
   {
-    int next_dot=tqparent_name.search('.',1);
+    int next_dot=parent_name.search('.',1);
     if(next_dot<0)
     {
-      next_dot=tqparent_name.length();
+      next_dot=parent_name.length();
     }
-    GUTF8String top_name=tqparent_name.substr(1,next_dot-1);
+    GUTF8String top_name=parent_name.substr(1,next_dot-1);
     if (!top_level->check_name(top_name))
       G_THROW( ERR_MSG("GIFFManager.wrong_name") "\t"+top_name);
-    tqparent_name=tqparent_name.substr(next_dot,(unsigned int)-1);
+    parent_name=parent_name.substr(next_dot,(unsigned int)-1);
   }
 
   GP<GIFFChunk> cur_sec=top_level;
-  const char * start, * end=(const char *)tqparent_name-1;
+  const char * start, * end=(const char *)parent_name-1;
   do
   {
     for(start=++end;*end&&(*end!='.');end++)
diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h
index 96f13f8f..716f66f9 100644
--- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h
+++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h
@@ -265,8 +265,8 @@ public:
 
       /// Sets the name of the top level chunk to {\em name}
    void		set_name(const GUTF8String &name);
-      /** Adds the chunk {\em chunk} to chunk with name {\em tqparent_name} at
-	  position {\em pos}. {\em tqparent_name} may contain dots, brackets
+      /** Adds the chunk {\em chunk} to chunk with name {\em parent_name} at
+	  position {\em pos}. {\em parent_name} may contain dots, brackets
 	  and colons. All missing chunks in the chain will be created.
 
 	  {\bf Examples:}
@@ -282,7 +282,7 @@ public:
 	     ;; Same thing regardless of the top-level chunk name
 	     m.addChunk("FORM:DJVU[1]", ch);
 	  \end{verbatim} */
-   void		add_chunk(GUTF8String tqparent_name, const GP<GIFFChunk> & chunk, int pos=-1);
+   void		add_chunk(GUTF8String parent_name, const GP<GIFFChunk> & chunk, int pos=-1);
       /** If {\em name}={\em name1}.{\em name2} where {\em name2} doesn't
 	  contain dots, then #addChunk()# will create plain chunk with
 	  name {\em name2} with data {\em buffer} of size {\em length} and
diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
index 3b52faca..fa924324 100644
--- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
@@ -1397,7 +1397,7 @@ cotask_select(int nfds,
     }
   // reschedule
   cotask_yield();
-  // call select to update tqmasks
+  // call select to update masks
   if (tm)
     {
       tm->tv_sec = maxwait/1000;
diff --git a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp
index eb429563..2a4d4035 100644
--- a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp
@@ -161,7 +161,7 @@ public:
   /** Initializes an IWBitmap with image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). */
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */
   void init(const GBitmap &bm, const GP<GBitmap> tqmask=0);
   // CODER
   /** Encodes one data chunk into ByteStream #bs#.  Parameter #parms# controls
@@ -212,7 +212,7 @@ public:
   /** Initializes an IWPixmap with color image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}).
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}).
       Argument #crcbmode# specifies how the chrominance information should be
       encoded (see \Ref{CRCBMode}). */
   void init(const GPixmap &bm, const GP<GBitmap> tqmask=0, CRCBMode crcbmode=CRCBnormal);
@@ -724,7 +724,7 @@ interpolate_tqmask(short *data16, int w, int h, int rowsize,
                  const signed char *tqmask8, int mskrowsize)
 {
   int i,j;
-  // count tqmasked bits
+  // count masked bits
   short *count;
   GPBuffer<short> gcount(count,w*h);
   short *cp = count;
@@ -851,7 +851,7 @@ forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end,
         }
       // Decompose
       IW44Image::Transform::Encode::forward(sdata, w, h, w, scale, scale+scale);
-      // Cancel tqmasked coefficients
+      // Cancel masked coefficients
       d = sdata;
       m = stqmask;
       for (i=0; i<h; i+=scale+scale)
@@ -947,7 +947,7 @@ IW44Image::Map::Encode::create(const signed char *img8, int imgrowsize,
       // Interpolate pixels below tqmask
       DJVU_PROGRESS_RUN(transf, 1);
       interpolate_tqmask(data16, iw, ih, bw, msk8, mskrowsize);
-      // Multiscale iterative tqmasked decomposition
+      // Multiscale iterative masked decomposition
       DJVU_PROGRESS_RUN(transf, 3);
       forward_tqmask(data16, iw, ih, bw, 1, 32, msk8, mskrowsize);
     }
diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h
index 954eee56..0363a1fb 100644
--- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h
+++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h
@@ -140,7 +140,7 @@
     routine can use an optional bilevel image named the tqmask.  Every non zero
     pixel in the tqmask means the value of the corresponding pixel in the
     background image is irrelevant.  The wavelet decomposition code will
-    replace these tqmasked pixels by a color value whose coding cost is minimal
+    replace these masked pixels by a color value whose coding cost is minimal
     (see \URL{http://www.research.att.com/~leonb/DJVU/tqmask}).
 
     {\bf ToDo} --- There are many improvements to be made.  Besides better
@@ -278,12 +278,12 @@ public:
   /** Initializes an IWBitmap with image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). */
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */
   static GP<IW44Image> create_encode(const GBitmap &bm, const GP<GBitmap> tqmask=0);
   /** Initializes an IWPixmap with color image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}).
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}).
       Argument #crcbmode# specifies how the chrominance information should be
       encoded (see \Ref{CRCBMode}). */
   static GP<IW44Image> create_encode(const GPixmap &bm, const GP<GBitmap> tqmask=0, CRCBMode crcbmode=CRCBnormal);
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
index 57dd5200..3ff9d7df 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
@@ -467,7 +467,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
           // Avoid coding null tqshapes/blits
           else if (jshp.bits) 
             {
-              // Make sure all tqparents have been coded
+              // Make sure all parents have been coded
               if (jshp.tqparent>=0 && tqshape2lib[jshp.tqparent]<0)
                 encode_libonly_tqshape(gjim, jshp.tqparent);
               // Allocate library entry when needed
diff --git a/kviewshell/plugins/djvu/pageRangeWidget_base.ui b/kviewshell/plugins/djvu/pageRangeWidget_base.ui
index 90f85b5a..943f0201 100644
--- a/kviewshell/plugins/djvu/pageRangeWidget_base.ui
+++ b/kviewshell/plugins/djvu/pageRangeWidget_base.ui
@@ -65,7 +65,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>