diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/ntqdockarea.h | 2 | ||||
-rw-r--r-- | src/widgets/ntqmainwindow.h | 2 | ||||
-rw-r--r-- | src/widgets/ntqmultilineedit.h | 2 | ||||
-rw-r--r-- | src/widgets/qcheckbox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qiconview.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qlineedit.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qradiobutton.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qsyntaxhighlighter.cpp | 2 | ||||
-rw-r--r-- | src/widgets/qt_widgets.pri | 12 | ||||
-rw-r--r-- | src/widgets/tqtextbrowser.cpp (renamed from src/widgets/qtextbrowser.cpp) | 8 | ||||
-rw-r--r-- | src/widgets/tqtextbrowser.h (renamed from src/widgets/ntqtextbrowser.h) | 2 | ||||
-rw-r--r-- | src/widgets/tqtextedit.cpp (renamed from src/widgets/qtextedit.cpp) | 14 | ||||
-rw-r--r-- | src/widgets/tqtextedit.h (renamed from src/widgets/ntqtextedit.h) | 0 | ||||
-rw-r--r-- | src/widgets/tqtextview.cpp (renamed from src/widgets/qtextview.cpp) | 2 | ||||
-rw-r--r-- | src/widgets/tqtextview.h (renamed from src/widgets/ntqtextview.h) | 2 |
15 files changed, 28 insertions, 28 deletions
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h index 441f4b828..f70f61fe5 100644 --- a/src/widgets/ntqdockarea.h +++ b/src/widgets/ntqdockarea.h @@ -48,7 +48,7 @@ #include "ntqlayout.h" #include "tqvaluelist.h" #include "ntqguardedptr.h" -#include "ntqtextstream.h" +#include "tqtextstream.h" #endif // QT_H #ifndef TQT_NO_MAINWINDOW diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h index 73265436a..548bbae88 100644 --- a/src/widgets/ntqmainwindow.h +++ b/src/widgets/ntqmainwindow.h @@ -45,7 +45,7 @@ #include "tqwidget.h" #include "ntqtoolbar.h" #include "tqptrlist.h" -#include "ntqtextstream.h" +#include "tqtextstream.h" #endif // QT_H #ifndef TQT_NO_MAINWINDOW diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h index bbf22d8bd..1f53dc38f 100644 --- a/src/widgets/ntqmultilineedit.h +++ b/src/widgets/ntqmultilineedit.h @@ -42,7 +42,7 @@ #define TQMULTILINEEDIT_H #ifndef QT_H -#include "ntqtextedit.h" +#include "tqtextedit.h" #endif // QT_H #ifndef TQT_NO_MULTILINEEDIT diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp index 970ed5785..0ef6529b0 100644 --- a/src/widgets/qcheckbox.cpp +++ b/src/widgets/qcheckbox.cpp @@ -45,7 +45,7 @@ #include "ntqpixmap.h" #include "ntqpixmapcache.h" #include "ntqbitmap.h" -#include "ntqtextstream.h" +#include "tqtextstream.h" #include "ntqapplication.h" #include "ntqstyle.h" diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index 36e1529c3..71baf927d 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -59,7 +59,7 @@ #include "ntqtimer.h" #include "ntqcursor.h" #include "ntqapplication.h" -#include "ntqtextedit.h" +#include "tqtextedit.h" #include "ntqmemarray.h" #include "tqptrlist.h" #include "ntqvbox.h" diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 6ed133729..3894e35e6 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -61,7 +61,7 @@ #include "ntqstyle.h" #include "ntqwhatsthis.h" #include "../kernel/qinternal_p.h" -#include "private/qtextlayout_p.h" +#include "private/tqtextlayout_p.h" #include "tqvaluevector.h" #if defined(Q_OS_LINUX) #include <sys/mman.h> diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp index f6e48df6e..b5de6b8d9 100644 --- a/src/widgets/qradiobutton.cpp +++ b/src/widgets/qradiobutton.cpp @@ -46,7 +46,7 @@ #include "ntqpixmap.h" #include "ntqpixmapcache.h" #include "ntqbitmap.h" -#include "ntqtextstream.h" +#include "tqtextstream.h" #include "ntqapplication.h" #include "ntqstyle.h" diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp index 814cc5a96..8cd8ba2a8 100644 --- a/src/widgets/qsyntaxhighlighter.cpp +++ b/src/widgets/qsyntaxhighlighter.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_SYNTAXHIGHLIGHTER #include "../kernel/qrichtext_p.h" -#include "ntqtextedit.h" +#include "tqtextedit.h" #include "ntqtimer.h" /*! diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri index 8be28d1cf..263c0e473 100644 --- a/src/widgets/qt_widgets.pri +++ b/src/widgets/qt_widgets.pri @@ -59,9 +59,9 @@ widgets { $$WIDGETS_H/tqwidgetstack.h \ $$WIDGETS_H/ntqaction.h \ $$WIDGETS_H/ntqdatetimeedit.h \ - $$WIDGETS_H/ntqtextview.h \ - $$WIDGETS_H/ntqtextbrowser.h \ - $$WIDGETS_H/ntqtextedit.h \ + $$WIDGETS_H/tqtextview.h \ + $$WIDGETS_H/tqtextbrowser.h \ + $$WIDGETS_H/tqtextedit.h \ $$WIDGETS_P/tqwidgetinterface_p.h \ $$WIDGETS_H/tqwidgetplugin.h @@ -122,9 +122,9 @@ widgets { $$WIDGETS_CPP/qaction.cpp \ $$WIDGETS_CPP/qdatetimeedit.cpp \ $$WIDGETS_CPP/qeffects.cpp \ - $$WIDGETS_CPP/qtextview.cpp \ - $$WIDGETS_CPP/qtextbrowser.cpp \ - $$WIDGETS_CPP/qtextedit.cpp \ + $$WIDGETS_CPP/tqtextview.cpp \ + $$WIDGETS_CPP/tqtextbrowser.cpp \ + $$WIDGETS_CPP/tqtextedit.cpp \ $$WIDGETS_CPP/tqwidgetplugin.cpp !embedded:mac:SOURCES += $$WIDGETS_CPP/qmenubar_mac.cpp } diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp index 23b2452f6..dfafb32c8 100644 --- a/src/widgets/qtextbrowser.cpp +++ b/src/widgets/tqtextbrowser.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "ntqtextbrowser.h" +#include "tqtextbrowser.h" #ifndef TQT_NO_TEXTBROWSER #include "../kernel/qrichtext_p.h" @@ -49,7 +49,7 @@ #include "tqvaluestack.h" #include "stdio.h" #include "ntqfile.h" -#include "ntqtextstream.h" +#include "tqtextstream.h" #include "ntqlayout.h" #include "ntqbitmap.h" #include "ntqtimer.h" @@ -60,7 +60,7 @@ #include "ntqcursor.h" /*! - \class TQTextBrowser ntqtextbrowser.h + \class TQTextBrowser tqtextbrowser.h \brief The TQTextBrowser class provides a rich text browser with hypertext navigation. \ingroup advanced @@ -110,7 +110,7 @@ editing. If you just need to display a small piece of rich text use TQSimpleRichText or TQLabel. - <img src=qtextbrowser-m.png> <img src=qtextbrowser-w.png> + <img src=tqtextbrowser-m.png> <img src=tqtextbrowser-w.png> */ class TQTextBrowserData diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/tqtextbrowser.h index c9ac4ae9e..c68031ff1 100644 --- a/src/widgets/ntqtextbrowser.h +++ b/src/widgets/tqtextbrowser.h @@ -45,7 +45,7 @@ #include "tqptrlist.h" #include "ntqpixmap.h" #include "ntqcolor.h" -#include "ntqtextedit.h" +#include "tqtextedit.h" #endif // QT_H #ifndef TQT_NO_TEXTBROWSER diff --git a/src/widgets/qtextedit.cpp b/src/widgets/tqtextedit.cpp index 0fb328bf9..a4cc6cf11 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/tqtextedit.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "ntqtextedit.h" +#include "tqtextedit.h" #ifndef TQT_NO_TEXTEDIT @@ -73,7 +73,7 @@ #include "ntqpopupmenu.h" #include "tqptrstack.h" #include "ntqmetaobject.h" -#include "ntqtextbrowser.h" +#include "tqtextbrowser.h" #include <private/qucom_p.h> #include "private/qsyntaxhighlighter_p.h" #include <ntqguardedptr.h> @@ -213,7 +213,7 @@ const char* TQRichTextDrag::format( int i ) const static bool block_set_alignment = FALSE; /*! - \class TQTextEdit ntqtextedit.h + \class TQTextEdit tqtextedit.h \brief The TQTextEdit widget provides a powerful single-page rich text editor. \ingroup basic @@ -1698,7 +1698,7 @@ void TQTextEdit::imEndEvent( TQIMEvent *e ) } -static bool qtextedit_ignore_readonly = FALSE; +static bool tqtextedit_ignore_readonly = FALSE; /*! Executes keyboard action \a action. This is normally called by a @@ -1707,7 +1707,7 @@ static bool qtextedit_ignore_readonly = FALSE; void TQTextEdit::doKeyboardAction( KeyboardAction action ) { - if ( isReadOnly() && !qtextedit_ignore_readonly ) + if ( isReadOnly() && !tqtextedit_ignore_readonly ) return; if ( cursor->nestedDepth() != 0 ) // #### for 3.0, disable editing of tables as this is not advanced enough @@ -3213,14 +3213,14 @@ void TQTextEdit::insertParagraph( const TQString &text, int para ) cursor->setParagraph( p ); cursor->setIndex( 0 ); clearUndoRedo(); - qtextedit_ignore_readonly = TRUE; + tqtextedit_ignore_readonly = TRUE; if ( append && cursor->paragraph()->length() > 1 ) { cursor->setIndex( cursor->paragraph()->length() - 1 ); doKeyboardAction( ActionReturn ); } insert( text, FALSE, TRUE, TRUE ); doKeyboardAction( ActionReturn ); - qtextedit_ignore_readonly = FALSE; + tqtextedit_ignore_readonly = FALSE; drawCursor( FALSE ); *cursor = old; diff --git a/src/widgets/ntqtextedit.h b/src/widgets/tqtextedit.h index 40906dbfc..40906dbfc 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/tqtextedit.h diff --git a/src/widgets/qtextview.cpp b/src/widgets/tqtextview.cpp index b672bee3d..a475d7b4a 100644 --- a/src/widgets/qtextview.cpp +++ b/src/widgets/tqtextview.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "ntqtextview.h" +#include "tqtextview.h" #ifndef TQT_NO_TEXTVIEW diff --git a/src/widgets/ntqtextview.h b/src/widgets/tqtextview.h index 2d0d73cfe..8970d10c8 100644 --- a/src/widgets/ntqtextview.h +++ b/src/widgets/tqtextview.h @@ -42,7 +42,7 @@ #define TQTEXTVIEW_H #ifndef QT_H -#include "ntqtextedit.h" +#include "tqtextedit.h" #endif // QT_H #ifndef TQT_NO_TEXTVIEW |