diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
| commit | e69e8b1d09fb579316595b4e6a850e717358a8b1 (patch) | |
| tree | a24fc20865f65772f530d16177520190594ffdd2 /kdvi/TeXFontDefinition.cpp | |
| parent | eecec9afb81fdebb0f22e9da22635874c403f854 (diff) | |
| download | tdegraphics-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 'kdvi/TeXFontDefinition.cpp')
| -rw-r--r-- | kdvi/TeXFontDefinition.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kdvi/TeXFontDefinition.cpp b/kdvi/TeXFontDefinition.cpp index 03dd1b72..c89aa59d 100644 --- a/kdvi/TeXFontDefinition.cpp +++ b/kdvi/TeXFontDefinition.cpp @@ -31,7 +31,7 @@ extern const int MFResolutions[]; // #define DEBUG_FONT -TeXFontDefinition::TeXFontDefinition(TQString nfontname, double _displayResolution_in_dpi, Q_UINT32 chk, Q_INT32 _scaled_size_in_DVI_units, +TeXFontDefinition::TeXFontDefinition(TQString nfontname, double _displayResolution_in_dpi, TQ_UINT32 chk, TQ_INT32 _scaled_size_in_DVI_units, class fontPool *pool, double _enlargement) { #ifdef DEBUG_FONT @@ -46,7 +46,7 @@ TeXFontDefinition::TeXFontDefinition(TQString nfontname, double _displayResoluti checksum = chk; flags = TeXFontDefinition::FONT_IN_USE; file = 0; - filename = TQString::null; + filename = TQString(); scaled_size_in_DVI_units = _scaled_size_in_DVI_units; macrotable = 0; @@ -93,8 +93,8 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) flags |= TeXFontDefinition::FONT_LOADED; filename = fname; #ifdef HAVE_FREETYPE - fullFontName = TQString::null; - fullEncodingName = TQString::null; + fullFontName = TQString(); + fullEncodingName = TQString(); #endif file = fopen(TQFile::encodeName(filename), "r"); @@ -105,7 +105,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) TQString filename_test(font_pool->getExtraSearchPath() + "/" + filename); file = fopen( TQFile::encodeName(filename_test), "r"); if (file == 0) { - kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl; + kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(filename) << endl; return; } else filename = filename_test; @@ -121,7 +121,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) font = new TeXFont_PK(this); set_char_p = &dviRenderer::set_char; if ((checksum != 0) && (checksum != font->checksum)) - kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(filename) << endl; + kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(filename) << endl; fontTypeName = "TeX PK"; return; } @@ -169,7 +169,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) #else // If we don't have the FreeType library, we should never have // reached this point. Complain, and leave this font blank - kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl; + kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl; #endif } @@ -195,7 +195,7 @@ void TeXFontDefinition::reset() vf_table.clear(); } - filename = TQString::null; + filename = TQString(); flags = TeXFontDefinition::FONT_IN_USE; set_char_p = &dviRenderer::set_empty_char; } |