From fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 15:08:51 -0600 Subject: Fix kdelibs FTBFS on native TQt3 --- tdeprint/cups/imageposition.h | 2 +- tdeprint/cups/imagepreview.cpp | 4 ++-- tdeprint/fooscanner.cpp | 2 +- tdeprint/fooscanner.l | 4 ++-- tdeprint/kmthreadjob.cpp | 2 +- tdeprint/kmvirtualmanager.h | 2 +- tdeprint/kprintaction.cpp | 2 +- tdeprint/kprintdialog.cpp | 2 +- tdeprint/management/kmiconview.cpp | 8 ++++---- tdeprint/management/kmlistview.cpp | 2 +- tdeprint/management/sidepixmap.cpp | 2 +- tdeprint/management/sidepixmap.h | 2 +- tdeprint/treecombobox.cpp | 6 +++--- tdeprint/util.cpp | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) (limited to 'tdeprint') diff --git a/tdeprint/cups/imageposition.h b/tdeprint/cups/imageposition.h index 6d6645365..5fbae48da 100644 --- a/tdeprint/cups/imageposition.h +++ b/tdeprint/cups/imageposition.h @@ -52,7 +52,7 @@ protected: private: int position_; - QPixmap pix_; + TQPixmap pix_; }; #endif diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index 2290f6a96..fb27974da 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/cups/imagepreview.cpp @@ -58,9 +58,9 @@ void ImagePreview::paintEvent(TQPaintEvent*){ QImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_); int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; - QPixmap buffer(width(), height()); + TQPixmap buffer(width(), height()); buffer.fill(parentWidget(), 0, 0); - QPainter p(&buffer); + TQPainter p(&buffer); p.drawImage(x,y,tmpImage); p.end(); diff --git a/tdeprint/fooscanner.cpp b/tdeprint/fooscanner.cpp index 3cdd4feb6..0cf15d2d1 100644 --- a/tdeprint/fooscanner.cpp +++ b/tdeprint/fooscanner.cpp @@ -446,7 +446,7 @@ char *yytext; #include #include -#define YYSTYPE QVariant +#define YYSTYPE TQVariant #include "fooparser.cpp.h" #define yylval tdeprint_foomatic2lval diff --git a/tdeprint/fooscanner.l b/tdeprint/fooscanner.l index ddd5bb974..df8f6e778 100644 --- a/tdeprint/fooscanner.l +++ b/tdeprint/fooscanner.l @@ -20,7 +20,7 @@ #include #include -#define YYSTYPE QVariant +#define YYSTYPE TQVariant #include "fooparser.cpp.h" #define yylval tdeprint_foomatic2lval @@ -37,7 +37,7 @@ result = 0; \ } -QIODevice* tdeprint_foomatic2scanner_device = NULL; +TQIODevice* tdeprint_foomatic2scanner_device = NULL; %} %option noyywrap diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp index fcee4877f..309da96a9 100644 --- a/tdeprint/kmthreadjob.cpp +++ b/tdeprint/kmthreadjob.cpp @@ -76,7 +76,7 @@ bool KMThreadJob::loadJobs() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - QStringList ll = TQStringList::split(CHARSEP,line,true); + TQStringList ll = TQStringList::split(CHARSEP,line,true); if (ll.count() == 5) { KMJob *job = new KMJob(); diff --git a/tdeprint/kmvirtualmanager.h b/tdeprint/kmvirtualmanager.h index db6ea9a51..4916ab16e 100644 --- a/tdeprint/kmvirtualmanager.h +++ b/tdeprint/kmvirtualmanager.h @@ -65,7 +65,7 @@ protected: private: KMManager *m_manager; - QDateTime m_checktime; + TQDateTime m_checktime; TQString m_defaultprinter; }; diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp index e275ed559..a9e1b2bb8 100644 --- a/tdeprint/kprintaction.cpp +++ b/tdeprint/kprintaction.cpp @@ -35,7 +35,7 @@ public: } PrinterType type; - QStringList printers; + TQStringList printers; TQWidget *parentWidget; }; diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 5cb56819e..092884bde 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -858,7 +858,7 @@ void KPrintDialog::configChanged() void KPrintDialog::expandDialog(bool on) { - QSize sz(size()); + TQSize sz(size()); bool needResize(isVisible()); if (on) diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 1fa5a6da9..905f4d248 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -38,7 +38,7 @@ void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg) { if (m_state != 0) { - QFont f(p->font()); + TQFont f(p->font()); if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); p->setFont(f); @@ -48,17 +48,17 @@ void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg) void KMIconViewItem::calcRect(const TQString&) { - QRect ir(rect()), pr, tr; + TQRect ir(rect()), pr, tr; // pixmap rect pr.setWidth(pixmap()->width()); pr.setHeight(pixmap()->height()); // text rect - QFont f(iconView()->font()); + TQFont f(iconView()->font()); if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); - QFontMetrics fm(f); + TQFontMetrics fm(f); if (m_mode == TQIconView::Bottom) tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, AlignHCenter|AlignTop|WordBreak|BreakAnywhere, text()+"X"); else diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 72d6872cb..4332a8678 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -96,7 +96,7 @@ void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int { if (m_state != 0) { - QFont f(p->font()); + TQFont f(p->font()); if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); p->setFont(f); diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp index 8824dd5fc..dc5dc901f 100644 --- a/tdeprint/management/sidepixmap.cpp +++ b/tdeprint/management/sidepixmap.cpp @@ -49,7 +49,7 @@ TQSize SidePixmap::tqsizeHint() const void SidePixmap::drawContents(TQPainter *p) { - QRect r = contentsRect(); + TQRect r = contentsRect(); if (r.height() <= m_side.height()) { // case where the main pixmap is enough, just center it diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h index 54f7a1f5e..2d3916ff3 100644 --- a/tdeprint/management/sidepixmap.h +++ b/tdeprint/management/sidepixmap.h @@ -36,7 +36,7 @@ protected: void drawContents(TQPainter*); private: - QPixmap m_side, m_tileup, m_tiledown; + TQPixmap m_side, m_tileup, m_tiledown; }; #endif diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp index 7a2adc8ef..45213f41c 100644 --- a/tdeprint/treecombobox.cpp +++ b/tdeprint/treecombobox.cpp @@ -93,15 +93,15 @@ void TreeListBoxItem::paint(TQPainter *p) return; } - const QPixmap *pix = pixmap(); - QRect r = p->viewport(); + const TQPixmap *pix = pixmap(); + TQRect r = p->viewport(); int h = height(listBox()); int xo = (m_depth * stepSize() + 2); int yo = (pix ? (h-pix->height())/2 : 0); if (m_depth > 0) { - QPen oldPen = p->pen(); + TQPen oldPen = p->pen(); p->setPen(listBox()->tqcolorGroup().mid()); TreeListBoxItem *item = this; diff --git a/tdeprint/util.cpp b/tdeprint/util.cpp index b4025a087..b5d6e06d5 100644 --- a/tdeprint/util.cpp +++ b/tdeprint/util.cpp @@ -24,8 +24,8 @@ void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& print { if (url.protocol() != "smb") return; - QString h = url.host(); - QStringList l = TQStringList::split('/', url.path(), false); + TQString h = url.host(); + TQStringList l = TQStringList::split('/', url.path(), false); if (l.count() > 1) { work = h; -- cgit v1.2.1