summaryrefslogtreecommitdiffstats
path: root/kghostview
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2 /kghostview
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kghostview')
-rw-r--r--kghostview/displayoptions.cpp12
-rw-r--r--kghostview/displayoptions.h6
-rw-r--r--kghostview/dscparse/dscparse.cpp26
-rw-r--r--kghostview/dscparse/dscparse.h14
-rw-r--r--kghostview/dscparse/dscparse_adapter.cpp2
-rw-r--r--kghostview/dscparse/dscparse_adapter.h12
-rw-r--r--kghostview/fullscreenfilter.cpp18
-rw-r--r--kghostview/fullscreenfilter.h5
-rw-r--r--kghostview/generalsettingswidget.ui20
-rw-r--r--kghostview/generalsettingswidget.ui.h2
-rw-r--r--kghostview/gssettingswidget.ui28
-rw-r--r--kghostview/gssettingswidget.ui.h4
-rw-r--r--kghostview/infodialog.cpp6
-rw-r--r--kghostview/infodialog.h3
-rw-r--r--kghostview/kdscerrordialog.cpp6
-rw-r--r--kghostview/kdscerrordialog.h3
-rw-r--r--kghostview/kgv_miniwidget.cpp22
-rw-r--r--kghostview/kgv_miniwidget.h3
-rw-r--r--kghostview/kgv_view.cpp68
-rw-r--r--kghostview/kgv_view.h11
-rw-r--r--kghostview/kgvconfigdialog.cpp12
-rw-r--r--kghostview/kgvdocument.cpp62
-rw-r--r--kghostview/kgvdocument.h10
-rw-r--r--kghostview/kgvfactory.cpp10
-rw-r--r--kghostview/kgvfactory.h4
-rw-r--r--kghostview/kgvmainwidget.cpp4
-rw-r--r--kghostview/kgvmainwidget.h5
-rw-r--r--kghostview/kgvpagedecorator.cpp6
-rw-r--r--kghostview/kgvpagedecorator.h8
-rw-r--r--kghostview/kgvpageview.cpp24
-rw-r--r--kghostview/kgvpageview.h5
-rw-r--r--kghostview/kgvshell.cpp26
-rw-r--r--kghostview/kgvshell.h1
-rw-r--r--kghostview/kpswidget.cpp18
-rw-r--r--kghostview/kpswidget.h5
-rw-r--r--kghostview/logwindow.cpp8
-rw-r--r--kghostview/logwindow.h3
-rw-r--r--kghostview/marklist.cpp25
-rw-r--r--kghostview/marklist.h12
-rw-r--r--kghostview/scrollbox.cpp29
-rw-r--r--kghostview/scrollbox.h5
-rw-r--r--kghostview/thumbnailservice.cpp8
-rw-r--r--kghostview/thumbnailservice.h3
-rw-r--r--kghostview/viewcontrol.cpp40
-rw-r--r--kghostview/viewcontrol.h5
45 files changed, 319 insertions, 290 deletions
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index ab33e384..82ef1f3a 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2003, Luís Pedro Coelho
+ * Copyright (C) 2003, Lu�s Pedro Coelho
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -68,15 +68,15 @@ namespace {
TQString DisplayOptions::toString( const DisplayOptions& options )
{
return TQString( qformat )
- .arg( options.page() )
- .arg( options.magnification() )
- .arg( options.overrideOrientation() )
- .arg( options.overridePageMedia().utf8() );
+ .tqarg( options.page() )
+ .tqarg( options.magnification() )
+ .tqarg( options.overrideOrientation() )
+ .tqarg( options.overridePageMedia().utf8().data() );
}
bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )
{
- TQRegExp regex( TQString::fromLatin1( rformat ) );
+ TQRegExp regex( TQString::tqfromLatin1( rformat ) );
if ( regex.search( in ) < 0 ) return false;
out.reset();
diff --git a/kghostview/displayoptions.h b/kghostview/displayoptions.h
index 8a19a812..8ceaf56e 100644
--- a/kghostview/displayoptions.h
+++ b/kghostview/displayoptions.h
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2003, Luís Pedro Coelho
+ * Copyright (C) 2003, Lu�s Pedro Coelho
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class KDE_EXPORT DisplayOptions
void setOverrideOrientation(CDSC_ORIENTATION_ENUM e) { _overrideOrientation = e; }
CDSC_ORIENTATION_ENUM overrideOrientation() const { return _overrideOrientation; }
- void restoreOverridePageMedia() { _overridePageMedia = TQString::null; }
+ void restoreOverridePageMedia() { _overridePageMedia = TQString(); }
void setOverridePageMedia(const TQString& newMedia) { _overridePageMedia = newMedia; }
const TQString& overridePageMedia() const { return _overridePageMedia; }
@@ -103,7 +103,7 @@ class KDE_EXPORT DisplayOptions
inline
DisplayOptions::DisplayOptions()
:_overrideOrientation( CDSC_ORIENT_UNKNOWN ),
- _overridePageMedia ( TQString::null ),
+ _overridePageMedia ( TQString() ),
_page( 0 )
{
setMagnification( 1.0 );
diff --git a/kghostview/dscparse/dscparse.cpp b/kghostview/dscparse/dscparse.cpp
index b5d2c3a7..b02fb117 100644
--- a/kghostview/dscparse/dscparse.cpp
+++ b/kghostview/dscparse/dscparse.cpp
@@ -41,7 +41,7 @@
* %%PaperWeight: (ignored)
*
* Other additions for defaults or page section
- % %%ViewingOrientation: xx xy yx yy
+ % %%ViewingQt::Orientation: xx xy yx yy
*/
#include <stdio.h> /* for sprintf(), not file I/O */
@@ -1736,7 +1736,7 @@ dsc_parse_viewing_orientation(CDSC *dsc, CDSCCTM **pctm)
*pctm = NULL;
}
- n = IS_DSC(dsc->line, "%%+") ? 3 : 21; /* %%ViewingOrientation: */
+ n = IS_DSC(dsc->line, "%%+") ? 3 : 21; /* %%ViewingQt::Orientation: */
while (IS_WHITE(dsc->line[n]))
n++;
@@ -2026,7 +2026,7 @@ dsc_scan_comments(CDSC *dsc)
continued ? 3 : 10))
return CDSC_ERROR;
}
- else if (IS_DSC(line, "%%Orientation:")) {
+ else if (IS_DSC(line, "%%Qt::Orientation:")) {
dsc->id = CDSC_ORIENTATION;
if (dsc_parse_orientation(dsc, &(dsc->page_orientation),
continued ? 3 : 14))
@@ -2197,7 +2197,7 @@ dsc_scan_comments(CDSC *dsc)
dsc_unknown(dsc);
}
else if (IS_DSC(line, "%%Requirements:")) {
- dsc->id = CDSC_REQUIREMENTS;
+ dsc->id = CDSC_RETQUIREMENTS;
/* ignore */
}
else if (IS_DSC(line, "%%DocumentNeededFonts:")) {
@@ -2328,9 +2328,9 @@ dsc_scan_defaults(CDSC *dsc)
dsc->id = CDSC_PAGEMEDIA;
dsc_parse_media(dsc, &dsc->page_media);
}
- else if (IS_DSC(line, "%%PageOrientation:")) {
+ else if (IS_DSC(line, "%%PageQt::Orientation:")) {
dsc->id = CDSC_PAGEORIENTATION;
- /* This can override %%Orientation: */
+ /* This can override %%Qt::Orientation: */
if (dsc_parse_orientation(dsc, &(dsc->page_orientation), 18))
return CDSC_ERROR;
}
@@ -2339,7 +2339,7 @@ dsc_scan_defaults(CDSC *dsc)
if (dsc_parse_bounding_box(dsc, &(dsc->page_bbox), 18))
return CDSC_ERROR;
}
- else if (IS_DSC(line, "%%ViewingOrientation:")) {
+ else if (IS_DSC(line, "%%ViewingQt::Orientation:")) {
dsc->id = CDSC_VIEWINGORIENTATION;
if (dsc_parse_viewing_orientation(dsc, &dsc->viewing_orientation))
return CDSC_ERROR;
@@ -2849,7 +2849,7 @@ dsc_scan_page(CDSC *dsc)
dsc_unknown(dsc);
}
}
- else if (IS_DSC(line, "%%PageOrientation:")) {
+ else if (IS_DSC(line, "%%PageQt::Orientation:")) {
dsc->id = CDSC_PAGEORIENTATION;
if (dsc_parse_orientation(dsc,
&(dsc->page[dsc->page_count-1].orientation) ,18))
@@ -2860,7 +2860,7 @@ dsc_scan_page(CDSC *dsc)
if (dsc_parse_bounding_box(dsc, &dsc->page[dsc->page_count-1].bbox, 18))
return CDSC_NOTDSC;
}
- else if (IS_DSC(line, "%%ViewingOrientation:")) {
+ else if (IS_DSC(line, "%%ViewingQt::Orientation:")) {
dsc->id = CDSC_VIEWINGORIENTATION;
if (dsc_parse_viewing_orientation(dsc,
&dsc->page[dsc->page_count-1].viewing_orientation))
@@ -2938,7 +2938,7 @@ dsc_scan_page(CDSC *dsc)
* %%DocumentSuppliedFonts:
* %%DocumentSuppliedProcSets:
* %%DocumentSuppliedResources:
- * %%Orientation:
+ * %%Qt::Orientation:
* %%Pages:
* %%PageOrder:
*
@@ -2946,7 +2946,7 @@ dsc_scan_page(CDSC *dsc)
* %%Trailer
* %%EOF
* %%BoundingBox:
- * %%Orientation:
+ * %%Qt::Orientation:
* %%Pages:
* %%PageOrder:
* In addition to these, we support
@@ -2957,7 +2957,7 @@ dsc_scan_page(CDSC *dsc)
* %%PageCustomColors:
* %%PageFiles:
* %%PageFonts:
- * %%PageOrientation:
+ * %%PageQt::Orientation:
* %%PageProcessColors:
* %%PageResources:
*/
@@ -3052,7 +3052,7 @@ dsc_scan_trailer(CDSC *dsc)
continued ? 3 : 10))
return CDSC_ERROR;
}
- else if (IS_DSC(line, "%%Orientation:")) {
+ else if (IS_DSC(line, "%%Qt::Orientation:")) {
dsc->id = CDSC_ORIENTATION;
if (dsc_parse_orientation(dsc, &(dsc->page_orientation), continued ? 3 : 14))
return CDSC_ERROR;
diff --git a/kghostview/dscparse/dscparse.h b/kghostview/dscparse/dscparse.h
index 10d2746c..dbac949e 100644
--- a/kghostview/dscparse/dscparse.h
+++ b/kghostview/dscparse/dscparse.h
@@ -98,7 +98,7 @@ typedef enum {
CDSC_FOR = 207, /* %%For: */
CDSC_LANGUAGELEVEL = 208, /* %%LanguageLevel: */
CDSC_BOUNDINGBOX = 209, /* %%BoundingBox: */
- CDSC_ORIENTATION = 210, /* %%Orientation: */
+ CDSC_ORIENTATION = 210, /* %%Qt::Orientation: */
CDSC_PAGEORDER = 211, /* %%PageOrder: */
CDSC_DOCUMENTMEDIA = 212, /* %%DocumentMedia: */
CDSC_DOCUMENTPAPERSIZES = 213, /* %%DocumentPaperSizes: */
@@ -106,7 +106,7 @@ typedef enum {
CDSC_DOCUMENTPAPERCOLORS = 215, /* %%DocumentPaperColors: */
CDSC_DOCUMENTPAPERWEIGHTS = 216, /* %%DocumentPaperWeights: */
CDSC_DOCUMENTDATA = 217, /* %%DocumentData: */
- CDSC_REQUIREMENTS = 218, /* IGNORED %%Requirements: */
+ CDSC_RETQUIREMENTS = 218, /* IGNORED %%Requirements: */
CDSC_DOCUMENTNEEDEDFONTS = 219, /* IGNORED %%DocumentNeededFonts: */
CDSC_DOCUMENTSUPPLIEDFONTS = 220, /* IGNORED %%DocumentSuppliedFonts: */
CDSC_HIRESBOUNDINGBOX = 221, /* %%HiResBoundingBox: */
@@ -119,7 +119,7 @@ typedef enum {
/* Defaults section */
CDSC_BEGINDEFAULTS = 401, /* %%BeginDefaults */
CDSC_ENDDEFAULTS = 402, /* %%EndDefaults */
-/* also %%PageMedia, %%PageOrientation, %%PageBoundingBox */
+/* also %%PageMedia, %%PageQt::Orientation, %%PageBoundingBox */
/* Prolog section */
CDSC_BEGINPROLOG = 501, /* %%BeginProlog */
@@ -150,16 +150,16 @@ typedef enum {
CDSC_ENDPAGESETUP = 703, /* IGNORED %%EndPageSetup */
CDSC_PAGEMEDIA = 704, /* %%PageMedia: */
/* also %%PaperColor, %%PaperForm, %%PaperWeight, %%PaperSize */
- CDSC_PAGEORIENTATION = 705, /* %%PageOrientation: */
+ CDSC_PAGEORIENTATION = 705, /* %%PageQt::Orientation: */
CDSC_PAGEBOUNDINGBOX = 706, /* %%PageBoundingBox: */
/* also %%Begin/EndFont, %%Begin/EndFeature */
/* also %%Begin/EndResource, %%Begin/EndProcSet */
CDSC_INCLUDEFONT = 707, /* IGNORED %%IncludeFont: */
- CDSC_VIEWINGORIENTATION = 708, /* %%ViewingOrientation: */
+ CDSC_VIEWINGORIENTATION = 708, /* %%ViewingQt::Orientation: */
/* Trailer section */
CDSC_TRAILER = 800, /* %%Trailer */
-/* also %%Pages, %%BoundingBox, %%Orientation, %%PageOrder, %%DocumentMedia */
+/* also %%Pages, %%BoundingBox, %%Qt::Orientation, %%PageOrder, %%DocumentMedia */
/* %%Page is recognised as an error */
/* also %%DocumentNeededFonts, %%DocumentSuppliedFonts */
@@ -229,7 +229,7 @@ typedef struct CDSCMEDIA_S {
#define CDSC_KNOWN_MEDIA 46
extern const CDSCMEDIA dsc_known_media[CDSC_KNOWN_MEDIA];
-typedef struct CDSCCTM_S { /* used for %%ViewingOrientation */
+typedef struct CDSCCTM_S { /* used for %%ViewingQt::Orientation */
float xx;
float xy;
float yx;
diff --git a/kghostview/dscparse/dscparse_adapter.cpp b/kghostview/dscparse/dscparse_adapter.cpp
index b04e89bc..17ae0231 100644
--- a/kghostview/dscparse/dscparse_adapter.cpp
+++ b/kghostview/dscparse/dscparse_adapter.cpp
@@ -111,7 +111,7 @@ unsigned int KDSCError::lineNumber() const
KDSCErrorHandler::Response KDSCOkErrorHandler::error( const KDSCError& err )
{
cout << "KDSC: error in line " << err.lineNumber() << endl;
- cout << err.line() << endl;
+ cout << err.line().data() << endl;
return Ok;
}
diff --git a/kghostview/dscparse/dscparse_adapter.h b/kghostview/dscparse/dscparse_adapter.h
index c5c1cbf9..5fefa631 100644
--- a/kghostview/dscparse/dscparse_adapter.h
+++ b/kghostview/dscparse/dscparse_adapter.h
@@ -185,7 +185,7 @@ public:
For = CDSC_FOR,
LanguageLevel = CDSC_LANGUAGELEVEL,
BoundingBox = CDSC_BOUNDINGBOX,
- Orientation = CDSC_ORIENTATION,
+ Qt::Orientation = CDSC_ORIENTATION,
PageOrder = CDSC_PAGEORDER,
DocumentMedia = CDSC_DOCUMENTMEDIA,
DocumentPaperSizes = CDSC_DOCUMENTPAPERSIZES,
@@ -193,7 +193,7 @@ public:
DocumentPaperColors = CDSC_DOCUMENTPAPERCOLORS,
DocumentPaperWeights = CDSC_DOCUMENTPAPERWEIGHTS,
DocumentData = CDSC_DOCUMENTDATA,
- Requirements = CDSC_REQUIREMENTS,
+ Requirements = CDSC_RETQUIREMENTS,
DocumentNeededFonts = CDSC_DOCUMENTNEEDEDFONTS,
DocumentSuppliedFonts = CDSC_DOCUMENTSUPPLIEDFONTS,
HiResBoundingBox = CDSC_HIRESBOUNDINGBOX,
@@ -206,7 +206,7 @@ public:
// Defaults section
BeginDefaults = CDSC_BEGINDEFAULTS,
EndDefaults = CDSC_ENDDEFAULTS,
- // also %%PageMedia, %%PageOrientation, %%PageBoundingBox
+ // also %%PageMedia, %%PageQt::Orientation, %%PageBoundingBox
// Prolog section
BeginProlog = CDSC_BEGINPROLOG,
@@ -237,16 +237,16 @@ public:
EndPageSetup = CDSC_ENDPAGESETUP,
PageMedia = CDSC_PAGEMEDIA,
// also %%PaperColor, %%PaperForm, %%PaperWeight, %%PaperSize
- PageOrientation = CDSC_PAGEORIENTATION,
+ PageQt::Orientation = CDSC_PAGEORIENTATION,
PageBoundingBox = CDSC_PAGEBOUNDINGBOX,
// also %%Begin/EndFont, %%Begin/EndFeature
// also %%Begin/EndResource, %%Begin/EndProcSet
IncludeFont = CDSC_INCLUDEFONT,
- ViewingOrientation = CDSC_VIEWINGORIENTATION,
+ ViewingQt::Orientation = CDSC_VIEWINGORIENTATION,
// Trailer section
Trailer = CDSC_TRAILER,
- // also %%Pages, %%BoundingBox, %%Orientation, %%PageOrder,
+ // also %%Pages, %%BoundingBox, %%Qt::Orientation, %%PageOrder,
// %%DocumentMedia
// %%Page is recognised as an error
// also %%DocumentNeededFonts, %%DocumentSuppliedFonts
diff --git a/kghostview/fullscreenfilter.cpp b/kghostview/fullscreenfilter.cpp
index 724031f4..9efe8a6c 100644
--- a/kghostview/fullscreenfilter.cpp
+++ b/kghostview/fullscreenfilter.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2003, Luís Pedro Coelho
+ * Copyright (C) 2003, Lu�s Pedro Coelho
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,26 +22,26 @@
#include "kgv_miniwidget.h"
#include "kgvpageview.h"
-FullScreenFilter::FullScreenFilter( KGVShell& parent )
- :TQObject( &parent, "full-screen-filter" ),
- parent( parent )
+FullScreenFilter::FullScreenFilter( KGVShell& tqparent )
+ :TQObject( &tqparent, "full-screen-filter" ),
+ tqparent( tqparent )
{
}
bool FullScreenFilter::eventFilter( TQObject* /*object*/, TQEvent* ev) {
if ( TQKeyEvent* keyevent = dynamic_cast<TQKeyEvent*>( ev ) ) {
if ( keyevent->key() == Key_Escape ) {
- parent.setFullScreen( false );
+ tqparent.setFullScreen( false );
keyevent->accept();
return true;
}
}
if ( TQMouseEvent* mouseevent = dynamic_cast<TQMouseEvent*>( ev ) ) {
- if ( mouseevent->stateAfter() & mouseevent->button() & LeftButton ) {
+ if ( mouseevent->stateAfter() & mouseevent->button() & Qt::LeftButton ) {
// if ( The whole image is visible at once )
- if ( parent.m_gvpart->pageView()->contentsHeight() <= parent.m_gvpart->widget()->height() &&
- parent.m_gvpart->pageView()->contentsWidth() <= parent.m_gvpart->widget()->width() ) {
- parent.m_gvpart->miniWidget()->nextPage();
+ if ( tqparent.m_gvpart->pageView()->contentsHeight() <= tqparent.m_gvpart->widget()->height() &&
+ tqparent.m_gvpart->pageView()->contentsWidth() <= tqparent.m_gvpart->widget()->width() ) {
+ tqparent.m_gvpart->miniWidget()->nextPage();
mouseevent->accept();
return true;
}
diff --git a/kghostview/fullscreenfilter.h b/kghostview/fullscreenfilter.h
index 7d5fa489..4a175c25 100644
--- a/kghostview/fullscreenfilter.h
+++ b/kghostview/fullscreenfilter.h
@@ -28,15 +28,16 @@ class KGVShell;
*/
class FullScreenFilter : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- FullScreenFilter( KGVShell& parent );
+ FullScreenFilter( KGVShell& tqparent );
/**
* @reimplemented
*/
virtual bool eventFilter( TQObject*, TQEvent* );
private:
- KGVShell& parent;
+ KGVShell& tqparent;
};
diff --git a/kghostview/generalsettingswidget.ui b/kghostview/generalsettingswidget.ui
index 60ffbdf3..09ab2764 100644
--- a/kghostview/generalsettingswidget.ui
+++ b/kghostview/generalsettingswidget.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>GeneralSettingsWidget</class>
<author>Nadeem Hasan &lt;nhasan@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>GeneralSettingsWidget</cstring>
</property>
@@ -20,7 +20,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_Antialiasing</cstring>
</property>
@@ -31,7 +31,7 @@
<string>Anti-aliasing makes the result look better, but it makes the display take longer</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_PlatformFonts</cstring>
</property>
@@ -42,7 +42,7 @@
<string>&amp;Use platform fonts</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_Messages</cstring>
</property>
@@ -54,7 +54,7 @@
In case of problems you might want to see its error messages</string>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>kcfg_Palette</cstring>
</property>
@@ -65,7 +65,7 @@ In case of problems you might want to see its error messages</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>Mono</cstring>
</property>
@@ -76,7 +76,7 @@ In case of problems you might want to see its error messages</string>
<number>2</number>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>Gray</cstring>
</property>
@@ -87,7 +87,7 @@ In case of problems you might want to see its error messages</string>
<number>1</number>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>Color</cstring>
</property>
@@ -106,6 +106,6 @@ In case of problems you might want to see its error messages</string>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">generalsettingswidget.ui.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kghostview/generalsettingswidget.ui.h b/kghostview/generalsettingswidget.ui.h
index 8dd6920d..512d1d05 100644
--- a/kghostview/generalsettingswidget.ui.h
+++ b/kghostview/generalsettingswidget.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui
index 06779f3b..a92ecc39 100644
--- a/kghostview/gssettingswidget.ui
+++ b/kghostview/gssettingswidget.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>GSSettingsWidget</class>
<author>Nadeem Hasan &lt;nhasan@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>GSSettingsWidget</cstring>
</property>
@@ -46,14 +46,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>286</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -64,7 +64,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -83,7 +83,7 @@
<string>Ghostscript is the basic renderer (i.e. the program which draws)</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>mDetectedVersion</cstring>
</property>
@@ -91,7 +91,7 @@
<string>(detected gs version: %1)</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -110,7 +110,7 @@
<string>Anti-aliasing makes the result look better, but it makes the display take longer</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -139,14 +139,14 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">gssettingswidget.ui.h</include>
</includes>
-<signals>
+<Q_SIGNALS>
<signal>configClicked()</signal>
-</signals>
-<slots>
- <slot specifier="non virtual">setDetectedVersion( QString v )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+ <slot specifier="non virtual">setDetectedVersion( TQString v )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/kghostview/gssettingswidget.ui.h b/kghostview/gssettingswidget.ui.h
index fb2209c7..11f4bf63 100644
--- a/kghostview/gssettingswidget.ui.h
+++ b/kghostview/gssettingswidget.ui.h
@@ -2,13 +2,13 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
void GSSettingsWidget::setDetectedVersion( TQString v)
{
- mDetectedVersion->setText(mDetectedVersion->text().arg( v ));
+ mDetectedVersion->setText(mDetectedVersion->text().tqarg( v ));
}
diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp
index e429d712..d65348ef 100644
--- a/kghostview/infodialog.cpp
+++ b/kghostview/infodialog.cpp
@@ -32,8 +32,8 @@
//
// Using KDialogBase in message box mode (gives centered action button)
//
-InfoDialog::InfoDialog( TQWidget *parent, const char *name, bool modal )
- :KDialogBase( i18n("Document Information"), Yes, Yes, Yes, parent,
+InfoDialog::InfoDialog( TQWidget *tqparent, const char *name, bool modal )
+ :KDialogBase( i18n("Document Information"), Yes, Yes, Yes, tqparent,
name, modal, true, KStdGuiItem::ok() )
{
TQFrame *page = makeMainWidget();
@@ -90,7 +90,7 @@ namespace {
"(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?"
"\\)" );
if ( exp.exactMatch( dateStr ) ) {
- TQStringList list = exp.capturedTexts();
+ TQStringList list = exp.tqcapturedTexts();
TQStringList::iterator iter = list.begin();
++iter; // whole string!
#undef GET
diff --git a/kghostview/infodialog.h b/kghostview/infodialog.h
index 689790d0..8b295b88 100644
--- a/kghostview/infodialog.h
+++ b/kghostview/infodialog.h
@@ -27,9 +27,10 @@ class TQLabel;
class InfoDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- InfoDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
+ InfoDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
void setup( const TQString &fileName, const TQString &documentTitle,
const TQString &publicationDate );
diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp
index 61245ed5..b219a061 100644
--- a/kghostview/kdscerrordialog.cpp
+++ b/kghostview/kdscerrordialog.cpp
@@ -46,8 +46,8 @@ KDSCErrorHandler::Response KDSCErrorThreshold::error( const KDSCError& err )
return Cancel;
}
-KDSCErrorDialog::KDSCErrorDialog( TQWidget* parent ) :
- KDialog( parent, "dscerrordialog", true ),
+KDSCErrorDialog::KDSCErrorDialog( TQWidget* tqparent ) :
+ KDialog( tqparent, "dscerrordialog", true ),
_response( Ok )
{
TQVBoxLayout* vbox = new TQVBoxLayout( this, marginHint(), spacingHint() );
@@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err )
break;
}
- _lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) );
+ _lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) );
_lineLabel->setText( err.line() );
_descriptionLabel->setText( description( err.type() ) );
diff --git a/kghostview/kdscerrordialog.h b/kghostview/kdscerrordialog.h
index 67d3dd4a..27f948c5 100644
--- a/kghostview/kdscerrordialog.h
+++ b/kghostview/kdscerrordialog.h
@@ -42,9 +42,10 @@ private:
class KDSCErrorDialog : public KDialog, public KDSCErrorHandler
{
Q_OBJECT
+ TQ_OBJECT
public:
- KDSCErrorDialog( TQWidget* parent = 0 );
+ KDSCErrorDialog( TQWidget* tqparent = 0 );
Response error( const KDSCError& );
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index a6acdd53..115434b9 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -124,7 +124,7 @@ void KGVMiniWidget::goToPage()
#else
TQString num;
bool b = false;
- num = KLineEditDlg::getText(i18n("Go to Page"), i18n("Page:"), TQString::null, &b, _part->widget(), new TQIntValidator(1, dsc()->page_count(), this));
+ num = KLineEditDlg::getText(i18n("Go to Page"), i18n("Page:"), TQString(), &b, _part->widget(), new TQIntValidator(1, dsc()->page_count(), this));
if (b) goToPage( num.toInt() - 1 );
#endif
}
@@ -384,7 +384,7 @@ void KGVMiniWidget::showPage( int pagenumber )
kdDebug(4500) << "KGVMiniWidget::showPage( " << pagenumber << " )" << endl;
- static_cast< TQWidget* >( _psWidget->parent() )->show();
+ TQT_TQWIDGET( _psWidget->tqparent() )->show();
_psWidget->setFileName(_document->fileName(), dsc()->isStructured() );
_psWidget->clear();
@@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber )
/*
KNotifyClient::userEvent
(i18n("KGhostview cannot load the document, \"%1\".\n"
- "It appears to be broken.").arg( _fileName ),
+ "It appears to be broken.").tqarg( _fileName ),
KNotifyClient::Messagebox);
_psWidget->disableInterpreter();
_psFile=0;
@@ -452,8 +452,8 @@ void KGVMiniWidget::showPage( int pagenumber )
}
}
// Do this after ajusting pagenumber above
- _thumbnailService->cancelRequests( -1 , _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ) );
- _thumbnailService->delayedGetThumbnail( pagenumber, _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ), true );
+ _thumbnailService->cancelRequests( -1 , TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ) );
+ _thumbnailService->delayedGetThumbnail( pagenumber, TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ), true );
emit newPageShown( pagenumber );
}
@@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber )
else
if( !_usePageLabels || document()->format() == KGVDocument::PDF )
text = i18n( "Page %1 of %2" )
- .arg( pageNumber + 1 )
- .arg( dsc()->page_count() );
+ .tqarg( pageNumber + 1 )
+ .tqarg( dsc()->page_count() );
else
text = i18n( "Page %1 (%2 of %3)" )
- .arg( dsc()->page()[ _options.page() ].label )
- .arg( pageNumber + 1 )
- .arg( dsc()->page_count() );
+ .tqarg( dsc()->page()[ _options.page() ].label )
+ .tqarg( pageNumber + 1 )
+ .tqarg( dsc()->page_count() );
emit setStatusBarText( text );
}
@@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC()
}
}
else {
- marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
+ marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 );
}
}
diff --git a/kghostview/kgv_miniwidget.h b/kghostview/kgv_miniwidget.h
index a518657b..7b212157 100644
--- a/kghostview/kgv_miniwidget.h
+++ b/kghostview/kgv_miniwidget.h
@@ -35,9 +35,10 @@ class KGVPart;
class KPSWidget;
class MarkList;
-class KGVMiniWidget : public QObject
+class KGVMiniWidget : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KGVMiniWidget( KGVPart* part, const char* name = 0 );
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index ed08e8e4..1056d22b 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -59,7 +59,7 @@
namespace KGV {
/*
- * This is because Qt's iterators
+ * This is because TQt's iterators
* are not standard iterators bc of missing typedefs,
* so they are only *almost* STL compatible
*/
@@ -74,10 +74,10 @@ namespace KGV {
}
}
-KGVPart::KGVPart( TQWidget* parentWidget, const char*,
- TQObject* parent, const char* name,
+KGVPart::KGVPart( TQWidget* tqparentWidget, const char*,
+ TQObject* tqparent, const char* name,
const TQStringList &args ) :
- KParts::ReadOnlyPart( parent, name ),
+ KParts::ReadOnlyPart( tqparent, name ),
_fitTimer( new TQTimer( this ) ),
_job( 0 ),
_mimetypeScanner( 0 ),
@@ -85,13 +85,13 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
_isGuiInitialized( false ),
_isFileDirty( false ),
_stickyOptions( false ),
- _embeddedInKGhostView( !args.contains( "KParts::ReadOnlyPart" ) ),
+ _embeddedInKGhostView( !args.tqcontains( "KParts::ReadOnlyPart" ) ),
_customZoomIndex( -1 )
{
setInstance( KGVFactory::instance() );
// Don't show the progress info dialog if we're embedded in Konqueror.
- setProgressInfoEnabled( !args.contains( "Browser/View") );
+ setProgressInfoEnabled( !args.tqcontains( "Browser/View") );
_document = new KGVDocument( this );
connect( _document, TQT_SIGNAL( fileChangeFailed() ),
@@ -108,8 +108,8 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
this, TQT_SLOT( slotDoFileDirty() ) );
// Setup main widget
- _mainWidget = new KGVMainWidget( parentWidget );
- _mainWidget->setFocusPolicy( TQWidget::StrongFocus );
+ _mainWidget = new KGVMainWidget( tqparentWidget );
+ _mainWidget->setFocusPolicy( TQ_StrongFocus );
_mainWidget->installEventFilter( this );
_mainWidget->setAcceptDrops( true );
connect( _mainWidget, TQT_SIGNAL( spacePressed() ),
@@ -165,14 +165,14 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
_markList = new MarkList( _mainWidget, "marklist", _docManager );
_markList->setFixedWidth( PAGELIST_WIDTH );
vlay->addWidget( _markList, 1 );
- connect( _markList, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
+ connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
this, TQT_SLOT( showPopup( int, int, const TQPoint& ) ) );
- connect( _markList, TQT_SIGNAL( selected( int ) ),
+ connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( selected( int ) ),
_docManager, TQT_SLOT( goToPage( int ) ) );
connect( _docManager, TQT_SIGNAL( newPageShown( int ) ),
- _markList, TQT_SLOT( select( int ) ) );
+ TQT_TQOBJECT(_markList), TQT_SLOT( select( int ) ) );
connect( _docManager, TQT_SIGNAL( setStatusBarText( const TQString& ) ),
this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) );
connect( _scrollBox, TQT_SIGNAL( valueChangedRelative( int, int ) ),
@@ -195,34 +195,34 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
_popup = new KPopupMenu( _markList, "marklist_menu" );
KAction *act = new KAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
- _markList, TQT_SLOT( markCurrent() ),
+ TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
actionCollection(), "mark_current" );
act->plug( _popup );
act = new KAction( i18n( "Mark &All Pages" ), 0,
- _markList, TQT_SLOT( markAll() ),
+ TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ),
actionCollection(), "mark_all" );
act->plug( _popup );
act = new KAction( i18n( "Mark &Even Pages" ), 0,
- _markList, TQT_SLOT( markEven() ),
+ TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ),
actionCollection(), "mark_even" );
act->plug( _popup );
act = new KAction( i18n( "Mark &Odd Pages" ), 0,
- _markList, TQT_SLOT( markOdd() ),
+ TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ),
actionCollection(), "mark_odd" );
act->plug( _popup );
act = new KAction( i18n( "&Toggle Page Marks" ), 0,
- _markList, TQT_SLOT( toggleMarks() ),
+ TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ),
actionCollection(), "toggle" );
act->plug( _popup );
act = new KAction( i18n("&Remove Page Marks"), 0,
- _markList, TQT_SLOT( removeMarks() ),
+ TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ),
actionCollection(), "remove" );
act->plug( _popup );
// TODO -- disable entry if there aren't any page names
//-- View Menu ----------------------------------------------------------
- _selectOrientation = new KSelectAction( i18n( "&Orientation" ), 0, 0, 0,
+ _selectOrientation = new KSelectAction( i18n( "&Qt::Orientation" ), 0, 0, 0,
actionCollection(), "orientation_menu" );
_selectMedia = new KSelectAction( i18n( "Paper &Size" ), 0, 0, 0,
actionCollection(), "media_menu" );
@@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
first != last;
++first ) {
- TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
+ TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
zooms << str;
if ( *first == 1.0 ) idx = cur;
@@ -426,7 +426,7 @@ bool KGVPart::closeURL()
_mimetypeScanner->abort();
if( !m_file.isEmpty() )
_fileWatcher->removeFile( m_file );
- _mimetype = TQString::null;
+ _mimetype = TQString();
updatePageDepActions();
stateChanged( "initState" );
return KParts::ReadOnlyPart::closeURL();
@@ -582,7 +582,7 @@ void KGVPart::updateZoomActions()
first != last;
++first ) {
TQString cur = *first;
- cur.remove( cur.find( '%' ), 1 );
+ cur.remove( cur.tqfind( '%' ), 1 );
cur = cur.simplifyWhiteSpace();
bool ok = false;
double z = cur.toDouble(&ok);
@@ -600,7 +600,7 @@ void KGVPart::updateZoomActions()
}
// Show percentage that isn't predefined
- TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
+ TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
items.insert( items.at(idx), 1, str );
_zoomTo->setItems( items );
@@ -682,10 +682,10 @@ void KGVPart::openURLContinue()
// mimetype-determination (e.g. koffice)
TQString extension;
TQString fileName = m_url.fileName();
- int extensionPos = fileName.findRev( '.' );
+ int extensionPos = fileName.tqfindRev( '.' );
if( extensionPos != -1 )
extension = fileName.mid( extensionPos ); // keep the '.'
- KTempFile tempFile( TQString::null, extension );
+ KTempFile tempFile( TQString(), extension );
m_file = tempFile.name();
_tmpFile.setName( m_file );
_tmpFile.open( IO_ReadWrite );
@@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error )
"Below are any error messages which were received from Ghostscript "
"(<nobr><strong>%2</strong></nobr>) "
"which may help you.</qt>" )
- .arg( error )
- .arg( Configuration::interpreter() ),
+ .tqarg( error )
+ .tqarg( Configuration::interpreter() ),
true );
// The true above makes it show a "configure gs" option, but maybe we
// should trigger an auto-redetection?
@@ -784,7 +784,7 @@ void KGVPart::slotMimetypeFinished( const TQString& type )
kdDebug(4500) << "KGVPart::slotMimetypeFinished( " << type << " )" << endl;
_mimetype = type;
if( !_mimetypeScanner || _mimetypeScanner->hasError() )
- emit canceled( TQString::null );
+ emit canceled( TQString() );
else
openURLContinue();
_mimetypeScanner = 0;
@@ -796,7 +796,7 @@ void KGVPart::slotMimetypeError()
_mimetypeScanner = 0;
emit started( 0 );
//kapp->processEvents();
- emit canceled( TQString::null );
+ emit canceled( TQString() );
}
void KGVPart::slotJobFinished( KIO::Job* job )
@@ -839,7 +839,7 @@ void KGVPart::slotNewPage( int )
{
updatePageDepActions();
//media->setCurrentItem (miniWidget()->getSize()-1);
- //orientation->setCurrentItem (miniWidget()->getOrientation()-1);
+ //orientation->setCurrentItem (miniWidget()->getQt::Orientation()-1);
//TODO -- zoom
}
@@ -901,7 +901,7 @@ void KGVPart::slotZoom( const TQString& nz )
{
TQString z = nz;
double zoom;
- z.remove( z.find( '%' ), 1 );
+ z.remove( z.tqfind( '%' ), 1 );
zoom = KGlobal::locale()->readNumber( z ) / 100;
kdDebug( 4500 ) << "ZOOM = " << nz << ", setting zoom = " << zoom << endl;
@@ -968,7 +968,7 @@ void KGVPart::setDisplayOptions( const DisplayOptions& options )
_docManager->setDisplayOptions( options );
_selectOrientation->setCurrentItem( options.overrideOrientation() );
TQStringList medias = document()->mediaNames();
- TQStringList::Iterator now = medias.find( options.overridePageMedia() );
+ TQStringList::Iterator now = medias.tqfind( options.overridePageMedia() );
if ( now != medias.end() ){
// The options are displayed in inverted order.
// Therefore, size() - index gets you the display index
@@ -979,8 +979,8 @@ void KGVPart::setDisplayOptions( const DisplayOptions& options )
}
-KGVBrowserExtension::KGVBrowserExtension( KGVPart *parent ) :
- KParts::BrowserExtension( parent, "KGVBrowserExtension" )
+KGVBrowserExtension::KGVBrowserExtension( KGVPart *tqparent ) :
+ KParts::BrowserExtension( tqparent, "KGVBrowserExtension" )
{
emit enableAction( "print", true );
setURLDropHandlingEnabled( true );
@@ -988,7 +988,7 @@ KGVBrowserExtension::KGVBrowserExtension( KGVPart *parent ) :
void KGVBrowserExtension::print()
{
- ((KGVPart *)parent())->document()->print();
+ ((KGVPart *)tqparent())->document()->print();
}
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 634704fe..4576a0d0 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -19,7 +19,7 @@
#ifndef __KGV_VIEW_H
#define __KGV_VIEW_H
-#include <tqcstring.h> // QByteArray
+#include <tqcstring.h> // TQByteArray
#include <tqfile.h>
#include <kio/job.h>
@@ -55,9 +55,10 @@ class ScrollBox;
class KGVPart: public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
- KGVPart( TQWidget* parentWidget, const char* widgetName,
- TQObject* parent, const char* name,
+ KGVPart( TQWidget* tqparentWidget, const char* widgetName,
+ TQObject* tqparent, const char* name,
const TQStringList& args = TQStringList() );
virtual ~KGVPart();
@@ -230,9 +231,10 @@ private:
class KGVBrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
friend class KGVPart; // emits our signals
public:
- KGVBrowserExtension( KGVPart* parent );
+ KGVBrowserExtension( KGVPart* tqparent );
virtual ~KGVBrowserExtension() {}
public slots:
@@ -243,6 +245,7 @@ public slots:
class KGVRun : public KRun
{
Q_OBJECT
+ TQ_OBJECT
public:
KGVRun( const KURL& url, mode_t mode = 0,
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index ed55df1e..6159a6f2 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -100,7 +100,7 @@ namespace {
{
if ( version < TQString::number( 6.53 ) ) return TQString::number( 6.53 );
if ( version[ 0 ] == '7' && version < TQString::number( 7.04 ) ) return TQString::number( 7.05 );
- return TQString::null;
+ return TQString();
}
// This function should contain all the gs version specific workarounds.
void redoGSDetection()
@@ -114,13 +114,13 @@ namespace {
"which are impossible to resolve. Please upgrade to a newer version.\n"
"KGhostView will try to work with it, but it may not display any files at all.\n"
"Version %2 seems to be appropriate on your system, although newer versions will work as well." )
- .arg( version )
- .arg( recommended ) );
+ .tqarg( version )
+ .tqarg( recommended ) );
}
if ( version < TQString::number( 7.00 ) )
{
TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() );
- arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) );
+ arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) );
TQString antiAliasArgs = arguments.join( " " );
Configuration::setAntialiasingArguments( antiAliasArgs );
@@ -140,9 +140,9 @@ void ConfigDialog::showSettings( KGVPart* main ) {
KConfigDialog* dialog = new KConfigDialog( 0, name,
Configuration::self(), KDialogBase::IconList );
dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
- i18n( "General" ), TQString::fromLatin1( "kghostview" ) );
+ i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) );
GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" );
- dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) );
+ dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) );
gssw->setDetectedVersion(Configuration::version());
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 8b522f5d..9d314596 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -98,7 +98,7 @@ void KGVDocument::doOpenFile()
KMessageBox::sorry( _part->widget(),
i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
"File does not exist.</qt>" )
- .arg( _fileName ) );
+ .tqarg( _fileName ) );
emit canceled( TQString() );
return;
}
@@ -107,7 +107,7 @@ void KGVDocument::doOpenFile()
KMessageBox::sorry( _part->widget(),
i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
"Permission denied.</qt>" )
- .arg( _fileName ) );
+ .tqarg( _fileName ) );
emit canceled( TQString() );
return;
}
@@ -127,12 +127,12 @@ void KGVDocument::doOpenFile()
if( _mimetype == "application/pdf"
|| _mimetype == "application/x-pdf" ) // see bug:67474
{
- _tmpDSC = new KTempFile( TQString::null, ".ps" );
+ _tmpDSC = new KTempFile( TQString(), ".ps" );
Q_CHECK_PTR( _tmpDSC );
if( _tmpDSC->status() != 0 ) {
KMessageBox::error( _part->widget(),
i18n( "Could not create temporary file: %1" )
- .arg( strerror( _tmpDSC->status() ) ) );
+ .tqarg( strerror( _tmpDSC->status() ) ) );
emit canceled( TQString() );
return;
}
@@ -159,8 +159,8 @@ void KGVDocument::doOpenFile()
"which has type <strong>%2</strong>. KGhostview can "
"only load PostScript (.ps, .eps) and Portable "
"Document Format (.pdf) files.</qt>" )
- .arg( _fileName )
- .arg( _mimetype ) );
+ .tqarg( _fileName )
+ .tqarg( _mimetype ) );
emit canceled( TQString() );
return;
}
@@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
- .arg( _fileName ) );
+ .tqarg( _fileName ) );
emit canceled( TQString() );
return false;
}
@@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "Could not create temporary file: %2" )
- .arg( strerror( _tmpUnzipped->status() ) ) );
+ .tqarg( strerror( _tmpUnzipped->status() ) ) );
emit canceled( TQString() );
return false;
}
@@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
- .arg( _fileName ) );
+ .tqarg( _fileName ) );
emit canceled( TQString() );
return false;
}
@@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult )
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr>.</qt>" )
- .arg( _part->url().url() ) );
+ .tqarg( _part->url().url() ) );
emit canceled( TQString() );
return;
}
@@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file)
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
- .arg( _part->url().url() )
- .arg( strerror( errno ) ) );
+ .tqarg( _part->url().url() )
+ .tqarg( strerror( errno ) ) );
emit canceled( "" );
return;
}
@@ -353,14 +353,14 @@ bool KGVDocument::convertFromPDF( const TQString& saveFileName,
<< "-dSAFER"
<< "-dPARANOIDSAFER"
<< "-sDEVICE=pswrite"
- << ( TQCString("-sOutputFile=")+TQFile::encodeName(saveFileName) )
+ << ( TQCString("-sOutputFile=")+TQFile::encodeName(saveFileName).data() )
<< ( TQString("-dFirstPage=")+TQString::number( firstPage ) )
<< ( TQString("-dLastPage=")+TQString::number( lastPage ) )
<< "-c"
<< "save"
<< "pop"
<< "-f"
- << TQFile::encodeName(_fileName);
+ << TQFile::encodeName(_fileName).data();
/*TQValueList<TQCString> args = process.args();
TQValueList<TQCString>::Iterator it = args.begin();
@@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList )
if( bss == ess )
range += TQString::number( *ess );
else
- range += TQString( "%1-%2" ).arg( *bss ).arg( *ess );
+ range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess );
bss = it;
}
@@ -521,9 +521,9 @@ void KGVDocument::print()
printer.setOption( "kde-range",
pageListToRange( _part->markList()->markList() ) );
- if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
+ if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
{
- KTempFile tf( TQString::null, ".ps" );
+ KTempFile tf( TQString(), ".ps" );
if( tf.status() == 0 )
{
if ( printer.pageList().empty() ) {
@@ -548,7 +548,7 @@ void KGVDocument::print()
{
printer.setPageSelection( KPrinter::SystemSide );
- if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
+ if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
printer.printFiles( _fileName );
}
}
@@ -562,9 +562,9 @@ void KGVDocument::saveAs()
_part->url().isLocalFile()
? _part->url().url()
: _part->url().fileName(),
- TQString::null,
+ TQString(),
_part->widget(),
- TQString::null );
+ TQString() );
if( !KIO::NetAccess::upload( _fileName,
saveURL,
static_cast<TQWidget*>( 0 ) ) ) {
@@ -580,7 +580,7 @@ bool KGVDocument::savePages( const TQString& saveFileName,
if( _format == PDF )
{
- KTempFile psSaveFile( TQString::null, ".ps" );
+ KTempFile psSaveFile( TQString(), ".ps" );
psSaveFile.setAutoDelete( true );
if( psSaveFile.status() != 0 )
return false;
@@ -590,8 +590,8 @@ bool KGVDocument::savePages( const TQString& saveFileName,
for( PageList::const_iterator ci = pageList.begin();
ci != pageList.end(); ++ci )
{
- minPage = QMIN( *ci, minPage );
- maxPage = QMAX( *ci, maxPage );
+ minPage = TQMIN( *ci, minPage );
+ maxPage = TQMAX( *ci, maxPage );
}
@@ -774,14 +774,14 @@ void KGVDocument::runPdf2ps( const TQString& pdfName,
KProcess process;
process << _interpreterPath
<< "-dNODISPLAY"
- << "-dQUIET"
- << TQString( "-sPDFname=%1" ).arg( pdfName )
+ << "-dTQUIET"
+ << TQString( "-sPDFname=%1" ).tqarg( pdfName )
<< TQString( "-sDSCnamale locale( "kghostview" );
_fallBackPageMedia = pageSizeToString(
static_cast< TQPrinter::PageSize >( locale.pageSize() ) );
_usePageLabels = false;
-e=%1" ).arg( dscName )
+e=%1" ).tqarg( dscName )
<< "pdf2dsc.ps"
<< "-c"
<< "quit";
@@ -801,8 +801,8 @@ void KGVDocument::pdf2psExited( KProcess* process )
}
*/
-Pdf2dsc::Pdf2dsc( const TQString& ghostscriptPath, TQObject* parent, const char* name ) :
- TQObject( parent, name ),
+Pdf2dsc::Pdf2dsc( const TQString& ghostscriptPath, TQObject* tqparent, const char* name ) :
+ TQObject( tqparent, name ),
_process( 0 ),
_ghostscriptPath( ghostscriptPath )
{}
@@ -822,9 +822,9 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
<< "-dPARANOIDSAFER"
<< "-dDELAYSAFER"
<< "-dNODISPLAY"
- << "-dQUIET"
- << TQString( "-sPDFname=%1" ).arg( pdfName )
- << TQString( "-sDSCname=%1" ).arg( dscName )
+ << "-dTQUIET"
+ << TQString( "-sPDFname=%1" ).tqarg( pdfName )
+ << TQString( "-sDSCname=%1" ).tqarg( dscName )
<< "-c"
<< "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
<< "-f"
diff --git a/kghostview/kgvdocument.h b/kghostview/kgvdocument.h
index 581e5ba8..dc68765b 100644
--- a/kghostview/kgvdocument.h
+++ b/kghostview/kgvdocument.h
@@ -31,9 +31,10 @@ class KPrinter;
class KTempFile;
class Pdf2dsc;
-class KGVDocument : public QObject
+class KGVDocument : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Format { PS, PDF };
@@ -116,7 +117,7 @@ protected:
* kdelibs installed. Generally it will work for .gz and .bz2
*/
bool uncompressFile();
- void openPSFile(const TQString &file=TQString::null);
+ void openPSFile(const TQString &file=TQString());
protected:
bool savePages( const TQString& saveFileName,
@@ -156,12 +157,13 @@ private:
};
-class Pdf2dsc : public QObject
+class Pdf2dsc : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- Pdf2dsc( const TQString& ghostscriptPath, TQObject* parent = 0, const char* name = 0 );
+ Pdf2dsc( const TQString& ghostscriptPath, TQObject* tqparent = 0, const char* name = 0 );
~Pdf2dsc();
void run( const TQString& pdfName, const TQString& dscName );
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index d7a082b0..7a41aa57 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -52,8 +52,8 @@ KGVFactory *KGVFactory::s_self;
KInstance *KGVFactory::s_instance;
KAboutData *KGVFactory::s_aboutData;
-KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name,
+KParts::Part *KGVFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name,
const char *className,
const TQStringList &args_ )
{
@@ -64,13 +64,13 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
*
* as we did before.
*/
- args << TQString::fromLatin1( className );
+ args << TQString::tqfromLatin1( className );
if ( !strcmp( className, "Browser/View" ) ) {
className = "KParts::ReadOnlyPart";
}
- KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( parentWidget,
+ KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( tqparentWidget,
widgetName,
- parent,
+ tqparent,
name,
className,
args );
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h
index 9a5d507f..67829b91 100644
--- a/kghostview/kgvfactory.h
+++ b/kghostview/kgvfactory.h
@@ -33,8 +33,8 @@ class KDE_EXPORT KGVFactory : public KParts::Factory
static KInstance *instance();
static KAboutData *aboutData();
- virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name,
+ virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name,
const char *className,
const TQStringList &args );
diff --git a/kghostview/kgvmainwidget.cpp b/kghostview/kgvmainwidget.cpp
index 5e9bd40b..49823ad0 100644
--- a/kghostview/kgvmainwidget.cpp
+++ b/kghostview/kgvmainwidget.cpp
@@ -20,8 +20,8 @@
#include <kurl.h>
#include <kurldrag.h>
-KGVMainWidget::KGVMainWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name ) {}
+KGVMainWidget::KGVMainWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name ) {}
void KGVMainWidget::keyPressEvent( TQKeyEvent* event )
{
diff --git a/kghostview/kgvmainwidget.h b/kghostview/kgvmainwidget.h
index 99b9dc9b..0aa464d3 100644
--- a/kghostview/kgvmainwidget.h
+++ b/kghostview/kgvmainwidget.h
@@ -23,12 +23,13 @@
class KURL;
-class KGVMainWidget : public QWidget
+class KGVMainWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- KGVMainWidget( TQWidget* parent = 0, const char* name = 0 );
+ KGVMainWidget( TQWidget* tqparent = 0, const char* name = 0 );
signals:
void spacePressed();
diff --git a/kghostview/kgvpagedecorator.cpp b/kghostview/kgvpagedecorator.cpp
index b6304c1d..d7ea7e0d 100644
--- a/kghostview/kgvpagedecorator.cpp
+++ b/kghostview/kgvpagedecorator.cpp
@@ -23,8 +23,8 @@
#include "kgvpagedecorator.h"
-KGVPageDecorator::KGVPageDecorator( TQWidget* parent, const char* name ) :
- TQHBox( parent, name ),
+KGVPageDecorator::KGVPageDecorator( TQWidget* tqparent, const char* name ) :
+ TQHBox( tqparent, name ),
_margin( 5 ),
_borderWidth( 1 ),
_shadowOffset( 2, 2 )
@@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p )
if( !r.isValid() )
return;
- const TQColorGroup& cg = colorGroup();
+ const TQColorGroup& cg = tqcolorGroup();
r.moveCenter( r.center() + _shadowOffset );
qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() );
diff --git a/kghostview/kgvpagedecorator.h b/kghostview/kgvpagedecorator.h
index 40839fdc..546063bf 100644
--- a/kghostview/kgvpagedecorator.h
+++ b/kghostview/kgvpagedecorator.h
@@ -21,10 +21,10 @@
#include <tqhbox.h>
-class KGVPageDecorator : public QHBox
+class KGVPageDecorator : public TQHBox
{
public:
- KGVPageDecorator( TQWidget* parent = 0, const char* name = 0 );
+ KGVPageDecorator( TQWidget* tqparent = 0, const char* name = 0 );
~KGVPageDecorator() { ; }
unsigned int margin() const;
@@ -49,13 +49,13 @@ protected:
virtual void drawFrame( TQPainter* );
/**
- * Draw the mask of both the frame and the contents in order to create a
+ * Draw the tqmask of both the frame and the contents in order to create a
* partially transparent frame.
*/
virtual void drawMask( TQPainter* );
/**
- * Reimplemented from TQWidget. It uses @ref drawMask() to draw the mask
+ * Reimplemented from TQWidget. It uses @ref drawMask() to draw the tqmask
* of the frame when transparency is required.
*/
virtual void updateMask();
diff --git a/kghostview/kgvpageview.cpp b/kghostview/kgvpageview.cpp
index 2cc5f7e6..577a8c98 100644
--- a/kghostview/kgvpageview.cpp
+++ b/kghostview/kgvpageview.cpp
@@ -22,13 +22,13 @@
#include "kgvpageview.h"
-KGVPageView::KGVPageView( TQWidget* parent, const char* name )
- : TQScrollView( parent, name )
+KGVPageView::KGVPageView( TQWidget* tqparent, const char* name )
+ : TQScrollView( tqparent, name )
{
_page = 0;
- setFocusPolicy( TQWidget::StrongFocus );
- viewport()->setFocusPolicy( TQWidget::WheelFocus );
+ setFocusPolicy( TQ_StrongFocus );
+ viewport()->setFocusPolicy( TQ_WheelFocus );
}
void KGVPageView::setPage( TQWidget* page )
@@ -52,7 +52,7 @@ bool KGVPageView::atBottom() const
bool KGVPageView::eventFilter( TQObject* o, TQEvent* e )
{
- if ( o == _page && e->type() == TQEvent::Resize ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_page) && e->type() == TQEvent::Resize ) {
// We need to call TQScrollView::eventFilter before centerContents,
// otherwise a loop will be introduced.
bool result = TQScrollView::eventFilter( o, e );
@@ -88,16 +88,16 @@ void KGVPageView::wheelEvent( TQWheelEvent *e )
}
void KGVPageView::mousePressEvent( TQMouseEvent * e )
{
- if ( e->button() & LeftButton )
+ if ( e->button() & Qt::LeftButton )
{
_dragGrabPos = e -> globalPos();
setCursor( sizeAllCursor );
}
- else if ( e->button() & MidButton )
+ else if ( e->button() & Qt::MidButton )
{
emit ReadDown();
}
- else if ( e -> button() & RightButton )
+ else if ( e -> button() & Qt::RightButton )
{
emit rightClick();
}
@@ -105,7 +105,7 @@ void KGVPageView::mousePressEvent( TQMouseEvent * e )
void KGVPageView::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( e -> button() & LeftButton )
+ if ( e -> button() & Qt::LeftButton )
{
setCursor( arrowCursor );
}
@@ -113,7 +113,7 @@ void KGVPageView::mouseReleaseEvent( TQMouseEvent *e )
void KGVPageView::mouseMoveEvent( TQMouseEvent * e )
{
- if ( e->state() & LeftButton )
+ if ( e->state() & Qt::LeftButton )
{
TQPoint delta = _dragGrabPos - e->globalPos();
scrollBy( delta.x(), delta.y() );
@@ -126,7 +126,7 @@ bool KGVPageView::readUp()
if( atTop() )
return false;
else {
- int newValue = QMAX( verticalScrollBar()->value() - height() + 50,
+ int newValue = TQMAX( verticalScrollBar()->value() - height() + 50,
verticalScrollBar()->minValue() );
/*
@@ -148,7 +148,7 @@ bool KGVPageView::readDown()
if( atBottom() )
return false;
else {
- int newValue = QMIN( verticalScrollBar()->value() + height() - 50,
+ int newValue = TQMIN( verticalScrollBar()->value() + height() - 50,
verticalScrollBar()->maxValue() );
/*
diff --git a/kghostview/kgvpageview.h b/kghostview/kgvpageview.h
index 6f76f458..63f9c5af 100644
--- a/kghostview/kgvpageview.h
+++ b/kghostview/kgvpageview.h
@@ -27,12 +27,13 @@
* will be centered on the viewport. Furthermore it adds the ability to scroll
* the page by dragging it using the mouse.
*/
-class KGVPageView : public QScrollView
+class KGVPageView : public TQScrollView
{
Q_OBJECT
+ TQ_OBJECT
public:
- KGVPageView( TQWidget* parent = 0, const char* name = 0 );
+ KGVPageView( TQWidget* tqparent = 0, const char* name = 0 );
~KGVPageView() { ; }
void setPage( TQWidget* );
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 708921ab..fcbda90c 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -50,7 +50,7 @@
#include "displayoptions.h"
#include "fullscreenfilter.h"
-#undef Always // avoid X11/Qt namespace clash
+#undef Always // avoid X11/TQt namespace clash
#include "kgvshell.moc"
//TODO -- disable GUI when no file
@@ -60,29 +60,29 @@ KGVShell::KGVShell() :
_tmpFile( 0 )
{
m_gvpart = KParts::ComponentFactory::createPartInstanceFromLibrary< KGVPart >( "libkghostviewpart", this, "kgvpart",
- this, "kgvpart" );
+ TQT_TQOBJECT(this), "kgvpart" );
/*---- File -----------------------------------------------------------*/
openact =
- KStdAction::open( this, TQT_SLOT( slotFileOpen() ),
+ KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ),
actionCollection() );
recent =
- KStdAction::openRecent( this, TQT_SLOT( openURL( const KURL& ) ),
+ KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ),
actionCollection() );
KStdAction::print( m_gvpart->document(), TQT_SLOT( print() ),
actionCollection() );
(void)
- KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
/*---- View -----------------------------------------------------------*/
new KAction( i18n( "&Reload" ), "reload",
KStdAccel::shortcut( KStdAccel::Reload ),
m_gvpart, TQT_SLOT( reloadFile() ),
actionCollection(), "reload" );
- new KAction( i18n( "&Maximize" ), Key_M, this,
+ new KAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
TQT_SLOT( slotMaximize() ), actionCollection(),
"maximize");
- _showMenuBarAction = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenubar() ), actionCollection() );
+ _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
/*---- Settings -------------------------------------------------------*/
#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
@@ -91,11 +91,11 @@ KGVShell::KGVShell() :
setAutoSaveSettings();
setStandardToolBarMenuEnabled(true);
#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
- m_fullScreenAction = KStdAction::fullScreen( this, TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
+ m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
#else
m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
#endif
- KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+ KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
@@ -115,7 +115,7 @@ actionCollection());
// We could, at the user's option, make this connection and kghostview
// will always resize to fit the width of the page. But, for now,
// let's not.
- // connect ( m_gvpart->widget(), TQT_SIGNAL (sizeHintChanged()), this, TQT_SLOT (slotResize ()) );
+ // connect ( m_gvpart->widget(), TQT_SIGNAL (tqsizeHintChanged()), this, TQT_SLOT (slotResize ()) );
setCentralWidget( m_gvpart->widget() );
createGUI( m_gvpart );
@@ -252,7 +252,7 @@ KGVShell::openStdin()
if( _tmpFile->status() != 0 ) {
KMessageBox::error( this,
i18n( "Could not create temporary file: %1" )
- .arg( strerror( _tmpFile->status() ) ) );
+ .tqarg( strerror( _tmpFile->status() ) ) );
return;
}
@@ -269,7 +269,7 @@ KGVShell::openStdin()
if( read != 0 ) {
KMessageBox::error( this,
i18n( "Could not open standard input stream: %1" )
- .arg( strerror( errno ) ) );
+ .tqarg( strerror( errno ) ) );
return;
}
@@ -309,7 +309,7 @@ void KGVShell::slotMaximize()
void KGVShell::slotResize()
{
- resize( m_gvpart->pageView()->sizeHint().width(), height() );
+ resize( m_gvpart->pageView()->tqsizeHint().width(), height() );
}
void KGVShell::setFullScreen( bool useFullScreen )
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index 73b7f128..7152fc88 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -38,6 +38,7 @@ class FullScreenFilter;
class KDE_EXPORT KGVShell : public KParts::MainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
KGVShell();
diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp
index 85f22827..389b5284 100644
--- a/kghostview/kpswidget.cpp
+++ b/kghostview/kpswidget.cpp
@@ -80,8 +80,8 @@ TQCString palette2String( Configuration::EnumPalette::type palette )
}
-KPSWidget::KPSWidget( TQWidget* parent, const char* name ) :
- TQWidget ( parent, name ),
+KPSWidget::KPSWidget( TQWidget* tqparent, const char* name ) :
+ TQWidget ( tqparent, name ),
_gsWindow ( None ),
_usePipe ( false ),
_doubleBuffer ( false ),
@@ -279,8 +279,8 @@ void KPSWidget::setupWidget()
Q_ASSERT( orientation() != CDSC_ORIENT_UNKNOWN );
- const float dpiX = _magnification * x11AppDpiX();
- const float dpiY = _magnification * x11AppDpiY();
+ const float dpiX = _magnification * TQT_TQPAINTDEVICE(this)->x11AppDpiX();
+ const float dpiY = _magnification * TQT_TQPAINTDEVICE(this)->x11AppDpiY();
int newWidth = 0, newHeight = 0;
if( orientation() == CDSC_PORTRAIT || orientation() == CDSC_UPSIDEDOWN )
@@ -333,7 +333,7 @@ void KPSWidget::setupWidget()
// Make sure the properties are updated immediately.
XSync( x11Display(), false );
- repaint();
+ tqrepaint();
_widgetDirty = false;
}
@@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter()
setupWidget();
_process = new KProcess;
- if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
+ if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) );
else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );
*_process << _ghostscriptPath.local8Bit();
@@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process )
{
kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl;
if ( process->normalExit() ) {
- emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) );
+ emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) );
} else {
emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) );
}
@@ -464,7 +464,7 @@ void KPSWidget::gs_input( KProcess* process )
const unsigned buffer_size = 4096;
if ( !_buffer ) _buffer = static_cast<char*>( operator new( buffer_size ) );
const int bytesRead = fread( _buffer, sizeof (char),
- QMIN( buffer_size, current.len ),
+ TQMIN( buffer_size, current.len ),
current.fp );
if( bytesRead > 0 )
{
@@ -493,7 +493,7 @@ void KPSWidget::readSettings()
if( !Configuration::platformFonts() )
arguments << "-dNOPLATFONTS";
- arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER" << "-dPARANOIDSAFER";
+ arguments << "-dNOPAUSE" << "-dTQUIET" << "-dSAFER" << "-dPARANOIDSAFER";
setGhostscriptArguments( arguments );
diff --git a/kghostview/kpswidget.h b/kghostview/kpswidget.h
index c2ca49cb..3420aa6b 100644
--- a/kghostview/kpswidget.h
+++ b/kghostview/kpswidget.h
@@ -43,12 +43,13 @@ class MessagesDialog;
* @ref ghostscript_interface
*/
-class KPSWidget : public QWidget
+class KPSWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- KPSWidget( TQWidget* parent = 0, const char* name = 0 );
+ KPSWidget( TQWidget* tqparent = 0, const char* name = 0 );
~KPSWidget();
/**
diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp
index 69c61ac3..f3f41deb 100644
--- a/kghostview/logwindow.cpp
+++ b/kghostview/logwindow.cpp
@@ -27,8 +27,8 @@
#include "logwindow.h"
LogWindow::LogWindow( const TQString& caption,
- TQWidget* parent, const char* name) :
- KDialogBase( parent, name, false, caption, User1|Close, Close, false,
+ TQWidget* tqparent, const char* name) :
+ KDialogBase( tqparent, name, false, caption, User1|Close, Close, false,
KStdGuiItem::clear() )
{
TQVBox * display = makeVBoxMainWidget();
@@ -36,11 +36,11 @@ LogWindow::LogWindow( const TQString& caption,
_errorIndication = new TQLabel( "", display, "logview-label" );
_errorIndication->hide();
- _configureGS = new KURLLabel( i18n( "Configure Ghostscript" ), TQString::null, display );
+ _configureGS = new KURLLabel( i18n( "Configure Ghostscript" ), TQString(), display );
_configureGS->hide();
_logView = new TQTextEdit( display, "logview" );
- _logView->setTextFormat( Qt::PlainText );
+ _logView->setTextFormat( TQt::PlainText );
_logView->setReadOnly( true );
_logView->setWordWrap( TQTextEdit::NoWrap );
_logView->setFont( KGlobalSettings::fixedFont() );
diff --git a/kghostview/logwindow.h b/kghostview/logwindow.h
index 7be4bf98..277bcdfd 100644
--- a/kghostview/logwindow.h
+++ b/kghostview/logwindow.h
@@ -28,10 +28,11 @@ class KURLLabel;
class LogWindow : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
LogWindow( const TQString& caption,
- TQWidget* parent = 0, const char* name = 0 );
+ TQWidget* tqparent = 0, const char* name = 0 );
public slots:
void append( const TQString& message );
diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp
index df06bd9d..50aa4cbc 100644
--- a/kghostview/marklist.cpp
+++ b/kghostview/marklist.cpp
@@ -32,8 +32,8 @@
#include "kgv_miniwidget.h"
-MarkListItem::MarkListItem(TQWidget *parent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget* miniW, int pageNum)
- : TQWidget( parent ),
+MarkListItem::MarkListItem(TQWidget *tqparent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget* miniW, int pageNum)
+ : TQWidget( tqparent ),
_miniWidget( miniW ),
_pageNum( pageNum ),
_requested( false )
@@ -43,7 +43,7 @@ MarkListItem::MarkListItem(TQWidget *parent, const TQString &text, const TQStrin
_thumbnailW = new TQWidget( this );
_checkBox = new TQCheckBox( text, this );
l->addWidget( _thumbnailW, 1 );
- l->addWidget( _checkBox, 0, Qt::AlignHCenter );
+ l->addWidget( _checkBox, 0, TQt::AlignHCenter );
TQWhatsThis::add( _checkBox, i18n( "Using this checkbox you can select pages for printing." ) );
setFixedHeight( 100 );
_backgroundColor = color;
@@ -72,22 +72,27 @@ void MarkListItem::setPixmap( TQPixmap thumbnail )
// The line below is needed to work around certain "features" of styles such as liquid
// see bug:61711 for more info (LPC, 20 Aug '03)
_thumbnailW->setBackgroundOrigin( TQWidget::WidgetOrigin );
- _thumbnailW->setPaletteBackgroundPixmap( thumbnail.convertToImage().smoothScale( _thumbnailW->size() ) );
+ TQPixmap pm;
+ pm.convertFromImage( thumbnail.convertToImage().smoothScale( _thumbnailW->size() ) );
+ _thumbnailW->setPaletteBackgroundPixmap( pm );
_requested = false;
}
void MarkListItem::setSelected( bool selected )
{
if (selected)
- setPaletteBackgroundColor( TQApplication::palette().active().highlight() );
+ setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() );
else
setPaletteBackgroundColor( _backgroundColor );
}
void MarkListItem::resizeEvent( TQResizeEvent * )
{
- if ( _thumbnailW->paletteBackgroundPixmap() )
- _thumbnailW->setPaletteBackgroundPixmap( _thumbnailW->paletteBackgroundPixmap()->convertToImage().smoothScale( _thumbnailW->size() ) );
+ if ( _thumbnailW->paletteBackgroundPixmap() ) {
+ TQPixmap pm;
+ pm.convertFromImage( _thumbnailW->paletteBackgroundPixmap()->convertToImage().smoothScale( _thumbnailW->size() ) );
+ _thumbnailW->setPaletteBackgroundPixmap( pm );
+ }
}
void MarkListItem::paintEvent( TQPaintEvent* )
@@ -100,7 +105,7 @@ void MarkListItem::paintEvent( TQPaintEvent* )
*/
if ( _requested ) return;
if ( !_thumbnailW->paletteBackgroundPixmap() || _thumbnailW->paletteBackgroundPixmap()->isNull() ) {
- _miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, this, TQT_SLOT( setPixmap( TQPixmap ) ) );
+ _miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, TQT_TQOBJECT(this), TQT_SLOT( setPixmap( TQPixmap ) ) );
_requested = true;
}
}
@@ -108,8 +113,8 @@ void MarkListItem::paintEvent( TQPaintEvent* )
/* MarkList */
-MarkList::MarkList( TQWidget* parent, const char* name, KGVMiniWidget* mini)
- : TQTable( parent, name ),
+MarkList::MarkList( TQWidget* tqparent, const char* name, KGVMiniWidget* mini)
+ : TQTable( tqparent, name ),
_selected ( -1 ),
_miniWidget( mini )
{
diff --git a/kghostview/marklist.h b/kghostview/marklist.h
index 4405f877..1977a18d 100644
--- a/kghostview/marklist.h
+++ b/kghostview/marklist.h
@@ -24,11 +24,12 @@
class KGVMiniWidget;
-class MarkListItem : public QWidget
+class MarkListItem : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- MarkListItem( TQWidget *parent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget*, int );
+ MarkListItem( TQWidget *tqparent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget*, int );
bool isChecked() const;
@@ -51,16 +52,17 @@ private:
bool _requested;
};
-class MarkList: public QTable
+class MarkList: public TQTable
{
Q_OBJECT
+ TQ_OBJECT
public:
- MarkList( TQWidget* parent = 0, const char* name = 0, KGVMiniWidget* = 0 );
+ MarkList( TQWidget* tqparent = 0, const char* name = 0, KGVMiniWidget* = 0 );
TQValueList<int> markList() const;
void insertItem( const TQString& text, int index = -1,
- const TQString& tip = TQString::null );
+ const TQString& tip = TQString() );
public slots:
void select( int index );
diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp
index d318ec31..f9c23904 100644
--- a/kghostview/scrollbox.cpp
+++ b/kghostview/scrollbox.cpp
@@ -22,8 +22,8 @@
#include "scrollbox.h"
-ScrollBox::ScrollBox( TQWidget* parent, const char* name )
- : TQFrame( parent, name )
+ScrollBox::ScrollBox( TQWidget* tqparent, const char* name )
+ : TQFrame( tqparent, name )
{
setFrameStyle( Panel | Sunken );
}
@@ -31,15 +31,15 @@ ScrollBox::ScrollBox( TQWidget* parent, const char* name )
void ScrollBox::mousePressEvent( TQMouseEvent* e )
{
mouse = e->pos();
- if( e->button() == RightButton )
+ if( e->button() == Qt::RightButton )
emit button3Pressed();
- if( e->button() == MidButton )
+ if( e->button() == Qt::MidButton )
emit button2Pressed();
}
void ScrollBox::mouseMoveEvent( TQMouseEvent* e )
{
- if( e->state() != LeftButton )
+ if( e->state() != Qt::LeftButton )
return;
int dx = ( e->pos().x() - mouse.x() ) * pagesize.width() / width();
@@ -57,8 +57,11 @@ void ScrollBox::mouseMoveEvent( TQMouseEvent* e )
void ScrollBox::resizeEvent( TQResizeEvent * )
{
- if ( paletteBackgroundPixmap() )
- setPaletteBackgroundPixmap( paletteBackgroundPixmap()->convertToImage().smoothScale( size() ) );
+ if ( paletteBackgroundPixmap() ) {
+ TQPixmap pm;
+ pm.convertFromImage(paletteBackgroundPixmap()->convertToImage().smoothScale( size() ));
+ setPaletteBackgroundPixmap( pm );
+ }
}
void ScrollBox::drawContents( TQPainter* paint )
@@ -77,7 +80,7 @@ void ScrollBox::drawContents( TQPainter* paint )
TQRect c( contentsRect() );
- paint -> setPen( Qt::red );
+ paint -> setPen( TQt::red );
int len = pagesize.width();
int x = c.x() + c.width() * viewpos.x() / len;
@@ -96,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s )
{
pagesize = s;
setFixedHeight( s.height() * width() / s.width() );
- repaint();
+ tqrepaint();
}
void ScrollBox::setViewSize( const TQSize& s )
{
viewsize = s;
- repaint();
+ tqrepaint();
}
void ScrollBox::setViewPos( const TQPoint& pos )
{
viewpos = pos;
- repaint();
+ tqrepaint();
}
void ScrollBox::setThumbnail( TQPixmap img )
@@ -116,7 +119,9 @@ void ScrollBox::setThumbnail( TQPixmap img )
// The line below is needed to work around certain "features" of styles such as liquid
// see bug:61711 for more info (LPC, 20 Aug '03)
setBackgroundOrigin( TQWidget::WidgetOrigin );
- setPaletteBackgroundPixmap( img.convertToImage().smoothScale( size() ) );
+ TQPixmap pm;
+ pm.convertFromImage(img.convertToImage().smoothScale( size() ));
+ setPaletteBackgroundPixmap( pm );
}
void ScrollBox::clear()
diff --git a/kghostview/scrollbox.h b/kghostview/scrollbox.h
index 487e2c7e..04722166 100644
--- a/kghostview/scrollbox.h
+++ b/kghostview/scrollbox.h
@@ -22,12 +22,13 @@
#include <tqframe.h>
#include <tqimage.h>
-class ScrollBox: public QFrame
+class ScrollBox: public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- ScrollBox( TQWidget* parent = 0, const char* name = 0 );
+ ScrollBox( TQWidget* tqparent = 0, const char* name = 0 );
public slots:
void setPageSize( const TQSize& );
diff --git a/kghostview/thumbnailservice.cpp b/kghostview/thumbnailservice.cpp
index 817d1c03..9887ec4b 100644
--- a/kghostview/thumbnailservice.cpp
+++ b/kghostview/thumbnailservice.cpp
@@ -28,14 +28,14 @@
#include <cassert>
#include <cstring>
-ThumbnailService::ThumbnailService( KGVMiniWidget* parent, const char* name ) :
- TQObject( parent, name ),
- _mini( parent ),
+ThumbnailService::ThumbnailService( KGVMiniWidget* tqparent, const char* name ) :
+ TQObject( tqparent, name ),
+ _mini( tqparent ),
timer_( new TQTimer( this ) ),
_busy( false ),
_enabled( false )
{
- _thumbnailDrawer = new KPSWidget( parent->_part->widget(), "thumbnail-drawer" );
+ _thumbnailDrawer = new KPSWidget( tqparent->_part->widget(), "thumbnail-drawer" );
_thumbnailDrawer->readSettings();
connect( _thumbnailDrawer, TQT_SIGNAL( newPageImage( TQPixmap ) ), TQT_SLOT( slotDone( TQPixmap ) ) );
connect( timer_, TQT_SIGNAL( timeout() ), TQT_SLOT( processOne() ) );
diff --git a/kghostview/thumbnailservice.h b/kghostview/thumbnailservice.h
index 50bc2d6d..e57f18bf 100644
--- a/kghostview/thumbnailservice.h
+++ b/kghostview/thumbnailservice.h
@@ -30,8 +30,9 @@ class TQTimer;
class ThumbnailService : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- ThumbnailService( KGVMiniWidget* parent, const char* name = 0 );
+ ThumbnailService( KGVMiniWidget* tqparent, const char* name = 0 );
~ThumbnailService();
public slots:
diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index 1740bf4d..5a912a0c 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -25,10 +25,10 @@
#include <kbuttonbox.h>
#include <kseparator.h>
-ViewControl::ViewControl( TQWidget *parent, const char *name )
- : TQDialog( parent, name )
+ViewControl::ViewControl( TQWidget *tqparent, const char *name )
+ : TQDialog( tqparent, name )
{
- setFocusPolicy(TQWidget::StrongFocus);
+ setFocusPolicy(TQ_StrongFocus);
TQBoxLayout *topLayout = new TQVBoxLayout( this, 10 );
@@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
vcGroupBox = new TQGroupBox( this );
vcGroupBox->setFrameStyle( TQFrame::NoFrame );
//vcGroupBox->setTitle( i18n("Force Changes To") );
- //vcGroupBox->setAlignment( 1 );
+ //vcGroupBox->tqsetAlignment( 1 );
topLayout->addWidget( vcGroupBox, 10 );
@@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
magComboBox = new TQComboBox( FALSE, vcGroupBox );
- magComboBox->setFixedHeight( magComboBox->sizeHint().height() );
+ magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
//magComboBox->hide();
@@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
mediaComboBox = new TQComboBox( FALSE, vcGroupBox );
- mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() );
+ mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
connect ( mediaComboBox, TQT_SIGNAL (activated (int)),
this, TQT_SLOT (slotMediaSelection (int)) );
@@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
orientComboBox->insertItem(i18n("Landscape"));
orientComboBox->insertItem(i18n("Seascape"));
orientComboBox->insertItem(i18n("Upside Down"));
- orientComboBox->setFixedHeight( magComboBox->sizeHint().height() );
+ orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
connect ( orientComboBox, TQT_SIGNAL (activated (int)),
this, TQT_SLOT (slotOrientSelection (int)) );
@@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
TQLabel* vcLabel;
vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox );
- vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
- if ( vcLabel->sizeHint().width() > labelWidth )
- labelWidth = vcLabel->sizeHint().width();
+ vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
+ if ( vcLabel->tqsizeHint().width() > labelWidth )
+ labelWidth = vcLabel->tqsizeHint().width();
vcLabel->setMinimumWidth( labelWidth );
vcLabel->hide();
@@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox );
- vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
- if ( vcLabel->sizeHint().width() > labelWidth )
- labelWidth = vcLabel->sizeHint().width();
+ vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
+ if ( vcLabel->tqsizeHint().width() > labelWidth )
+ labelWidth = vcLabel->tqsizeHint().width();
vcLabel->setMinimumWidth( labelWidth );
grid->addWidget( vcLabel, 1, 0 );
- vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox );
- vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
- if ( vcLabel->sizeHint().width() > labelWidth )
- labelWidth = vcLabel->sizeHint().width();
+ vcLabel = new TQLabel( orientComboBox, i18n("&Qt::Orientation"), vcGroupBox );
+ vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
+ if ( vcLabel->tqsizeHint().width() > labelWidth )
+ labelWidth = vcLabel->tqsizeHint().width();
vcLabel->setMinimumWidth( labelWidth );
grid->addWidget( vcLabel, 2, 0 );
- vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 );
+ vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 );
vcGroupBox->setMinimumWidth(
- 40 + labelWidth + orientComboBox->sizeHint().width() );
+ 40 + labelWidth + orientComboBox->tqsizeHint().width() );
KSeparator* sep = new KSeparator( KSeparator::HLine, this);
topLayout->addWidget( sep );
@@ -130,7 +130,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
- bbox->layout();
+ bbox->tqlayout();
topLayout->addWidget( bbox );
topLayout->activate();
diff --git a/kghostview/viewcontrol.h b/kghostview/viewcontrol.h
index de766247..7f2c07c1 100644
--- a/kghostview/viewcontrol.h
+++ b/kghostview/viewcontrol.h
@@ -6,11 +6,12 @@ class TQComboBox;
class TQPushButton;
-class ViewControl : public QDialog
+class ViewControl : public TQDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- ViewControl( TQWidget *parent, const char *name );
+ ViewControl( TQWidget *tqparent, const char *name );
TQComboBox* magComboBox;
TQComboBox* mediaComboBox;
TQComboBox* orientComboBox;