From 45f529de247fc4b3662f6b474abe03fe904306ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson <kb9vqf@pearsoncomputing.net> Date: Sun, 18 Dec 2011 18:31:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- ...intDialogPage_DJVUconversionoptions_basewidget.ui | 2 +- .../djvu/kprintDialogPage_DJVUpageoptions.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp | 14 +++++++------- kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h | 20 ++++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kviewshell/plugins/djvu') diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui index bfaf546c..8a533ab6 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp index 4b5e633a..4287fe54 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp @@ -70,7 +70,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa kprintDialogPage_pageoptions_baseLayout->addStretch(); - resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp index c765fdd0..e7c74b84 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp @@ -102,7 +102,7 @@ DjVuErrorList::notify_error(const DjVuPort * source, const GUTF8String & msg) bool DjVuErrorList::notify_status(const DjVuPort * source, const GUTF8String &msg) { - tqStatus.append(msg); + Status.append(msg); return 1; } @@ -120,16 +120,16 @@ DjVuErrorList::GetError(void) } GUTF8String -DjVuErrorList::GettqStatus(void) +DjVuErrorList::GetStatus(void) { - GUTF8String PrevtqStatus; + GUTF8String PrevStatus; GPosition pos; - if((pos=tqStatus)) + if((pos=Status)) { - PrevtqStatus=tqStatus[pos]; - tqStatus.del(pos); + PrevStatus=Status[pos]; + Status.del(pos); } - return PrevtqStatus; + return PrevStatus; } GP<DataPool> diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h index c42e96e2..885e76aa 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h @@ -126,13 +126,13 @@ public: inline GList<GUTF8String> GetStatusList(void); /// Just clear the list. - inline void CleartqStatus(void); + inline void ClearStatus(void); /// Get one status message and clear that message from the list. - GUTF8String GettqStatus(void); + GUTF8String GetStatus(void); /// Check if there are any more status messages. - inline bool HastqStatus(void) const; + inline bool HasStatus(void) const; /** This gets the data. We can't use the simple port's request data since we want to allow the user to specify the ByteStream. */ @@ -143,7 +143,7 @@ private: GURL pool_url; GP<DataPool> pool; GList<GUTF8String> Errors; - GList<GUTF8String> tqStatus; + GList<GUTF8String> Status; private: //dummy stuff static GURL set_stream(ByteStream *); }; @@ -167,22 +167,22 @@ DjVuErrorList::ClearError(void) inline GList<GUTF8String> DjVuErrorList::GetStatusList(void) { - GList<GUTF8String> retval=(const GList<GUTF8String>)tqStatus; - tqStatus.empty(); + GList<GUTF8String> retval=(const GList<GUTF8String>)Status; + Status.empty(); return retval; } inline void -DjVuErrorList::CleartqStatus(void) -{ tqStatus.empty(); } +DjVuErrorList::ClearStatus(void) +{ Status.empty(); } inline bool DjVuErrorList::HasError(void) const { return !Errors.isempty(); } inline bool -DjVuErrorList::HastqStatus(void) const -{ return !tqStatus.isempty(); } +DjVuErrorList::HasStatus(void) const +{ return !Status.isempty(); } #ifdef HAVE_NAMESPACES -- cgit v1.2.1