diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:33 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:33 +0900 |
commit | 2e0398f755ab6af9557cc805e4f484bbf0c150f6 (patch) | |
tree | 712a40baf33c3b3488ab74f0a7240cfd87cef532 /tdehtml | |
parent | 8d88f31f74735c9580b7d374f709a22206d14982 (diff) | |
download | tdelibs-2e0398f755ab6af9557cc805e4f484bbf0c150f6.tar.gz tdelibs-2e0398f755ab6af9557cc805e4f484bbf0c150f6.zip |
QT_NO_* -> TQT_NO_* renaming.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdehtml')
-rw-r--r-- | tdehtml/rendering/bidi.cpp | 4 | ||||
-rw-r--r-- | tdehtml/tdehtml_ext.cpp | 14 | ||||
-rw-r--r-- | tdehtml/tdehtml_part.cpp | 14 | ||||
-rw-r--r-- | tdehtml/tdehtmlview.cpp | 14 | ||||
-rw-r--r-- | tdehtml/tdehtmlview.h | 4 | ||||
-rw-r--r-- | tdehtml/test_regression_fontoverload.cpp | 4 |
6 files changed, 27 insertions, 27 deletions
diff --git a/tdehtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp index c8abf52d0..4c72c477d 100644 --- a/tdehtml/rendering/bidi.cpp +++ b/tdehtml/rendering/bidi.cpp @@ -939,7 +939,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator dirCurrent = bidi.current.direction(); } -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES #if BIDI_DEBUG > 1 kdDebug(6041) << "directions: dir=" << (int)dir << " current=" << (int)dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << (int)context->dir << " level =" << (int)context->level << endl; @@ -1620,7 +1620,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi // remove leading spaces. Any inline flows we encounter will be empty and should also // be skipped. while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() && -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES ( (start.current().unicode() == (ushort)0x0020) || // ASCII space (start.current().unicode() == (ushort)0x0009) || // ASCII tab (start.current().unicode() == (ushort)0x000A) || // ASCII line feed diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 9c1ab2aaf..0391345f3 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -225,7 +225,7 @@ void TDEHTMLPartBrowserExtension::copy() TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQString htmltext; /* * When selectionModeEnabled, that means the user has just selected @@ -334,7 +334,7 @@ void TDEHTMLPartBrowserExtension::updateEditActions() } // ### duplicated from KonqMainWindow::slotClipboardDataChanged -#ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded +#ifndef TQT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded TQMimeSource *data = TQApplication::clipboard()->data(); enableAction( "paste", data->provides( "text/plain" ) ); #else @@ -604,12 +604,12 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri actionCollection(), "sendimage" ); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ), actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull()); #endif - if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef QT_NO_MIMECLIPBOARD + if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef TQT_NO_MIMECLIPBOARD new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ), actionCollection(), "copyimagelocation" ); } @@ -711,7 +711,7 @@ void TDEHTMLPopupGUIClient::slotCopyLinkLocation() { KURL safeURL(d->m_url); safeURL.setPass(TQString::null); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD // Set it in both the mouse selection and in the clipboard KURL::List lst; lst.append( safeURL ); @@ -729,7 +729,7 @@ void TDEHTMLPopupGUIClient::slotStopAnimations() void TDEHTMLPopupGUIClient::slotCopyImage() { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD KURL safeURL(d->m_imageURL); safeURL.setPass(TQString::null); @@ -752,7 +752,7 @@ void TDEHTMLPopupGUIClient::slotCopyImageLocation() { KURL safeURL(d->m_imageURL); safeURL.setPass(TQString::null); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD // Set it in both the mouse selection and in the clipboard KURL::List lst; lst.append( safeURL ); diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 9c3613372..6f32a839e 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -93,7 +93,7 @@ using namespace DOM; #include <kurldrag.h> #include <tdeapplication.h> #include <tdeparts/browserinterface.h> -#if !defined(QT_NO_DRAGANDDROP) +#if !defined(TQT_NO_DRAGANDDROP) #include <tdemultipledrag.h> #endif #include "../tdeutils/kfinddialog.h" @@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear() d->m_selectionEnd = DOM::Node(); d->m_startOffset = 0; d->m_endOffset = 0; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); #endif @@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText() } // The lineedit of the dialog would make tdehtml lose its selection, otherwise -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); #endif @@ -3039,7 +3039,7 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent, if ( !d->m_doc ) return; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); #endif @@ -6392,7 +6392,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) DOM::DOMString target = event->target(); DOM::Node innerNode = event->innerNode(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if( d->m_bDnd && d->m_bMousePressed && ( (!d->m_strSelectedURL.isEmpty() && !isEditable()) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) { @@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) tmp_iface->callMethod( "goHistory(int)", -1 ); } } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) { kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen=" << d->m_bOpenMiddleClick << endl; @@ -6613,7 +6613,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset()); #endif // get selected text and paste to the clipboard -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD TQString text = selectedText(); text.replace(TQChar(0xa0), ' '); disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 901c02321..b3679c6cc 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -112,7 +112,7 @@ using namespace tdehtml; class TDEHTMLToolTip; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP class TDEHTMLToolTip : public TQToolTip { @@ -412,7 +412,7 @@ public: #endif }; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP /** calculates the client-side image map rectangle for the given image element * @param img image element @@ -507,7 +507,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) KImageIO::registerFormats(); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP d->tooltip = new TDEHTMLToolTip( this, d ); #endif @@ -2866,7 +2866,7 @@ void TDEHTMLView::print(bool quick) bool scalePage = false; double scale = 0.0; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if(root->docWidth() > metrics.width()) { scalePage = true; scale = ((double) metrics.width())/((double) root->docWidth()); @@ -2921,7 +2921,7 @@ void TDEHTMLView::print(bool quick) } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if (scalePage) p->scale(scale, scale); #endif @@ -2993,7 +2993,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) p->translate(rc.left(), rc.top()); double scale = ((double) rc.width()/(double) root->docWidth()); int height = (int) ((double) rc.height() / scale); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS p->scale(scale, scale); #endif root->setPageTop(yOff); @@ -3267,7 +3267,7 @@ void TDEHTMLView::setIgnoreWheelEvents( bool e ) d->ignoreWheelEvents = e; } -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e) { diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h index f67f712f0..797db99fa 100644 --- a/tdehtml/tdehtmlview.h +++ b/tdehtml/tdehtmlview.h @@ -203,7 +203,7 @@ protected: virtual void viewportMouseMoveEvent(TQMouseEvent *); virtual void viewportMouseReleaseEvent(TQMouseEvent *); virtual void viewportResizeEvent(TQResizeEvent*); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void viewportWheelEvent(TQWheelEvent*); #endif virtual void dragEnterEvent( TQDragEnterEvent* ); @@ -220,7 +220,7 @@ protected: #ifndef NO_SMOOTH_SCROLL_HACK void startScrolling(); void stopScrolling(); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void scrollViewWheelEvent( TQWheelEvent* e ); #endif #endif diff --git a/tdehtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp index d09a3dbd1..0faf49fcc 100644 --- a/tdehtml/test_regression_fontoverload.cpp +++ b/tdehtml/test_regression_fontoverload.cpp @@ -21,8 +21,8 @@ */ #include "ecma/kjs_proxy.h" -#define QT_NO_XRANDR 1 -#define QT_NO_XFTFREETYPE 1 +#define TQT_NO_XRANDR 1 +#define TQT_NO_XFTFREETYPE 1 #include <private/qfontengine_p.h> #include <tqfontdatabase.h> #include <tqfont.h> |