diff options
Diffstat (limited to 'kviewshell/plugins')
113 files changed, 125 insertions, 293 deletions
diff --git a/kviewshell/plugins/djvu/CMakeLists.txt b/kviewshell/plugins/djvu/CMakeLists.txt index fe9d4ef9..237f6bf3 100644 --- a/kviewshell/plugins/djvu/CMakeLists.txt +++ b/kviewshell/plugins/djvu/CMakeLists.txt @@ -28,7 +28,12 @@ link_directories( ##### other data ################################ -install( FILES djvumultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE djvumultipage.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kviewshell-desktops +) + install( FILES djvumultipage.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES djvumultipage.rc DESTINATION ${DATA_INSTALL_DIR} ) diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index ae1ab9f6..8cfde527 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -67,10 +67,10 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO renderModeAction->setCurrentItem(Prefs::renderMode()); - deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); + deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQ_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); // change the rendermode - connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int))); + connect(renderModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setRenderMode(int))); /* It is very important that this method is called in the constructor. Otherwise tdemultipage does not know how to render diff --git a/kviewshell/plugins/djvu/djvumultipage.desktop b/kviewshell/plugins/djvu/djvumultipage.desktop index 6da86c47..6aecc337 100644 --- a/kviewshell/plugins/djvu/djvumultipage.desktop +++ b/kviewshell/plugins/djvu/djvumultipage.desktop @@ -1,56 +1,8 @@ [Desktop Entry] Name=kdjview -Name[hu]=KDjView -Name[ja]=Kdjview -Name[ne]=केडीजे दृश्य -Name[sk]=kdjView -Name[sv]=Kdjview -Name[zh_CN]=KDjView Icon=kdjview Type=Service Comment=KViewShell plugin for DjVu files -Comment[bg]=Приставка за файлове DjVu -Comment[br]=Lugent KViewShell evit ar restroù DjVu -Comment[bs]=KViewShell dodatak za DjVu datoteke -Comment[ca]=Connector pel KViewShell per fitxers DjVu -Comment[cs]=KViewShell modul pro DjVu soubory -Comment[da]=Kviewshell-plugin for DjVu-filer -Comment[de]=Ein KViewShell-Modul für DjVu-Dateien -Comment[el]=Πρόσθετο του KViewShell για αρχεία DjVu -Comment[es]=Extensión KViewShell para archivos DjVu -Comment[et]=KView DjVu-failide plugin -Comment[eu]=DjVu fitxategien KViewShell-en plugina -Comment[fa]=وصلۀ KViewShell برای پروندههای DjVu -Comment[fi]=KViewShell sovelma DjVu-tiedostoille -Comment[fr]=Module KViewShell pour les fichiers DjVu -Comment[gl]=Extensión de KViewShell para ficheiros DjVu -Comment[hu]=KViewShell-modul DjVu-fájlokhoz -Comment[is]=KViewShell íforrit fyrir DjVu skrár -Comment[it]=Plugin KViewShell per file DjVu -Comment[ja]=DjVu ファイル用の KViewShell プラグイン -Comment[kk]=DjVu файлдарына арналған KViewShell плагин модулі -Comment[km]=កម្មវិធីជំនួយ KViewShell សម្រាប់ឯកសារ DjVu -Comment[lt]=KViewShell priedas, skirtas DjVu byloms -Comment[ms]=Plugin KViewShell untuk fail DjVu -Comment[nb]=KViewShell programtillegg for DjVu-filer -Comment[nds]=En "KViewShell"-Moduul för DjVu-Dateien -Comment[ne]=डिजे भीयू फाइलका लागि केडीई दृश्य शेल प्लगइन -Comment[nl]=KViewShell-plugin voor DjVu-bestanden -Comment[nn]=KViewShell-programtillegg for DjVu-filer -Comment[pl]=Wtyczka KViewShell do plików DjVu -Comment[pt]='Plugin' do KViewShell para ficheiros do DjVu -Comment[pt_BR]=Plugin KViewShell para arquivos DjVu -Comment[ru]=Компонент просмотра файлов DjVu -Comment[sk]=KViewShell modul pre DjVu súbory -Comment[sl]=Vstavek za KViewShell za datoteke DjVu -Comment[sr]=KViewShell-ов прикључак за DjVu фајлове -Comment[sr@Latn]=KViewShell-ov priključak za DjVu fajlove -Comment[sv]=Kviewshell-insticksprogram för DjVu-filer -Comment[tr]=DjVu dosyaları için KViewShell eklentisi -Comment[uk]=Втулок перегляду файлів DjVu для KViewShell -Comment[zh_CN]=DjVu 文件的 KViewShell 插件 -Comment[zh_HK]=用於 DjVu 檔案的 KViewShell 插件 -Comment[zh_TW]=DjVu 檔的 KViewShell 外掛程式 X-TDE-ServiceTypes=KViewShell/MultiPage X-TDE-MimeTypes=image/x-djvu X-TDE-Library=djvuviewpart diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index 2bbc6f4a..83cf8ff1 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -86,7 +86,7 @@ required. class DjVuMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index c9e52c1e..2fac80bb 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -27,7 +27,7 @@ #include <tqfileinfo.h> #include <tqimage.h> #include <tqpainter.h> -#include <kapp.h> +#include <tdeapplication.h> #include "GBitmap.h" #include "BSByteStream.h" @@ -403,7 +403,7 @@ bool DjVuRenderer::initializeDocument() for(TQ_UINT16 i=0; i<numPages; i++) { // Keep the GUI updated if (i%100 == 0) - kapp->processEvents(); + tdeApp->processEvents(); GP<DjVuFile> djvuFile = document->get_djvu_file(i); int resolution; @@ -611,7 +611,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa delete pdialog; // This is to keep the GUI updated. - kapp->processEvents(); + tdeApp->processEvents(); obs->flush(); return !iscancelled; @@ -639,7 +639,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) pdialog->progressBar()->setTotalSteps(to-from+1); pdialog->progressBar()->setFormat(TQString()); pdialog->show(); - kapp->processEvents(); + tdeApp->processEvents(); } // set the document pointer temporarily to 0, so that no-one tries @@ -658,7 +658,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) document_new->remove_page(from-1); pdialog->progressBar()->setProgress(i-from); pdialog->progressBar()->setFormat(i18n("deleting page %1").arg(i)); - kapp->processEvents(); + tdeApp->processEvents(); } delete pdialog; } @@ -712,7 +712,7 @@ void DjVuRenderer::printerInfoCallBack(int page_num, int page_count, int, DjVuTo G_THROW("STOP"); // This is to keep the GUI updated. - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/kviewshell/plugins/djvu/djvurenderer.h b/kviewshell/plugins/djvu/djvurenderer.h index ff615033..8dd61e68 100644 --- a/kviewshell/plugins/djvu/djvurenderer.h +++ b/kviewshell/plugins/djvu/djvurenderer.h @@ -50,7 +50,7 @@ with 10 empty pages of A4 size and a few anchors and bookmarks. class DjVuRenderer : public DocumentRenderer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp index 5cb7b04c..5a877dd6 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h index b2676d5a..ca0b1771 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.h +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -479,10 +478,8 @@ public: subscript range, you must stop using the pointers returned by prior invocation of this conversion operator. */ operator const TYPE* () const; - -#ifndef __MWERKS__ //MCW can't compile operator const TYPE* (); -#endif + /** Insert new elements into an array. This function inserts #howmany# elements at position #n# into the array. The initial value #val# is copied into the new elements. All array elements previously located at subscripts @@ -529,14 +526,12 @@ ArrayBaseT<TYPE>::operator TYPE* () return &((TYPE *) rep->data)[-rep->minlo]; } -#ifndef __MWERKS__ //MCW can't compile template <class TYPE> inline ArrayBaseT<TYPE>::operator const TYPE* () { const ArrayRep * rep=(const ArrayRep *) get(); return &((const TYPE *) rep->data)[-rep->minlo]; } -#endif template <class TYPE> inline ArrayBaseT<TYPE>::operator const TYPE* () const @@ -904,11 +899,7 @@ public: const GP<TYPE>& operator[](int n) const; // -- CONVERSION operator GP<TYPE>* (); - -#ifndef __MWERKS__ //MCW can't compile operator const GP<TYPE>* (); -#endif - operator const GP<TYPE>* () const; // -- ALTERATION void ins(int n, const GP<TYPE> &val, unsigned int howmany=1); @@ -953,13 +944,11 @@ inline DPArray<TYPE>::operator GP<TYPE>* () return (GP<TYPE> *) DArray<GPBase>::operator GPBase*(); } -#ifndef __MWERKS__ //MCW can't compile template<class TYPE> inline DPArray<TYPE>::operator const GP<TYPE>* () { return (const GP<TYPE> *) DArray<GPBase>::operator const GPBase*(); } -#endif template<class TYPE> inline DPArray<TYPE>::operator const GP<TYPE>* () const diff --git a/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp index 77334a45..62dfa440 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/BSByteStream.h b/kviewshell/plugins/djvu/libdjvu/BSByteStream.h index 6a985cdf..be5735bd 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/BSByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp index 9d5b726d..6278c19a 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp index 011b348d..ff04da3e 100644 --- a/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ByteStream.h b/kviewshell/plugins/djvu/libdjvu/ByteStream.h index 7ecfd8b7..29874faf 100644 --- a/kviewshell/plugins/djvu/libdjvu/ByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/ByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -187,7 +186,7 @@ public: {\bf Error reporting}: If #seek()# succeeds, #0# is returned. Otherwise it either returns - #-1# (if #nothrow# is set to #FALSE#) or throws the \Ref{GException} + #-1# (if #nothrow# is set to #false#) or throws the \Ref{GException} exception. */ virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false); /** Flushes all buffers in the ByteStream. Calling this function diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp index 1190292e..5766e67e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -1269,7 +1268,7 @@ DataPool::get_data(void * buffer, int offset, int sz, int level) // This call to get_data() should return immediately as there MUST // be data in the buffer after wait_for_data(reader) returns - // or eof_flag should be TRUE + // or eof_flag should be true return get_data(buffer, reader->offset, reader->size, level); } return 0; diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.h b/kviewshell/plugins/djvu/libdjvu/DataPool.h index fb4bea4e..c6a4e672 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.h +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -140,10 +139,10 @@ class ByteStream; Functions like \Ref{get_data}() or \Ref{get_stream}() can be used to obtain direct or sequential access to the data. As - long as \Ref{is_eof}() is #FALSE#, #DataPool# will block every + long as \Ref{is_eof}() is #false#, #DataPool# will block every reader, which is trying to read unavailable data until it really becomes available. But as soon as \Ref{is_eof}() is - #TRUE#, any attempt to read non-existing data will read #0# bytes. + #true#, any attempt to read non-existing data will read #0# bytes. Taking into account the fact, that #DataPool# was designed to store DjVu files, which are in IFF formats, it becomes possible @@ -206,7 +205,7 @@ class ByteStream; The usage of \Ref{add_data}() functions is meaningless and is prohibited. - \Ref{is_eof}() function always returns #TRUE#. Thus \Ref{set_eof}() + \Ref{is_eof}() function always returns #true#. Thus \Ref{set_eof}() us meaningless and does nothing. \Ref{get_length}() function always returns the file size. @@ -301,12 +300,12 @@ public: /** Tells the #DataPool# to stop serving readers. - If #only_blocked# flag is #TRUE# then only those requests will + If #only_blocked# flag is #true# then only those requests will be processed, which would not block. Any attempt to get non-existing data would result in a #STOP# exception (instead of blocking until data is available). - If #only_blocked# flag is #FALSE# then any further attempt to read + If #only_blocked# flag is #false# then any further attempt to read from this #DataPool# (as well as from any #DataPool# connected to this one) will result in a #STOP# exception. */ void stop(bool only_blocked=false); @@ -389,11 +388,11 @@ public: immediately. If there is no data available, and \Ref{is_eof}() returns - #FALSE#, the reader (and the thread) will be {\bf blocked} + #false#, the reader (and the thread) will be {\bf blocked} until the data actually arrives. Please note, that since the reader is blocked, it should run in a separate thread so that other threads have a chance to call \Ref{add_data}(). - If there is no data available, but \Ref{is_eof}() is #TRUE# + If there is no data available, but \Ref{is_eof}() is #true# the behavior is different and depends on the #DataPool#'s estimate of the file size: \begin{itemize} @@ -431,22 +430,22 @@ public: /** @name State querying functions. */ //@{ - /** Returns #TRUE# if this #DataPool# is connected to another #DataPool# + /** Returns #true# if this #DataPool# is connected to another #DataPool# or to a file. */ bool is_connected(void) const; - /** Returns #TRUE# if all data available for offsets from + /** Returns #true# if all data available for offsets from #start# till #start+length-1#. If #length# is negative, the range is assumed to extend up to the end of the #DataPool#. This function works both for connected and not connected #DataPool#s. - Once it returned #TRUE# for some offsets range, you can be + Once it returned #true# for some offsets range, you can be sure that the subsequent \Ref{get_data}() request will not block. */ bool has_data(int start, int length); - /* Returns #TRUE# if no more data is planned to be added. + /* Returns #true# if no more data is planned to be added. - {\bf Note:} This function always returns #TRUE# when the #DataPool# + {\bf Note:} This function always returns #true# when the #DataPool# has been initialized with a file name. */ bool is_eof(void) const {return eof_flag;} @@ -496,7 +495,7 @@ public: given data range. {\bf Note:} The callback may be called immediately if all - data for the given range is already available or #EOF# is #TRUE#. + data for the given range is already available or #EOF# is #true#. @param start The beginning of the range for which all data should be available diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp index 83f9df78..5b78d6fd 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.h b/kviewshell/plugins/djvu/libdjvu/DjVmDir.h index 86b661e3..216ded79 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -301,14 +300,14 @@ public: return (flags & TYPE_MASK)==PAGE; } - /** Returns #TRUE# if this file is included into some other files of + /** Returns #true# if this file is included into some other files of this document. */ bool is_include(void) const { return (flags & TYPE_MASK)==INCLUDE; } - /** Returns #TRUE# if this file contains thumbnails for the document pages. */ + /** Returns #true# if this file contains thumbnails for the document pages. */ bool is_thumbnails(void) const { return (flags & TYPE_MASK)==THUMBNAILS; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp index 62694098..4994d5e7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h index c17c795e..16b25864 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -136,7 +135,7 @@ public: /** Creates a new file record with name #name# at offset #offset# and size #size#, which is in IFF format if - #iff_file# is #TRUE#. */ + #iff_file# is #true#. */ void add_file(const GUTF8String &name, bool iff_file, int offset=-1, int size=-1); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp index 5b851d6e..e6ba4a30 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h index 637d0b78..794e9802 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp index 9e8b5fd7..cab46992 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h index 46c5d57f..746b6274 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp index 7cece60b..1d42b737 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h index ed82f933..dde4b63a 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -152,10 +151,10 @@ public: special cases. \end{description} */ int mode; - /**Qt::Horizontal page alignment. Possible values are #ALIGN_LEFT#, + /** Horizontal page alignment. Possible values are #ALIGN_LEFT#, #ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */ alignment hor_align; - /**Qt::Vertical page alignment. Possible values are #ALIGN_TOP#, + /** Vertical page alignment. Possible values are #ALIGN_TOP#, #ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */ alignment ver_align; /** List of defined map areas. They may be just areas of highlighting @@ -166,7 +165,7 @@ public: /** Metainformations like title, author ... */ GMap<GUTF8String,GUTF8String> metadata; #endif - /** Returns TRUE if no features are specified or specified features + /** Returns true if no features are specified or specified features are not different from default ones */ bool is_empty(void) const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp index 542faa7a..25eac90c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -520,8 +519,8 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, // // Also, if a name is in name2id, we will not insert that file again. // - // Will return TRUE if the file has been successfully inserted. - // FALSE, if the file contains NDIR chunk and has been skipped. + // Will return true if the file has been successfully inserted. + // false, if the file contains NDIR chunk and has been skipped. bool DjVuDocEditor::insert_file(const GURL &file_url, bool is_page, int & file_pos, GMap<GUTF8String, GUTF8String> & name2id, @@ -969,7 +968,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, // If will also remove all INCL chunks in parent files pointing // to this one // - // Finally, if remove_unref is TRUE, we will go down the files + // 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 parents referencing diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h index 7bf6124a..0d5cd14c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -142,7 +141,7 @@ public: learn the original format of the document being edited. */ int get_orig_doc_type(void) const; - /** Returns #TRUE# if the document can be "saved" (sometimes + /** Returns #true# if the document can be "saved" (sometimes the only possibility is to do a "save as"). The reason why we have this function is that #DjVuDocEditor# can save documents in new formats only (#BUNDLED# and #INDIRECT#). @@ -179,7 +178,7 @@ public: is "bundled" into one file and this file is written into the passed stream. - If #force_djvm# is #TRUE# then even one page documents will be + If #force_djvm# is #true# then even one page documents will be saved in the #DJVM BUNDLED# format (inside a #FORM:DJVM#); {\bf Plugin Warning}. This function will read contents of the whole @@ -258,11 +257,11 @@ public: void insert_group(const GList<GURL> & furl_list, int page_num=-1, void (* refresh_cb)(void *)=0, void * cl_data=0); /** Removes the specified page from the document. If #remove_unref# - is #TRUE#, the function will also remove from the document any file, + is #true#, the function will also remove from the document any file, which became unreferenced due to the page's removal */ void remove_page(int page_num, bool remove_unref=true); /** Removes the specified pages from the document. If #remove_unref# - is #TRUE#, the function will also remove from the document any file, + is #true#, the function will also remove from the document any file, which became unreferenced due to the pages' removal */ void remove_pages(const GList<int> & page_list, bool remove_unref=true); /** Removes a DjVu file with the specified #id#. @@ -270,7 +269,7 @@ public: If some other files include this file, the corresponding #INCL# chunks will be removed to avoid dead links. - If #remove_unref# is #TRUE#, the function will also remove every + If #remove_unref# is #true#, the function will also remove every file, which will become unreferenced after the removal of this file. */ void remove_file(const GUTF8String &id, bool remove_unref=true); /** Makes page number #page_num# to be #new_page_num#. If #new_page_num# @@ -352,8 +351,8 @@ public: the document already has thumbnail images for some of its pages, the callback will be called #pages_num# times, where #pages_num# is the total number of pages in the document. - The callback should return #FALSE# if thumbnails generating - should proceed. #TRUE# will stop it. */ + The callback should return #false# if thumbnails generating + should proceed. #true# will stop it. */ void generate_thumbnails(int thumb_size, bool (* cb)(int page_num, void *)=0, void * cl_data=0); @@ -387,7 +386,7 @@ public: GURL get_doc_url(void) const; - /** Returns TRUE if #class_name# is #"DjVuDocEditor"#, + /** Returns true if #class_name# is #"DjVuDocEditor"#, #"DjVuDocument"# or #"DjVuPort"# */ virtual bool inherits(const GUTF8String &class_name) const; virtual GP<DataPool> request_data(const DjVuPort * source, const GURL & url); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp index 3b33d943..c7effd99 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h index 418d0814..9730d5b8 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -377,7 +376,7 @@ public: void init(const GURL & url, GP<DjVuPort> port=0, DjVuFileCache * cache=0); - /** Returns #TRUE# if the initialization thread finished (does not + /** Returns #true# if the initialization thread finished (does not matter successfully or not). As soon as it happens, the document becomes completely initialized and its every function should work properly. Please refer to the description of \Ref{init}() function @@ -396,21 +395,21 @@ public: completes before the \Ref{init}() function returns. */ bool is_init_complete(void) const; - /** Returns #TRUE# is the initialization thread finished successfully. + /** Returns #true# is the initialization thread finished successfully. See \Ref{is_init_complete}() and \Ref{wait_for_complete_init}() for more details. */ bool is_init_ok(void) const; /** Forces compression with the next save_as function. */ void set_needs_compression(void); - /** Returns #TRUE# if there are uncompressed pages in this document. */ + /** Returns #true# if there are uncompressed pages in this document. */ bool needs_compression(void) const; - /** Returns #TRUE# if this file must be renamed before saving. */ + /** Returns #true# if this file must be renamed before saving. */ bool needs_rename(void) const; - /** Returns #TRUE# if this file must be renamed before saving. */ + /** Returns #true# if this file must be renamed before saving. */ bool can_compress(void) const; - /** Returns #TRUE# is the initialization thread failed. + /** Returns #true# is the initialization thread failed. See \Ref{is_init_complete}() and \Ref{wait_for_complete_init}() for more details. */ @@ -442,7 +441,7 @@ public: returns. */ long get_doc_flags(void) const; - /** Returns #TRUE# if the document is in bundled format (either in + /** Returns #true# if the document is in bundled format (either in #DjVuDocument::OLD_BUNDLED# or #DjVuDocument::BUNDLED# formats). */ bool is_bundled(void) const; @@ -561,7 +560,7 @@ public: #page_num#. If caching is enabled, and there is a {\em fully decoded} \Ref{DjVuFile} in the cache, the image will be reused and will be returned fully decoded. Otherwise, if multi-threaded behavior - is allowed, and #sync# is set to #FALSE#, the decoding will be + is allowed, and #sync# is set to #false#, the decoding will be started in a separate thread, which enables to do progressive redisplay. Thus, in this case the image returned may be partially decoded. @@ -593,7 +592,7 @@ public: returns. @param page_num Number of the page to be decoded - @param sync When set to #TRUE# the function will not return + @param sync When set to #true# the function will not return until the page is completely decoded. Otherwise, in a multi-threaded program, this function will start decoding in a new thread and will return @@ -636,7 +635,7 @@ public: \Ref{page_to_url}(), \Ref{id_to_url}() functions start working properly. - If #dont_create# is #FALSE# the function will return the file + If #dont_create# is #false# the function will return the file only if it already exists. {\bf Note:} To wait for the initialization to complete use @@ -658,7 +657,7 @@ public: If so, it just calls the #get_djvu_file()# function above. If ID is #ZERO# or just empty, page number #-1# is assumed. - If #dont_create# is #FALSE# the function will return the file + If #dont_create# is #false# the function will return the file only if it already exists. */ GP<DjVuFile> get_djvu_file(const GUTF8String &id, bool dont_create=false); GP<DjVuFile> get_djvu_file(const GURL &url, bool dont_create=false); @@ -715,7 +714,7 @@ public: is "bundled" into one file and this file is written into the passed stream. - If #force_djvm# is #TRUE# then even one page documents will be + If #force_djvm# is #true# then even one page documents will be saved in the #DJVM BUNDLED# format (inside a #FORM:DJVM#); {\bf Plugin Warning}. This function will read contents of the whole @@ -792,7 +791,7 @@ public: /// Create a complete DjVuXML file. void writeDjVuXML(const GP<ByteStream> &gstr_out,int flags) const; - /// Returns TRUE if #class_name# is #"DjVuDocument"# or #"DjVuPort"# + /// Returns true if #class_name# is #"DjVuDocument"# or #"DjVuPort"# virtual bool inherits(const GUTF8String &class_name) const; /// Converts the specified id to a URL. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp index 2d977be1..6bc43ce7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h index 33be56c3..e0440344 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp index e7c74b84..302c6a91 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h index 885e76aa..e4f38a0d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp index 73e3a9c2..21a33450 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -333,10 +332,10 @@ DjVuFile::wait_for_chunk(void) bool DjVuFile::wait_for_finish(bool self) -// if self==TRUE, will block until decoding of this file is over -// if self==FALSE, will block until decoding of a child (direct +// if self==true, will block until decoding of this file is over +// if self==false, will block until decoding of a child (direct // or indirect) is over. -// Will return FALSE if there is nothing to wait for. TRUE otherwise +// Will return false if there is nothing to wait for. true otherwise { DEBUG_MSG("DjVuFile::wait_for_finish(): self=" << self <<"\n"); DEBUG_MAKE_INDENT(3); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h index ea0e6db3..e8ec6298 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -340,21 +339,21 @@ public: \Ref{get_included_files}() is OK. \end{itemize} */ long get_flags(void) const; - /// Returns #TRUE# if the file is being decoded. + /// Returns #true# if the file is being decoded. bool is_decoding(void) const; - /// Returns #TRUE# if decoding of the file has finished successfully. + /// Returns #true# if decoding of the file has finished successfully. bool is_decode_ok(void) const; - /// Returns #TRUE# if decoding of the file has failed. + /// Returns #true# if decoding of the file has failed. bool is_decode_failed(void) const; - /** Returns #TRUE# if decoding of the file has been stopped by + /** Returns #true# if decoding of the file has been stopped by \Ref{stop_decode}() function. */ bool is_decode_stopped(void) const; - /// Returns #TRUE# if this file has received all data. + /// Returns #true# if this file has received all data. bool is_data_present(void) const; - /** Returns #TRUE# if this file {\bf and} all included files have + /** Returns #true# if this file {\bf and} all included files have received all data. */ bool is_all_data_present(void) const; - /** Returns #TRUE# if all included files have been created. Only when + /** Returns #true# if all included files have been created. Only when this function returns 1, the \Ref{get_included_files}() returns the correct information. */ bool are_incl_files_created(void) const; @@ -389,11 +388,11 @@ public: Depending on the value of #only_blocked# flag this works as follows: \begin{itemize} - \item If #only_blocked# is #TRUE#, the function will make sure, + \item If #only_blocked# is #true#, the function will make sure, that any further access to the file's data will result in a #STOP# exception if the desired data is not available (and the thread would normally block). - \item If #only_blocked# is #FALSE#, then {\bf any} further + \item If #only_blocked# is #false#, then {\bf any} further access to the file's data will result in immediate #STOP# exception. \end{itemize} @@ -441,11 +440,11 @@ public: {\bf Warning.} Included files are normally created during decoding. Before that they do not exist. If you call this function at - that time and set #only_created# to #FALSE# then it will have to + that time and set #only_created# to #false# then it will have to read all the data from this file in order to find #INCL# chunks, which may block your application, if not all data is available. - @param only_created If #TRUE#, the file will not try to process + @param only_created If #true#, the file will not try to process #INCL# chunks and load referenced files. It will return just those files, which have already been created during the decoding procedure. */ @@ -486,7 +485,7 @@ public: page file. {\bf Summary:} This function will return complete annotations only - when the \Ref{is_all_data_present}() returns #TRUE#. */ + when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_merged_anno(int * max_level_ptr=0); /** Returns the annotation chunks (#"ANTa"# and #"ANTz"#). This @@ -496,7 +495,7 @@ public: been found, #ZERO# will be returned. {\bf Summary:} This function will return complete annotations - only when the \Ref{is_all_data_present}() returns #TRUE#. */ + only when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_anno(void); /** Returns the text chunks (#"TXTa"# and #"TXTz"#). This function may @@ -506,7 +505,7 @@ public: #ZERO# will be returned. {\bf Summary:} This function will return complete hidden text layers - only when the \Ref{is_all_data_present}() returns #TRUE#. */ + only when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_text(void); /** Returns the meta chunks (#"METa"# and #"METz"#). This function may @@ -516,7 +515,7 @@ public: will be returned. {\bf Summary:} This function will return complete meta data only - when the \Ref{is_all_data_present}() returns #TRUE#. */ + when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_meta(void); /** Goes down the hierarchy of #DjVuFile#s and merges their annotations. @@ -538,17 +537,17 @@ public: /// Clears the meta data. void remove_meta(void); - /** Returns #TRUE# if the file contains annotation chunks. + /** Returns #true# if the file contains annotation chunks. Known annotation chunks at the time of writing this help are: {\bf ANTa}, {\bf ANTz}, {\bf FORM:ANNO}. */ bool contains_anno(void); - /** Returns #TRUE# if the file contains hiddentext chunks. + /** Returns #true# if the file contains hiddentext chunks. Known hiddentext chunks at the time of writing this help are: {\bf TXTa}, and {\bf TXTz}. */ bool contains_text(void); - /** Returns #TRUE# if the file contains metadata chunks. + /** Returns #true# if the file contains metadata chunks. Known metadata chunks at the time of writing this help are: {\bf METa}, and {\bf METz}. */ bool contains_meta(void); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp index 13220a96..b54d68b9 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h index 9898b8f3..c1151c2d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -152,12 +151,12 @@ public: int get_max_size(void) const; /** Enables or disables the cache. See \Ref{is_enabled}() for details - @param en - If {\em en} is TRUE, the cache will be enabled. + @param en - If {\em en} is true, the cache will be enabled. Otherwise it will be disabled. */ void enable(bool en); - /** Returns #TRUE# if the cache is enabled, #FALSE# otherwise. + /** Returns #true# if the cache is enabled, #false# otherwise. When a cache is disabled, \Ref{add_file}(), and \Ref{del_file}() do nothing. But the {\em maximum size} is preserved inside the class so that next time the cache is enabled, it will diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp index b31b04bf..4caf68ba 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h index 3d26c8cf..665be768 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp index 1c684336..94474127 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp index f384ce97..28d01b8c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h index 57b40938..696fe4ff 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -218,7 +217,7 @@ public: /** The decoder is now started when the image is created by function \Ref{DjVuDocument::get_page} in \Ref{DjVuDocument}. This function waits until the decoding thread terminates - and returns TRUE if the image has been successfully decoded. */ + and returns true if the image has been successfully decoded. */ bool wait_for_complete_decode(void); //@} diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp index 13ae6480..b77905f5 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h index 67a83be9..4e188cad 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp index e92b7570..9bcf3011 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h index 2302be37..c9b598e7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp index 258b0649..a312677c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h index f2e941cf..2f6cc93a 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp index 615041b0..48fd4507 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h index 90b2b8db..d0bbb949 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp index 0b8fa614..06e6e911 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h index 7f9884f1..93b7661e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp index 5e8a25c9..97723221 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h index 99c165fb..8e1af703 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -163,7 +162,7 @@ public: to help to identify the source of the request. For example, \Ref{DjVuFile} is also derived from #DjVuPort#. In order for the receiver to recognize the sender, the \Ref{DjVuFile} should - override this function to return #TRUE# when the #class_name# + override this function to return #true# when the #class_name# is either #DjVuPort# or #DjVuFile# */ virtual bool inherits(const GUTF8String &class_name) const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp index 5be8cbe7..fc69e154 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -88,7 +87,7 @@ static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; } //******************************** DjVuTXT ********************************** //*************************************************************************** -const char DjVuTXT::end_of_column = 013; // VT:Qt::Vertical Tab +const char DjVuTXT::end_of_column = 013; // VT: Vertical Tab const char DjVuTXT::end_of_region = 035; // GS: Group Separator const char DjVuTXT::end_of_paragraph = 037; // US: Unit Separator const char DjVuTXT::end_of_line = 012; // LF: Line Feed diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h index b06536c7..6f23c3b3 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -172,13 +171,13 @@ public: control character: \begin{tabular}{lll} {\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\ - {\tt DjVuText::end_of_column} & 013 & VT,Qt::Vertical Tab \\ + {\tt DjVuText::end_of_column} & 013 & VT, Vertical Tab \\ {\tt DjVuText::end_of_region} & 035 & GS, Group Separator \\ {\tt DjVuText::end_of_paragraph} & 037 & US, Unit Separator \\ {\tt DjVuText::end_of_line} & 012 & LF: Line Feed \end{tabular} */ GUTF8String textUTF8; - static const char end_of_column ; // VT:Qt::Vertical Tab + static const char end_of_column ; // VT: Vertical Tab static const char end_of_region ; // GS: Group Separator static const char end_of_paragraph ; // US: Unit Separator static const char end_of_line ; // LF: Line Feed diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp index d18c7801..78490777 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002-2003 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h index 95d547bb..f4293afe 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002-2003 Leon Bottou and Yann Le Cun. @@ -122,11 +121,11 @@ public: \item[Mode] ({\em COLOR}, {\em FORE}, {\em BACK}, or {\em BW}) Specifies how the \Ref{DjVuImage}s will be rendered (all layers, foreground layer, background layer, and the mask respectively) - \item[Color] ({\em TRUE} or {\em FALSE}). Choosing {\em FALSE} + \item[Color] ({\em true} or {\em false}). Choosing {\em false} converts color images to gray scale. \item[Gamma] Printer color correction. This parameter ranges from #0.3# to #5.0#. - \item[sRGB] ({\em TRUE} or {\em FALSE}). Choosing {\em TRUE} + \item[sRGB] ({\em true} or {\em false}). Choosing {\em true} enables accurate sRGB color calibration. This option only works with language level 2. When this is set, gamma correction is clamped to #2.2#. @@ -229,13 +228,13 @@ public: This parameter does {\bf not} affect the size of output file */ int get_copies(void) const { return copies; } - /** Returns #TRUE# if there will be a gray frame */ + /** Returns #true# if there will be a gray frame */ bool get_frame(void) const { return frame; } - /** Returns #TRUE# if there will be a gray frame */ + /** Returns #true# if there will be a gray frame */ bool get_cropmarks(void) const { return cropmarks; } - /** Returns #TRUE# if there will be a shadow text printed */ + /** Returns #true# if there will be a shadow text printed */ bool get_text(void) const { return text; } /** Returns the booklet mode */ diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp index 696367e7..8af09e7c 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h index 74669c05..fb255d44 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -621,7 +620,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 +628,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/GContainer.cpp b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp index 2019439c..feeedd99 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h index 61fabfaf..5b55b15d 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.h +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -97,8 +96,6 @@ namespace DJVU { #define GCONTAINER_NO_MEMBER_TEMPLATES 1 #elif defined(_MSC_VER) && !defined(__ICL) #define GCONTAINER_NO_MEMBER_TEMPLATES 1 -#elif defined(__MWERKS__) -#define GCONTAINER_NO_MEMBER_TEMPLATES 1 #else #define GCONTAINER_NO_MEMBER_TEMPLATES 0 #endif diff --git a/kviewshell/plugins/djvu/libdjvu/GException.cpp b/kviewshell/plugins/djvu/libdjvu/GException.cpp index f3f84dda..a04ef1b2 100644 --- a/kviewshell/plugins/djvu/libdjvu/GException.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GException.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GException.h b/kviewshell/plugins/djvu/libdjvu/GException.h index 97286987..41a8b9a8 100644 --- a/kviewshell/plugins/djvu/libdjvu/GException.h +++ b/kviewshell/plugins/djvu/libdjvu/GException.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -230,9 +229,6 @@ private: #if defined(_MSC_VER) #define CPP_SUPPORTS_EXCEPTIONS #endif -#if defined(__MWERKS__) -#define CPP_SUPPORTS_EXCEPTIONS -#endif #if defined(__EXCEPTIONS) #define CPP_SUPPORTS_EXCEPTIONS #endif diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp index 973c6cec..63ca548b 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h index 722f592f..b379e556 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -128,13 +127,13 @@ public: GUTF8String get_full_name(void) const; /// Returns the chunk type, like #CAT# for chunk #CAT:DJVU# GUTF8String get_type(void) const; - /// Returns TRUE if the chunk may contain other chunks or FALSE otherwise + /// Returns true if the chunk may contain other chunks or false otherwise bool is_container(void) const; /** Sets the chunk name. The {\em name} may not contain dots or brackets, but {\bf may} contain colons. */ void set_name(GUTF8String name); /** Parses the {\em name} probably containing colon and compares it - with its own name returning TRUE if they are the same */ + with its own name returning true if they are the same */ bool check_name(GUTF8String name); /** Adds the {\em chunk} to the chunks list at position {\em order}. diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp index 5a85e1fc..69c5b93f 100644 --- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h index 251427ed..439829d2 100644 --- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h +++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -199,7 +198,7 @@ public: \item #SHADOW_EOUT_BORDER# - The opposite of #SHADOW_EIN_BORDER#. \end{itemize} */ BorderType border_type; - /** If #TRUE#, the border will be made always visible. Otherwise + /** If #true#, the border will be made always visible. Otherwise it will be drawn when the mouse moves over the map area. */ bool border_always_visible; /// Border color (when relevant) in #0x00RRGGBB# format diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.cpp b/kviewshell/plugins/djvu/libdjvu/GOS.cpp index ebfaddfa..223e63ac 100644 --- a/kviewshell/plugins/djvu/libdjvu/GOS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GOS.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -101,12 +100,6 @@ # include <unistd.h> #endif -// -- TRUE FALSE -#undef TRUE -#undef FALSE -#define TRUE 1 -#define FALSE 0 - // -- MAXPATHLEN #ifndef MAXPATHLEN # ifdef _MAX_PATH diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.h b/kviewshell/plugins/djvu/libdjvu/GOS.h index 3e57fb40..1201e564 100644 --- a/kviewshell/plugins/djvu/libdjvu/GOS.h +++ b/kviewshell/plugins/djvu/libdjvu/GOS.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp b/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp index 81c1dd71..b9c15c72 100644 --- a/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GPixmap.h b/kviewshell/plugins/djvu/libdjvu/GPixmap.h index 32d51c7e..023fc411 100644 --- a/kviewshell/plugins/djvu/libdjvu/GPixmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GPixmap.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.cpp b/kviewshell/plugins/djvu/libdjvu/GRect.cpp index 1ac0a87c..fe482368 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GRect.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h index 51770cbb..518691ea 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.h +++ b/kviewshell/plugins/djvu/libdjvu/GRect.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -132,7 +131,7 @@ namespace DJVU { class GRect { public: - /** #Qt::OrientationBits# defines 3 mutually exclusive + /** #OrientationBits# defines 3 mutually exclusive bits to indicate the image orientation. There are four possible rotation values for an image @@ -150,7 +149,7 @@ public: }; /** #Orientations# defines all 8 possible orientations, using - the three \Ref{Qt::OrientationBits}. + the three \Ref{OrientationBits}. \begin{itemize} \item {\em TDLRNR} for Top Down, Left to Right, No Rotation. \item {\em BULRNR} for Bottom Up, Left to Right, No Rotation. diff --git a/kviewshell/plugins/djvu/libdjvu/GScaler.cpp b/kviewshell/plugins/djvu/libdjvu/GScaler.cpp index 0eeb9ebf..2f381449 100644 --- a/kviewshell/plugins/djvu/libdjvu/GScaler.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GScaler.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GScaler.h b/kviewshell/plugins/djvu/libdjvu/GScaler.h index 4843f6d0..f2347a85 100644 --- a/kviewshell/plugins/djvu/libdjvu/GScaler.h +++ b/kviewshell/plugins/djvu/libdjvu/GScaler.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp index 8c17755d..92608c16 100644 --- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h index 937a783d..422b6569 100644 --- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h +++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GString.cpp b/kviewshell/plugins/djvu/libdjvu/GString.cpp index a618055e..1b0deeae 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GString.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h index 601db983..96634c29 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.h +++ b/kviewshell/plugins/djvu/libdjvu/GString.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -511,9 +510,9 @@ public: character of a string is numbered zero. Negative positions represent characters relative to the end of the string. */ char operator[] (int n) const; - /// Returns #TRUE# if the string contains an integer number. + /// Returns #true# if the string contains an integer number. bool is_int(void) const; - /// Returns #TRUE# if the string contains a float number. + /// Returns #true# if the string contains a float number. bool is_float(void) const; /** Converts strings between native & UTF8 **/ diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp index ce88361e..2e96d887 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.h b/kviewshell/plugins/djvu/libdjvu/GThreads.h index 92691db4..ac83d8f8 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.h +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -526,8 +525,8 @@ public: /** If all bits mentioned in #set_mask# are set in the flags and all bits mentioned in #clr_mask# are cleared in the flags, it sets all bits from #set_mask1# in the flags, clears all flags from - #clr_mask1# in the flags and returns #TRUE#. Otherwise returns - #FALSE#. */ + #clr_mask1# in the flags and returns #true#. Otherwise returns + #false#. */ bool test_and_modify(long set_mask, long clr_mask, long set_mask1, long clr_mask1); diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.cpp b/kviewshell/plugins/djvu/libdjvu/GURL.cpp index 54b082ff..07853b55 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GURL.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -213,7 +212,7 @@ hexval(char c) static bool is_argument(const char * start) - // Returns TRUE if 'start' points to the beginning of an argument + // Returns true if 'start' points to the beginning of an argument // (either hash or CGI) { // return (*start=='#' || *start=='?' || *start=='&' || *start==';'); @@ -222,7 +221,7 @@ is_argument(const char * start) static bool is_argument_sep(const char * start) - // Returns TRUE if 'start' points to the beginning of an argument + // Returns true if 'start' points to the beginning of an argument // (either hash or CGI) { return (*start=='&')||(*start == ';'); diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.h b/kviewshell/plugins/djvu/libdjvu/GURL.h index eb3ed4bc..d353c4d1 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.h +++ b/kviewshell/plugins/djvu/libdjvu/GURL.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -277,10 +276,10 @@ public: // GURL operator+(const GUTF8String &name) const; //@} - /// Returns TRUE if #gurl1# and #gurl2# are the same + /// Returns true if #gurl1# and #gurl2# are the same bool operator==(const GURL & gurl2) const; - /// Returns TRUE if #gurl1# and #gurl2# are different + /// Returns true if #gurl1# and #gurl2# are different bool operator!=(const GURL & gurl2) const; /// Assignment operator diff --git a/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp b/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp index dbbefc5c..ea3aba52 100644 --- a/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp index c8b79809..51a491ab 100644 --- a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h index cb1fb616..291e86fe 100644 --- a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp index c63eda7d..57b2a10a 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp index 2cadf4f9..d2e94a1f 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h index 56cf00fa..817c1e5d 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp index 5a8092a0..8491e760 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp index 7aad9261..2d1bd218 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h index a8ea8aae..4619445e 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -197,9 +196,9 @@ class ByteStream; class JB2Blit { public: - /**Qt::Horizontal coordinate of the blit. */ + /** Horizontal coordinate of the blit. */ unsigned short left; - /**Qt::Vertical coordinate of the blit. */ + /** Vertical coordinate of the blit. */ unsigned short bottom; /** Index of the shape to blit. */ unsigned int shapeno; diff --git a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp index 3f611965..82ec93f0 100644 --- a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h index 8a0ace5d..8fcd737c 100644 --- a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h +++ b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp index 64be7931..3dced77a 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -603,7 +602,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) b1 += *pr++; break; } - /*Qt::Horizontal Mode */ + /* Horizontal Mode */ case H: { // First run @@ -617,7 +616,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) *xr = rle; xr++; rle = 0; break; } - /*Qt::Vertical Modes */ + /* Vertical Modes */ case V0: case VR3: case VR2: diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h index 6516b4cd..633c1258 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/MMX.cpp b/kviewshell/plugins/djvu/libdjvu/MMX.cpp index 58b74177..e60ec1c9 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMX.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMX.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/MMX.h b/kviewshell/plugins/djvu/libdjvu/MMX.h index 41ec002f..e6d17ba7 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMX.h +++ b/kviewshell/plugins/djvu/libdjvu/MMX.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -174,9 +173,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/kviewshell/plugins/djvu/libdjvu/Template.h b/kviewshell/plugins/djvu/libdjvu/Template.h index c37935ce..73de046a 100644 --- a/kviewshell/plugins/djvu/libdjvu/Template.h +++ b/kviewshell/plugins/djvu/libdjvu/Template.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp index 8d4f0188..a2affc02 100644 --- a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h index df678ffe..f4642067 100644 --- a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp index b1d9f469..26910f34 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.h b/kviewshell/plugins/djvu/libdjvu/XMLParser.h index 08b6d508..0afd1bb3 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLParser.h +++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp index 2511a585..58acaf57 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.h b/kviewshell/plugins/djvu/libdjvu/XMLTags.h index 027e629b..f217b8f3 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLTags.h +++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp b/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp index 89461872..60b0ccf8 100644 --- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h index 4eba6901..bee55490 100644 --- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h +++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in index b3ebeec6..88cd71bc 100644 --- a/kviewshell/plugins/djvu/libdjvu/configure.in.in +++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in @@ -28,8 +28,8 @@ dnl ------------------------------------------------------- AC_DEFUN([AC_CHECK_CXX_OPT],[ opt="$1" AC_MSG_CHECKING([if $CXX accepts $opt]) - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} ${CXXFLAGS} ${OPTS} $opt -c conftest.cc 2>&1`"; then + echo 'void f(){}' > conftest.cpp + if test -z "`${CXX} ${CXXFLAGS} ${OPTS} $opt -c conftest.cpp 2>&1`"; then AC_MSG_RESULT(yes) rm conftest.* $2 @@ -335,7 +335,7 @@ if test "x$acx_pthread_ok" = xyes; then flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | alpha*-osf*) flag="-D_REENTRANT";; + *solaris*) flag="-D_REENTRANT";; esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then @@ -389,8 +389,8 @@ if test x$acx_cothread != xno ; then AC_MSG_RESULT($acx_cothread_patch) if test x$acx_cothread_patch = xno ; then AC_MSG_CHECKING([if the cothread patch is critical]) - echo 'void foo() { throw "Hello"; }' > conftest.cc - compile="$CXX $CXXFLAGS -c conftest.cc" + echo 'void foo() { throw "Hello"; }' > conftest.cpp + compile="$CXX $CXXFLAGS -c conftest.cpp" check="nm conftest.o | grep sjthrow | cat > conftest.out" acx_cothread_patch=yes if AC_TRY_EVAL(compile) && AC_TRY_EVAL(check) ; then diff --git a/kviewshell/plugins/djvu/libdjvu/debug.cpp b/kviewshell/plugins/djvu/libdjvu/debug.cpp index 20c93e50..cba08577 100644 --- a/kviewshell/plugins/djvu/libdjvu/debug.cpp +++ b/kviewshell/plugins/djvu/libdjvu/debug.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -234,7 +233,7 @@ DjVuDebug& DjVuDebug::operator<<(type arg)\ DjVuDebug& DjVuDebug::operator<<(bool arg) { - format("%s", arg ? "TRUE" : "FALSE"); return *this; + format("%s", arg ? "true" : "false"); return *this; } OP(char, "%c") diff --git a/kviewshell/plugins/djvu/libdjvu/debug.h b/kviewshell/plugins/djvu/libdjvu/debug.h index c39390a2..0aa4945b 100644 --- a/kviewshell/plugins/djvu/libdjvu/debug.h +++ b/kviewshell/plugins/djvu/libdjvu/debug.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/pageRangeWidget.cpp b/kviewshell/plugins/djvu/pageRangeWidget.cpp index 1d5c7be1..4acd8294 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.cpp +++ b/kviewshell/plugins/djvu/pageRangeWidget.cpp @@ -41,8 +41,8 @@ PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _cur _current = _to; } - connect(from, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fromValueChanged(int))); - connect(to, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(toValueChanged(int))); + connect(from, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(fromValueChanged(int))); + connect(to, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(toValueChanged(int))); from->setRange(_from, _to); from->setValue(_current); diff --git a/kviewshell/plugins/djvu/pageRangeWidget.h b/kviewshell/plugins/djvu/pageRangeWidget.h index 1aaf0c48..4f353b10 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.h +++ b/kviewshell/plugins/djvu/pageRangeWidget.h @@ -28,7 +28,7 @@ class PageRangeWidget : public PageRangeWidget_base { -Q_OBJECT +TQ_OBJECT public: |