diff options
Diffstat (limited to 'src')
153 files changed, 212 insertions, 214 deletions
diff --git a/src/3rdparty/sqlite/config.h b/src/3rdparty/sqlite/config.h index 0a06d8eb6..d1ed89897 100644 --- a/src/3rdparty/sqlite/config.h +++ b/src/3rdparty/sqlite/config.h @@ -1,5 +1,5 @@ #include <tqglobal.h> -#include <ntqconfig.h> +#include <tqconfig.h> #ifndef TQT_POINTER_SIZE # ifdef Q_OS_WIN32 diff --git a/src/3rdparty/sqlite/trolltech.patch b/src/3rdparty/sqlite/trolltech.patch index 715155b46..6c9ca90bd 100644 --- a/src/3rdparty/sqlite/trolltech.patch +++ b/src/3rdparty/sqlite/trolltech.patch @@ -4,7 +4,7 @@ diff -du ./config.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h @@ -1 +1,23 @@ -#define SQLITE_PTR_SZ 4 +#include <tqglobal.h> -+#include <ntqconfig.h> ++#include <tqconfig.h> + +#ifndef TQT_POINTER_SIZE +# ifdef Q_OS_WIN32 diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp index d784553e4..7b32564ed 100644 --- a/src/canvas/tqcanvas.cpp +++ b/src/canvas/tqcanvas.cpp @@ -40,7 +40,7 @@ #include "tqcanvas.h" #ifndef TQT_NO_CANVAS -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitmap.h" #include "tqimage.h" #include "tqptrdict.h" diff --git a/src/codecs/tqtextcodecfactory.cpp b/src/codecs/tqtextcodecfactory.cpp index 36782644f..b3895360c 100644 --- a/src/codecs/tqtextcodecfactory.cpp +++ b/src/codecs/tqtextcodecfactory.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_TEXTCODEC #ifndef TQT_NO_COMPONENT -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqcleanuphandler.h" #include <private/tqpluginmanager_p.h> #include "tqtextcodecinterface_p.h" diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp index feaefb010..43e77866f 100644 --- a/src/dialogs/tqcolordialog.cpp +++ b/src/dialogs/tqcolordialog.cpp @@ -53,7 +53,7 @@ #include "tqvalidator.h" #include "tqdragobject.h" #include "tqgridview.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqsettings.h" #include "tqpopupmenu.h" diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp index 919a1ed38..277a1b4ca 100644 --- a/src/dialogs/tqdialog.cpp +++ b/src/dialogs/tqdialog.cpp @@ -44,7 +44,7 @@ #include "tqpushbutton.h" #include "tqfocusdata.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqobjectlist.h" #include "tqwidgetlist.h" #include "tqlayout.h" @@ -675,7 +675,7 @@ bool TQDialog::event( TQEvent *e ) extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } #include <private/tqt_x11_p.h> #undef FocusIn -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern Atom qt_net_wm_full_placement; extern bool qt_net_supports(Atom atom); #endif // TQ_WS_X11 diff --git a/src/dialogs/tqerrormessage.cpp b/src/dialogs/tqerrormessage.cpp index f99db2c7a..12013b0f6 100644 --- a/src/dialogs/tqerrormessage.cpp +++ b/src/dialogs/tqerrormessage.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_ERRORMESSAGE -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqcheckbox.h" #include "tqdict.h" #include "tqlabel.h" diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp index 23a6d7f12..de4754ec4 100644 --- a/src/dialogs/tqfiledialog.cpp +++ b/src/dialogs/tqfiledialog.cpp @@ -54,8 +54,8 @@ #ifndef TQT_NO_FILEDIALOG -#include "private/qapplication_p.h" -#include "ntqapplication.h" +#include "private/tqapplication_p.h" +#include "tqapplication.h" #include "tqbitmap.h" #include "tqbuttongroup.h" #include "tqcheckbox.h" @@ -3405,7 +3405,7 @@ void TQFileDialog::rereadDir() \sa selectedFilter() */ -extern bool tqt_resolve_symlinks; // defined in qapplication.cpp +extern bool tqt_resolve_symlinks; // defined in tqapplication.cpp bool TQ_EXPORT tqt_use_native_dialogs = TRUE; /*! diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp index 0fb122cee..40c9f3de5 100644 --- a/src/dialogs/tqfontdialog.cpp +++ b/src/dialogs/tqfontdialog.cpp @@ -53,7 +53,7 @@ #include "tqvgroupbox.h" #include "tqhgroupbox.h" #include "tqlabel.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqfontdatabase.h" #include "tqstyle.h" #include <private/tqfontdata_p.h> diff --git a/src/dialogs/tqinputdialog.cpp b/src/dialogs/tqinputdialog.cpp index b23bbaeaf..a58d9a2dc 100644 --- a/src/dialogs/tqinputdialog.cpp +++ b/src/dialogs/tqinputdialog.cpp @@ -50,7 +50,7 @@ #include "tqcombobox.h" #include "tqwidgetstack.h" #include "tqvalidator.h" -#include "ntqapplication.h" +#include "tqapplication.h" class TQInputDialogPrivate { diff --git a/src/dialogs/tqmessagebox.cpp b/src/dialogs/tqmessagebox.cpp index 2a7178260..b90840cf7 100644 --- a/src/dialogs/tqmessagebox.cpp +++ b/src/dialogs/tqmessagebox.cpp @@ -46,7 +46,7 @@ #include "tqlabel.h" #include "tqpushbutton.h" #include "tqimage.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqobjectlist.h" #if defined(QT_ACCESSIBILITY_SUPPORT) diff --git a/src/dialogs/tqmessagebox.h b/src/dialogs/tqmessagebox.h index a8b563830..cb0933f81 100644 --- a/src/dialogs/tqmessagebox.h +++ b/src/dialogs/tqmessagebox.h @@ -200,7 +200,7 @@ private: // Disabled copy constructor and operator= /* * Macro to be used at the beginning of main(), e.g. * -* #include <ntqapplication.h> +* #include <tqapplication.h> * #include <tqmessagebox.h> * int main( int argc, char**argv ) * { diff --git a/src/dialogs/tqprintdialog.cpp b/src/dialogs/tqprintdialog.cpp index a82ae4ee4..8430f2cbc 100644 --- a/src/dialogs/tqprintdialog.cpp +++ b/src/dialogs/tqprintdialog.cpp @@ -56,7 +56,7 @@ #include "tqbuttongroup.h" #include "tqradiobutton.h" #include "tqspinbox.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqheader.h" #include "tqstyle.h" #include "tqstring.h" @@ -724,11 +724,11 @@ static void parseSpoolInterface( TQListView * printers ) // Every unix must have its own. It's a standard. Here is AIX. static void parseQconfig( TQListView * printers ) { - TQFile qconfig( TQString::fromLatin1("/etc/qconfig") ); - if ( !qconfig.open( IO_ReadOnly ) ) + TQFile tqconfig( TQString::fromLatin1("/etc/tqconfig") ); + if ( !tqconfig.open( IO_ReadOnly ) ) return; - TQTextStream ts( &qconfig ); + TQTextStream ts( &tqconfig ); TQString line; TQString stanzaName; // either a queue or a device name diff --git a/src/dialogs/tqprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp index 27d2f78bf..262dbd85b 100644 --- a/src/dialogs/tqprogressdialog.cpp +++ b/src/dialogs/tqprogressdialog.cpp @@ -46,7 +46,7 @@ #include "tqpainter.h" #include "tqdrawutil.h" #include "tqdatetime.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqpushbutton.h" #include "tqcursor.h" diff --git a/src/dialogs/tqtabdialog.cpp b/src/dialogs/tqtabdialog.cpp index f3ae9a744..b312ccc64 100644 --- a/src/dialogs/tqtabdialog.cpp +++ b/src/dialogs/tqtabdialog.cpp @@ -48,7 +48,7 @@ #include "tqpushbutton.h" #include "tqpainter.h" #include "tqpixmap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqtabwidget.h" #include "tqwidgetstack.h" #include "tqlayout.h" diff --git a/src/dialogs/tqwizard.cpp b/src/dialogs/tqwizard.cpp index 233857250..78b7431b2 100644 --- a/src/dialogs/tqwizard.cpp +++ b/src/dialogs/tqwizard.cpp @@ -47,7 +47,7 @@ #include "tqcursor.h" #include "tqlabel.h" #include "tqwidgetstack.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqptrlist.h" #include "tqpainter.h" #include "tqaccel.h" diff --git a/src/inputmethod/tqinputcontextfactory.cpp b/src/inputmethod/tqinputcontextfactory.cpp index e6f1fb3af..6ed340c60 100644 --- a/src/inputmethod/tqinputcontextfactory.cpp +++ b/src/inputmethod/tqinputcontextfactory.cpp @@ -41,7 +41,7 @@ #ifndef TQT_NO_IM -#include "ntqapplication.h" +#include "tqapplication.h" #ifdef TQT_THREAD_SUPPORT #include <private/tqmutexpool_p.h> diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index 571045f48..57bdcffd4 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -40,7 +40,7 @@ #include "qplatformdefs.h" -#include "ntqapplication.h" +#include "tqapplication.h" #ifndef TQT_NO_DRAGANDDROP diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index 84a383a5d..05d5c8cd7 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -5,8 +5,8 @@ kernel { HEADERS += \ $$KERNEL_H/tqaccel.h \ $$KERNEL_P/tqucomextra_p.h \ - $$KERNEL_H/ntqapplication.h \ - $$KERNEL_P/qapplication_p.h \ + $$KERNEL_H/tqapplication.h \ + $$KERNEL_P/tqapplication_p.h \ $$KERNEL_H/tqasyncimageio.h \ $$KERNEL_H/tqasyncio.h \ $$KERNEL_H/tqbitmap.h \ @@ -110,7 +110,7 @@ kernel { HEADERS+=$$KERNEL_P/tqeventloop_glib_p.h } - win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \ + win32:SOURCES += $$KERNEL_CPP/tqapplication_win.cpp \ $$KERNEL_CPP/tqclipboard_win.cpp \ $$KERNEL_CPP/tqcolor_win.cpp \ $$KERNEL_CPP/tqcursor_win.cpp \ @@ -133,7 +133,7 @@ kernel { $$KERNEL_CPP/tqfontengine_win.cpp unix:x11 { - SOURCES += $$KERNEL_CPP/qapplication_x11.cpp \ + SOURCES += $$KERNEL_CPP/tqapplication_x11.cpp \ $$KERNEL_CPP/tqclipboard_x11.cpp \ $$KERNEL_CPP/tqcolor_x11.cpp \ $$KERNEL_CPP/tqcursor_x11.cpp \ @@ -163,7 +163,7 @@ kernel { exists(tqsound_mac.cpp):SOURCES += $$KERNEL_CPP/tqsound_mac.cpp } !embedded:!x11:mac { - SOURCES += $$KERNEL_CPP/qapplication_mac.cpp \ + SOURCES += $$KERNEL_CPP/tqapplication_mac.cpp \ $$KERNEL_CPP/tqclipboard_mac.cpp \ $$KERNEL_CPP/tqcolor_mac.cpp \ $$KERNEL_CPP/tqcursor_mac.cpp \ @@ -196,7 +196,7 @@ kernel { SOURCES += $$KERNEL_CPP/tqabstractlayout.cpp \ $$KERNEL_CPP/tqucomextra.cpp \ $$KERNEL_CPP/tqaccel.cpp \ - $$KERNEL_CPP/qapplication.cpp \ + $$KERNEL_CPP/tqapplication.cpp \ $$KERNEL_CPP/tqasyncimageio.cpp \ $$KERNEL_CPP/tqasyncio.cpp \ $$KERNEL_CPP/tqbitmap.cpp \ diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h index 1420944ef..073f01b50 100644 --- a/src/kernel/qt_pch.h +++ b/src/kernel/qt_pch.h @@ -23,7 +23,7 @@ # endif #include <tqmap.h> // I must be first! #include <private/tqucomextra_p.h> // All moc genereated code has this include -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqbitmap.h> #include <tqcursor.h> #include <tqdatetime.h> diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp index 089466ec7..c1d83e805 100644 --- a/src/kernel/qtaddons_x11.cpp +++ b/src/kernel/qtaddons_x11.cpp @@ -32,7 +32,7 @@ #include <string.h> #include <stdlib.h> -extern bool tqt_use_xrender; // defined in qapplication_x11.cpp +extern bool tqt_use_xrender; // defined in tqapplication_x11.cpp extern "C" { diff --git a/src/kernel/tqabstractlayout.cpp b/src/kernel/tqabstractlayout.cpp index 3f881ddbb..cbace549d 100644 --- a/src/kernel/tqabstractlayout.cpp +++ b/src/kernel/tqabstractlayout.cpp @@ -41,7 +41,7 @@ #include "tqlayout.h" #ifndef TQT_NO_LAYOUT -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqlayoutengine_p.h" #include "tqmenubar.h" #include "tqtoolbar.h" diff --git a/src/kernel/tqaccel.cpp b/src/kernel/tqaccel.cpp index ef6b665e6..6569aa8dc 100644 --- a/src/kernel/tqaccel.cpp +++ b/src/kernel/tqaccel.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_ACCEL #include "tqsignal.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwidget.h" #include "tqptrlist.h" #include "tqwhatsthis.h" diff --git a/src/kernel/tqaccessible.cpp b/src/kernel/tqaccessible.cpp index 5a43e402b..174e16633 100644 --- a/src/kernel/tqaccessible.cpp +++ b/src/kernel/tqaccessible.cpp @@ -43,7 +43,7 @@ #include "tqptrdict.h" #include "tqmetaobject.h" #include <private/tqpluginmanager_p.h> -#include "ntqapplication.h" +#include "tqapplication.h" #include <stdlib.h> /*! diff --git a/src/kernel/qapplication.cpp b/src/kernel/tqapplication.cpp index db0fa0278..1cc5bf140 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/tqapplication.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "tqobjectlist.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqeventloop.h" #include "tqeventloop_p.h" #include "tqwidget.h" @@ -78,7 +78,7 @@ #endif /*! - \class TQApplication ntqapplication.h + \class TQApplication tqapplication.h \brief The TQApplication class manages the GUI application's control flow and main settings. @@ -312,7 +312,7 @@ /* The tqt_init() and tqt_cleanup() functions are implemented in the - qapplication_xyz.cpp file. + tqapplication_xyz.cpp file. */ void tqt_init( int *, char **, TQApplication::Type ); @@ -1365,7 +1365,7 @@ TQApplication::~TQApplication() \code // showargs.cpp - displays program arguments in a list box - #include <ntqapplication.h> + #include <tqapplication.h> #include <tqlistbox.h> int main( int argc, char **argv ) @@ -3155,7 +3155,7 @@ bool TQApplication::hasPendingEvents() #if !defined(TQ_WS_X11) -// The doc and X implementation of these functions is in qapplication_x11.cpp +// The doc and X implementation of these functions is in tqapplication_x11.cpp void TQApplication::flushX() {} // do nothing @@ -4045,13 +4045,13 @@ TQ_EXPORT void tqt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) { #ifdef TQ_WS_MACX -extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //qapplication_mac.cpp +extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //tqapplication_mac.cpp #endif /*!\internal - Called from qapplication_<platform>.cpp, returns TRUE + Called from tqapplication_<platform>.cpp, returns TRUE if the widget should accept the event. */ TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { diff --git a/src/kernel/ntqapplication.h b/src/kernel/tqapplication.h index 0e884583e..0e884583e 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/tqapplication.h diff --git a/src/kernel/qapplication_p.h b/src/kernel/tqapplication_p.h index 08911eae7..742870dc3 100644 --- a/src/kernel/qapplication_p.h +++ b/src/kernel/tqapplication_p.h @@ -47,7 +47,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qapplication_*.cpp, tqwidget*.cpp, tqcolor_x11.cpp, tqfiledialog.cpp +// of tqapplication_*.cpp, tqwidget*.cpp, tqcolor_x11.cpp, tqfiledialog.cpp // and many other. This header file may change from version to version // without notice, or even be removed. // diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/tqapplication_x11.cpp index ec94e78b5..6744532f4 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/tqapplication_x11.cpp @@ -42,7 +42,7 @@ // been in use (e.g. in the KDE wm ) before the introduction of a version // map. One might want to turn some of them into propert public API and // provide a proper alternative for others. See also the exports in -// qapplication_win.cpp which suggest a unification. +// tqapplication_win.cpp which suggest a unification. #include "qplatformdefs.h" @@ -61,8 +61,8 @@ # undef truncate #endif -#include "ntqapplication.h" -#include "qapplication_p.h" +#include "tqapplication.h" +#include "tqapplication_p.h" #include "tqcolor_p.h" #include "tqcursor.h" #include "tqwidget.h" @@ -487,14 +487,14 @@ extern Atom qt_xdnd_finished; extern Atom qt_xdnd_selection; extern bool qt_xdnd_dragging; -// gui or non-gui from qapplication.cpp +// gui or non-gui from tqapplication.cpp extern bool tqt_is_gui_used; extern bool tqt_app_has_font; static bool qt_x11_cmdline_font = false; -extern bool tqt_resolve_symlinks; // from qapplication.cpp +extern bool tqt_resolve_symlinks; // from tqapplication.cpp // Paint event clipping magic extern void qt_set_paintevent_clipping( TQPaintDevice* dev, const TQRegion& region); @@ -1025,7 +1025,7 @@ bool TQApplication::x11_apply_settings() } // read new TQStyle - extern bool tqt_explicit_app_style; // defined in qapplication.cpp + extern bool tqt_explicit_app_style; // defined in tqapplication.cpp TQString stylename = settings.readEntry( "/qt/style" ); if ( !stylename.isEmpty() && !tqt_explicit_app_style ) { TQApplication::setStyle( stylename ); @@ -6528,7 +6528,7 @@ void TQSmSocketReceiver::socketActivated(int) #undef Bool -#include "qapplication_x11.moc" +#include "tqapplication_x11.moc" TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString& key ) : TQObject( app, "session manager" ) diff --git a/src/kernel/tqclipboard.cpp b/src/kernel/tqclipboard.cpp index f7c2836f5..ee476a1a5 100644 --- a/src/kernel/tqclipboard.cpp +++ b/src/kernel/tqclipboard.cpp @@ -42,8 +42,8 @@ #ifndef TQT_NO_CLIPBOARD -#include "ntqapplication.h" -#include "qapplication_p.h" +#include "tqapplication.h" +#include "tqapplication_p.h" #include "tqdragobject.h" #include "tqpixmap.h" diff --git a/src/kernel/tqclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp index 16af49f8e..16772b491 100644 --- a/src/kernel/tqclipboard_x11.cpp +++ b/src/kernel/tqclipboard_x11.cpp @@ -64,7 +64,7 @@ #ifndef TQT_NO_CLIPBOARD -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqeventloop.h" #include "tqbitmap.h" #include "tqdatetime.h" @@ -74,7 +74,7 @@ #include "tqvaluelist.h" #include "tqmap.h" #include "tqt_x11_p.h" -#include "qapplication_p.h" +#include "tqapplication_p.h" // REVISED: arnt @@ -83,12 +83,12 @@ Internal TQClipboard functions for X11. *****************************************************************************/ -// from qapplication_x11.cpp +// from tqapplication_x11.cpp typedef int (*QX11EventFilter) (XEvent*); extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter filter); -extern Time tqt_x_time; // def. in qapplication_x11.cpp -extern Time qt_x_incr; // def. in qapplication_x11.cpp +extern Time tqt_x_time; // def. in tqapplication_x11.cpp +extern Time qt_x_incr; // def. in tqapplication_x11.cpp extern Atom qt_xa_clipboard; extern Atom qt_selection_property; extern Atom tqt_clipboard_sentinel; @@ -1575,7 +1575,7 @@ void TQClipboard::setData( TQMimeSource* src, Mode mode ) /* - Called by the main event loop in qapplication_x11.cpp when the + Called by the main event loop in tqapplication_x11.cpp when the _QT_SELECTION_SENTINEL property has been changed (i.e. when some TQt process has performed TQClipboard::setData(). If it returns TRUE, the TQClipBoard dataChanged() signal should be emitted. diff --git a/src/kernel/tqcolor_x11.cpp b/src/kernel/tqcolor_x11.cpp index fe5f6685c..77f48037a 100644 --- a/src/kernel/tqcolor_x11.cpp +++ b/src/kernel/tqcolor_x11.cpp @@ -42,8 +42,8 @@ #include "tqcolor_p.h" #include "string.h" #include "tqpaintdevice.h" -#include "ntqapplication.h" -#include "qapplication_p.h" +#include "tqapplication.h" +#include "tqapplication_p.h" #include "tqt_x11_p.h" // NOT REVISED diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp index 3724706c2..6a66e3cda 100644 --- a/src/kernel/tqcursor_x11.cpp +++ b/src/kernel/tqcursor_x11.cpp @@ -41,7 +41,7 @@ #include "tqcursor.h" #include "tqbitmap.h" #include "tqimage.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqdatastream.h" #include "tqnamespace.h" #include "tqt_x11_p.h" diff --git a/src/kernel/tqdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp index 2a9e5bd9e..35d021c51 100644 --- a/src/kernel/tqdesktopwidget_x11.cpp +++ b/src/kernel/tqdesktopwidget_x11.cpp @@ -37,7 +37,7 @@ **********************************************************************/ #include "tqdesktopwidget.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqobjectlist.h" #include "tqt_x11_p.h" #include <cstdlib> @@ -45,7 +45,7 @@ // defined in tqwidget_x11.cpp extern int qt_x11_create_desktop_on_screen; -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern Atom qt_net_workarea; extern bool qt_net_supports(Atom atom); diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp index b6fac2bd0..04b9f43a1 100644 --- a/src/kernel/tqdragobject.cpp +++ b/src/kernel/tqdragobject.cpp @@ -47,7 +47,7 @@ #include "tqdragobject.h" #include "tqtextcodec.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpoint.h" #include "tqwidget.h" #include "tqbuffer.h" diff --git a/src/kernel/tqdrawutil.cpp b/src/kernel/tqdrawutil.cpp index 0c3283ddc..79aa69378 100644 --- a/src/kernel/tqdrawutil.cpp +++ b/src/kernel/tqdrawutil.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_DRAWUTIL #include "tqbitmap.h" #include "tqpixmapcache.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" /*! diff --git a/src/kernel/tqevent.cpp b/src/kernel/tqevent.cpp index e8d042b06..fc59d9164 100644 --- a/src/kernel/tqevent.cpp +++ b/src/kernel/tqevent.cpp @@ -40,7 +40,7 @@ #include "tqevent.h" #include "tqcursor.h" -#include "ntqapplication.h" +#include "tqapplication.h" /*! diff --git a/src/kernel/tqeventloop.cpp b/src/kernel/tqeventloop.cpp index 3a7d72833..0cc3036d6 100644 --- a/src/kernel/tqeventloop.cpp +++ b/src/kernel/tqeventloop.cpp @@ -38,7 +38,7 @@ #include "tqeventloop_p.h" // includes qplatformdefs.h #include "tqeventloop.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqdatetime.h" #ifdef TQT_THREAD_SUPPORT diff --git a/src/kernel/tqeventloop_unix.cpp b/src/kernel/tqeventloop_unix.cpp index 8ab816426..fc0a0b48b 100644 --- a/src/kernel/tqeventloop_unix.cpp +++ b/src/kernel/tqeventloop_unix.cpp @@ -38,7 +38,7 @@ #include "tqeventloop_p.h" // includes qplatformdefs.h #include "tqeventloop.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitarray.h" #include "tqmutex.h" #include <stdlib.h> diff --git a/src/kernel/tqeventloop_unix_glib.cpp b/src/kernel/tqeventloop_unix_glib.cpp index 200c9245d..eec66d0af 100644 --- a/src/kernel/tqeventloop_unix_glib.cpp +++ b/src/kernel/tqeventloop_unix_glib.cpp @@ -38,7 +38,7 @@ #include "tqeventloop_glib_p.h" // includes qplatformdefs.h #include "tqeventloop.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitarray.h" #include "tqmutex.h" diff --git a/src/kernel/tqeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp index 743d48e70..13ba8c6af 100644 --- a/src/kernel/tqeventloop_x11.cpp +++ b/src/kernel/tqeventloop_x11.cpp @@ -38,7 +38,7 @@ #include "tqeventloop_p.h" // includes qplatformdefs.h #include "tqeventloop.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitarray.h" #include "tqcolor_p.h" #include "tqt_x11_p.h" @@ -59,7 +59,7 @@ static const int XKeyRelease = KeyRelease; #undef KeyPress #undef KeyRelease -// from qapplication.cpp +// from tqapplication.cpp extern bool tqt_is_gui_used; // from tqeventloop_unix.cpp @@ -170,7 +170,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) case ClientMessage: { - // from qapplication_x11.cpp + // from tqapplication_x11.cpp extern Atom tqt_wm_protocols; extern Atom tqt_wm_take_focus; extern Atom qt_qt_scrolldone; @@ -405,7 +405,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) bool TQEventLoop::hasPendingEvents() const { - extern uint qGlobalPostedEventsCount(); // from qapplication.cpp + extern uint qGlobalPostedEventsCount(); // from tqapplication.cpp return ( qGlobalPostedEventsCount() || XPending( TQPaintDevice::x11AppDisplay() ) ); } diff --git a/src/kernel/tqeventloop_x11_glib.cpp b/src/kernel/tqeventloop_x11_glib.cpp index 28069fe1b..cf2126591 100644 --- a/src/kernel/tqeventloop_x11_glib.cpp +++ b/src/kernel/tqeventloop_x11_glib.cpp @@ -41,7 +41,7 @@ #include "tqeventloop_glib_p.h" // includes qplatformdefs.h #include "tqeventloop.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitarray.h" #include "tqcolor_p.h" #include "tqt_x11_p.h" @@ -140,7 +140,7 @@ static const int XKeyRelease = KeyRelease; #undef KeyPress #undef KeyRelease -// from qapplication.cpp +// from tqapplication.cpp extern bool tqt_is_gui_used; // from tqeventloop_unix.cpp @@ -339,7 +339,7 @@ bool TQEventLoop::processX11Events() case ClientMessage: { - // from qapplication_x11.cpp + // from tqapplication_x11.cpp extern Atom tqt_wm_protocols; extern Atom tqt_wm_take_focus; extern Atom qt_qt_scrolldone; @@ -645,7 +645,7 @@ bool TQEventLoop::hasPendingEvents() const TQMutexLocker locker( TQApplication::tqt_mutex ); #endif // TQT_THREAD_SUPPORT - extern uint qGlobalPostedEventsCount(); // from qapplication.cpp + extern uint qGlobalPostedEventsCount(); // from tqapplication.cpp return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0)); } diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp index e058e49d4..c8395d342 100644 --- a/src/kernel/tqfont.cpp +++ b/src/kernel/tqfont.cpp @@ -48,7 +48,7 @@ #include "tqdict.h" #include "tqcache.h" #include "tqdatastream.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqcleanuphandler.h" #include "tqstringlist.h" #ifdef TQ_WS_MAC diff --git a/src/kernel/tqfont_x11.cpp b/src/kernel/tqfont_x11.cpp index 373a82a5f..77742a5f0 100644 --- a/src/kernel/tqfont_x11.cpp +++ b/src/kernel/tqfont_x11.cpp @@ -45,7 +45,7 @@ #include "qplatformdefs.h" #include "tqfont.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqcleanuphandler.h" #include "tqfontinfo.h" #include "tqfontdatabase.h" diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp index 0702bb67f..5413f2db4 100644 --- a/src/kernel/tqfontdatabase.cpp +++ b/src/kernel/tqfontdatabase.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_FONTDATABASE #include <tqtl.h> -#include <ntqapplication.h> +#include <tqapplication.h> #include <private/tqunicodetables_p.h> #include "tqfontengine_p.h" @@ -1330,7 +1330,7 @@ TQString TQFontDatabase::styleString( const TQFont &f ) Example: \code -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqfontdatabase.h> #include <else.h> diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp index 2a251c2ff..22e8a8f1d 100644 --- a/src/kernel/tqiconset.cpp +++ b/src/kernel/tqiconset.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_ICONSET -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitmap.h" #include "tqcleanuphandler.h" #include "tqimage.h" diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp index 50ed52222..177c0a6af 100644 --- a/src/kernel/tqimage.cpp +++ b/src/kernel/tqimage.cpp @@ -53,7 +53,7 @@ #include <private/tqpluginmanager_p.h> #include "tqimageformatinterface_p.h" #include "tqwmatrix.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqmime.h" #include "tqdragobject.h" #include <ctype.h> diff --git a/src/kernel/tqinputcontext.cpp b/src/kernel/tqinputcontext.cpp index 7d15aa0c7..7f0d5501d 100644 --- a/src/kernel/tqinputcontext.cpp +++ b/src/kernel/tqinputcontext.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwidget.h" #include "tqpopupmenu.h" diff --git a/src/kernel/tqinputcontext_x11.cpp b/src/kernel/tqinputcontext_x11.cpp index 7377b264c..70fa9f160 100644 --- a/src/kernel/tqinputcontext_x11.cpp +++ b/src/kernel/tqinputcontext_x11.cpp @@ -42,7 +42,7 @@ #include "qplatformdefs.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwidget.h" #include "tqt_x11_p.h" diff --git a/src/kernel/tqlayout.cpp b/src/kernel/tqlayout.cpp index bfab60480..814f1565b 100644 --- a/src/kernel/tqlayout.cpp +++ b/src/kernel/tqlayout.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_LAYOUT -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwidget.h" #include "tqptrlist.h" #include "tqsizepolicy.h" diff --git a/src/kernel/tqlocalfs.cpp b/src/kernel/tqlocalfs.cpp index 5adc77fb2..69e2eba72 100644 --- a/src/kernel/tqlocalfs.cpp +++ b/src/kernel/tqlocalfs.cpp @@ -45,7 +45,7 @@ #include "tqfileinfo.h" #include "tqfile.h" #include "tqurlinfo.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqurloperator.h" #include "tqguardedptr.h" diff --git a/src/kernel/tqmime.cpp b/src/kernel/tqmime.cpp index d230d88d8..ba12e4c8e 100644 --- a/src/kernel/tqmime.cpp +++ b/src/kernel/tqmime.cpp @@ -46,7 +46,7 @@ #include "tqdir.h" #include "tqdragobject.h" #include "tqcleanuphandler.h" -#include "ntqapplication.h" // ### for now +#include "tqapplication.h" // ### for now #include "tqclipboard.h" // ### for now /*! diff --git a/src/kernel/tqmotifdnd_x11.cpp b/src/kernel/tqmotifdnd_x11.cpp index cf5867aeb..e1481446f 100644 --- a/src/kernel/tqmotifdnd_x11.cpp +++ b/src/kernel/tqmotifdnd_x11.cpp @@ -68,7 +68,7 @@ in doc/dnd.doc, where the documentation system can see it. */ #include "qplatformdefs.h" -#include "ntqapplication.h" +#include "tqapplication.h" #ifndef TQT_NO_DRAGANDDROP diff --git a/src/kernel/tqnamespace.h b/src/kernel/tqnamespace.h index f5ec7dd1d..4ff686c1c 100644 --- a/src/kernel/tqnamespace.h +++ b/src/kernel/tqnamespace.h @@ -814,7 +814,7 @@ public: CustomPattern=24 }; - // documented in qapplication_mac.cpp + // documented in tqapplication_mac.cpp enum MacintoshVersion { //Unknown MV_Unknown = 0x0000, @@ -835,7 +835,7 @@ public: MV_TIGER = MV_10_DOT_4 }; - // documented in qapplication_win.cpp + // documented in tqapplication_win.cpp enum WindowsVersion { WV_32s = 0x0001, WV_95 = 0x0002, @@ -1005,7 +1005,7 @@ public: }; // "handle" type for system objects. Documented as \internal in - // qapplication.cpp + // tqapplication.cpp #if defined(TQ_WS_MAC) typedef void * HANDLE; #elif defined(TQ_WS_WIN) diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp index 85c69f8ba..e37cf1481 100644 --- a/src/kernel/tqobject.cpp +++ b/src/kernel/tqobject.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "tqvariant.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqobject.h" #include "tqobjectlist.h" #include "tqsignalslotimp.h" @@ -454,7 +454,7 @@ static TQCString qt_rmWS( const char *s ) } -// Event functions, implemented in qapplication_xxx.cpp +// Event functions, implemented in tqapplication_xxx.cpp int qStartTimer( int interval, TQObject *obj ); bool qKillTimer( int id ); diff --git a/src/kernel/tqpaintdevice_x11.cpp b/src/kernel/tqpaintdevice_x11.cpp index 37bdfa83e..efeaf78fa 100644 --- a/src/kernel/tqpaintdevice_x11.cpp +++ b/src/kernel/tqpaintdevice_x11.cpp @@ -43,7 +43,7 @@ #include "tqpainter.h" #include "tqwidget.h" #include "tqbitmap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqt_x11_p.h" diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp index b66f16d2b..452af0a57 100644 --- a/src/kernel/tqpainter.cpp +++ b/src/kernel/tqpainter.cpp @@ -47,7 +47,7 @@ #include "tqwidget.h" #include "tqimage.h" #include "tqpaintdevicemetrics.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqrichtext_p.h" #include "tqregexp.h" #include "tqcleanuphandler.h" diff --git a/src/kernel/tqpixmap.cpp b/src/kernel/tqpixmap.cpp index 4a40d821b..c3eceba6b 100644 --- a/src/kernel/tqpixmap.cpp +++ b/src/kernel/tqpixmap.cpp @@ -47,7 +47,7 @@ #include "tqdatastream.h" #include "tqbuffer.h" #include "tqobjectlist.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include <private/tqinternal_p.h> #include "tqmime.h" #include "tqdragobject.h" diff --git a/src/kernel/tqpixmap_x11.cpp b/src/kernel/tqpixmap_x11.cpp index 9f8c6b7d1..36c050005 100644 --- a/src/kernel/tqpixmap_x11.cpp +++ b/src/kernel/tqpixmap_x11.cpp @@ -71,7 +71,7 @@ #include "tqpaintdevicemetrics.h" #include "tqimage.h" #include "tqwmatrix.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqt_x11_p.h" #include <stdlib.h> @@ -371,7 +371,7 @@ static void build_scale_table( uint **table, uint nBits ) static int defaultScreen = -1; -extern bool tqt_use_xrender; // defined in qapplication_x11.cpp +extern bool tqt_use_xrender; // defined in tqapplication_x11.cpp extern bool tqt_has_xft; // defined in tqfont_x11.cpp #ifndef TQT_NO_XFTFREETYPE @@ -2421,7 +2421,7 @@ TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, #ifndef TQT_NO_XFTFREETYPE // copy alpha data - extern bool tqt_use_xrender; // from qapplication_x11.cpp + extern bool tqt_use_xrender; // from tqapplication_x11.cpp if ( ! tqt_use_xrender || ! src->data->alphapm ) return; diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index 2899d86df..e53dc5ff6 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -54,7 +54,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "tqpaintdevicemetrics.h" #include "tqpsprinter_p.h" #include "tqprintdialog.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqprinter_p.h" #include <unistd.h> // For ::sleep() diff --git a/src/kernel/tqprocess.cpp b/src/kernel/tqprocess.cpp index bfca757a8..b43c12b4a 100644 --- a/src/kernel/tqprocess.cpp +++ b/src/kernel/tqprocess.cpp @@ -45,7 +45,7 @@ #ifndef TQT_NO_PROCESS -#include "ntqapplication.h" +#include "tqapplication.h" #include "private/tqinternal_p.h" diff --git a/src/kernel/tqprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp index b9a79afda..606d1fd28 100644 --- a/src/kernel/tqprocess_unix.cpp +++ b/src/kernel/tqprocess_unix.cpp @@ -49,7 +49,7 @@ #ifndef TQT_NO_PROCESS -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqptrqueue.h" #include "tqptrlist.h" #include "tqsocketnotifier.h" diff --git a/src/kernel/tqpsprinter.cpp b/src/kernel/tqpsprinter.cpp index 80e00ae23..bc283807c 100644 --- a/src/kernel/tqpsprinter.cpp +++ b/src/kernel/tqpsprinter.cpp @@ -57,7 +57,7 @@ #undef Q_PRINTER_USE_TYPE42 #include "tqpainter.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpaintdevicemetrics.h" #include "tqimage.h" #include "tqdatetime.h" diff --git a/src/kernel/tqrichtext.cpp b/src/kernel/tqrichtext.cpp index 9866a6c9c..57b091721 100644 --- a/src/kernel/tqrichtext.cpp +++ b/src/kernel/tqrichtext.cpp @@ -47,7 +47,7 @@ #include "tqfont.h" #include "tqtextstream.h" #include "tqfile.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqmap.h" #include "tqfileinfo.h" #include "tqstylesheet.h" diff --git a/src/kernel/tqrichtext_p.h b/src/kernel/tqrichtext_p.h index 1032c74eb..11dfcc6d1 100644 --- a/src/kernel/tqrichtext_p.h +++ b/src/kernel/tqrichtext_p.h @@ -74,7 +74,7 @@ #include "tqpainter.h" #include "tqlayout.h" #include "tqobject.h" -#include "ntqapplication.h" +#include "tqapplication.h" #endif // QT_H #ifndef TQT_NO_RICHTEXT diff --git a/src/kernel/tqsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp index 4c98f1fd3..c2808b1cd 100644 --- a/src/kernel/tqsimplerichtext.cpp +++ b/src/kernel/tqsimplerichtext.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_RICHTEXT #include "tqrichtext_p.h" -#include "ntqapplication.h" +#include "tqapplication.h" class TQSimpleRichTextData { diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp index 017c3e6a0..65b29a1c9 100644 --- a/src/kernel/tqsizegrip.cpp +++ b/src/kernel/tqsizegrip.cpp @@ -43,12 +43,12 @@ #ifndef TQT_NO_SIZEGRIP #include "tqpainter.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #if defined(TQ_WS_X11) #include "tqt_x11_p.h" -extern Atom qt_sizegrip; // defined in qapplication_x11.cpp +extern Atom qt_sizegrip; // defined in tqapplication_x11.cpp #elif defined (TQ_WS_WIN ) #include "tqobjectlist.h" #include "qt_windows.h" diff --git a/src/kernel/tqsocketnotifier.cpp b/src/kernel/tqsocketnotifier.cpp index b350403a5..3a3d32a07 100644 --- a/src/kernel/tqsocketnotifier.cpp +++ b/src/kernel/tqsocketnotifier.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "tqsocketnotifier.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqevent.h" #include "tqeventloop.h" #include "qplatformdefs.h" diff --git a/src/kernel/tqsound_x11.cpp b/src/kernel/tqsound_x11.cpp index bbdbf5b44..dba19b144 100644 --- a/src/kernel/tqsound_x11.cpp +++ b/src/kernel/tqsound_x11.cpp @@ -44,7 +44,7 @@ #include "tqptrdict.h" #include "tqsocketnotifier.h" -#include "ntqapplication.h" +#include "tqapplication.h" #ifdef QT_NAS_SUPPORT diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp index dfa1c2cbe..27a4ce33c 100644 --- a/src/kernel/tqstyle.cpp +++ b/src/kernel/tqstyle.cpp @@ -40,7 +40,7 @@ #include "tqstyle.h" #ifndef TQT_NO_STYLE -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqbitmap.h" #include "tqpixmapcache.h" diff --git a/src/kernel/tqt3.h b/src/kernel/tqt3.h index cff4b0895..9300c254e 100644 --- a/src/kernel/tqt3.h +++ b/src/kernel/tqt3.h @@ -258,7 +258,7 @@ #include <tqvgroupbox.h> #include <tqthread.h> #include <tqwhatsthis.h> -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqwidgetintdict.h> #include <tqfocusdata.h> #include <tqwidgetplugin.h> diff --git a/src/kernel/tqtextlayout.cpp b/src/kernel/tqtextlayout.cpp index 3e71ccd39..0d50e4106 100644 --- a/src/kernel/tqtextlayout.cpp +++ b/src/kernel/tqtextlayout.cpp @@ -40,7 +40,7 @@ #include "tqtextengine_p.h" #include <tqfont.h> -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqpainter.h> diff --git a/src/kernel/tqthread.cpp b/src/kernel/tqthread.cpp index 560577589..9a1d1f602 100644 --- a/src/kernel/tqthread.cpp +++ b/src/kernel/tqthread.cpp @@ -45,7 +45,7 @@ #include <private/tqthreadinstance_p.h> #ifndef QT_H -# include "ntqapplication.h" +# include "tqapplication.h" #endif // QT_H diff --git a/src/kernel/tqthread_unix.cpp b/src/kernel/tqthread_unix.cpp index db780ee18..714b35c31 100644 --- a/src/kernel/tqthread_unix.cpp +++ b/src/kernel/tqthread_unix.cpp @@ -47,7 +47,7 @@ typedef pthread_mutex_t Q_MUTEX_T; #include <private/tqmutex_p.h> #include <private/tqmutexpool_p.h> #include <tqthreadstorage.h> -#include <ntqapplication.h> +#include <tqapplication.h> #include <errno.h> #include <sched.h> diff --git a/src/kernel/tqtimer.cpp b/src/kernel/tqtimer.cpp index 3d19923e8..84803f1b5 100644 --- a/src/kernel/tqtimer.cpp +++ b/src/kernel/tqtimer.cpp @@ -302,7 +302,7 @@ bool TQSingleShotTimer::event( TQEvent * ) Example: \code - #include <ntqapplication.h> + #include <tqapplication.h> #include <tqtimer.h> int main( int argc, char **argv ) diff --git a/src/kernel/tqtranslator.cpp b/src/kernel/tqtranslator.cpp index fd86a73ca..b6a11feb3 100644 --- a/src/kernel/tqtranslator.cpp +++ b/src/kernel/tqtranslator.cpp @@ -60,7 +60,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "tqwidgetlist.h" #include "tqintdict.h" #include "tqstring.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqfile.h" #include "tqbuffer.h" #include "tqdatastream.h" diff --git a/src/kernel/tqurl.cpp b/src/kernel/tqurl.cpp index 1155e9fa1..7d0066f0c 100644 --- a/src/kernel/tqurl.cpp +++ b/src/kernel/tqurl.cpp @@ -1010,7 +1010,7 @@ void TQUrl::setEncodedPathAndQuery( const TQString& pathAndQuery ) d->cleanPathDirty = TRUE; } -extern bool tqt_resolve_symlinks; // defined in qapplication.cpp +extern bool tqt_resolve_symlinks; // defined in tqapplication.cpp /*! Returns the path of the URL. If \a correct is TRUE, the path is diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp index 33c4768a6..71fe8ea16 100644 --- a/src/kernel/tqwidget.cpp +++ b/src/kernel/tqwidget.cpp @@ -47,8 +47,8 @@ #include "tqfocusdata.h" #include "tqcursor.h" #include "tqpixmap.h" -#include "ntqapplication.h" -#include "qapplication_p.h" +#include "tqapplication.h" +#include "tqapplication_p.h" #include "tqbrush.h" #include "tqlayout.h" #include "tqstylefactory.h" diff --git a/src/kernel/tqwidget_p.h b/src/kernel/tqwidget_p.h index 0c0eb9460..6815665c2 100644 --- a/src/kernel/tqwidget_p.h +++ b/src/kernel/tqwidget_p.h @@ -47,7 +47,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qapplication_*.cpp, tqwidget*.cpp and tqfiledialog.cpp. This header +// of tqapplication_*.cpp, tqwidget*.cpp and tqfiledialog.cpp. This header // file may change from version to version without notice, or even be removed. // // We mean it. diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp index 2f90c4905..c8492c6e6 100644 --- a/src/kernel/tqwidget_x11.cpp +++ b/src/kernel/tqwidget_x11.cpp @@ -38,8 +38,8 @@ ** **********************************************************************/ -#include "ntqapplication.h" -#include "qapplication_p.h" +#include "tqapplication.h" +#include "tqapplication_p.h" #include "tqnamespace.h" #include "tqpaintdevicemetrics.h" #include "tqpainter.h" @@ -55,11 +55,11 @@ // NOT REVISED -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern Window qt_x11_wm_client_leader; extern void qt_x11_create_wm_client_leader(); -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp void qt_insert_sip( TQWidget*, int, int ); int qt_sip_count( TQWidget* ); bool qt_wstate_iconified( WId ); @@ -77,7 +77,7 @@ extern void qt_clear_paintevent_clipping(); extern bool qt_dnd_enable( TQWidget* w, bool on ); extern bool qt_nograb(); -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern void qt_deferred_map_add( TQWidget* ); extern void qt_deferred_map_take( TQWidget* ); extern bool qt_deferred_map_contains(TQWidget *); @@ -85,7 +85,7 @@ extern bool qt_deferred_map_contains(TQWidget *); static TQWidget *mouseGrb = 0; static TQWidget *keyboardGrb = 0; -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern Time tqt_x_time; extern Time tqt_x_user_time; @@ -104,7 +104,7 @@ int qt_x11_create_desktop_on_screen = -1; TQWidget member functions *****************************************************************************/ -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern Atom tqt_wm_state; extern Atom qt_wm_change_state; extern Atom tqt_wm_delete_window; @@ -157,7 +157,7 @@ extern Atom qt_enlightenment_desktop; extern Atom qt_net_virtual_roots; extern bool qt_broken_wm; -// defined in qapplication_x11.cpp +// defined in tqapplication_x11.cpp extern bool qt_net_supports(Atom); extern unsigned long *qt_net_virtual_root_list; @@ -835,7 +835,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) #endif setWinId( 0 ); - extern void qPRCleanup( TQWidget *widget ); // from qapplication_x11.cpp + extern void qPRCleanup( TQWidget *widget ); // from tqapplication_x11.cpp if ( testWState(WState_Reparented) ) qPRCleanup(this); @@ -2228,7 +2228,7 @@ void TQWidget::internalSetGeometry( int x, int y, int w, int h, bool isMove ) } if ( isResize ) { - // set config pending only on resize, see qapplication_x11.cpp, translateConfigEvent() + // set config pending only on resize, see tqapplication_x11.cpp, translateConfigEvent() setWState( WState_ConfigPending ); TQResizeEvent e( size(), oldSize ); diff --git a/src/network/tqdns.cpp b/src/network/tqdns.cpp index 8bc081bb5..fa248533c 100644 --- a/src/network/tqdns.cpp +++ b/src/network/tqdns.cpp @@ -69,7 +69,7 @@ #include "tqptrlist.h" #include "tqstring.h" #include "tqtimer.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqptrvector.h" #include "tqstrlist.h" #include "tqptrdict.h" diff --git a/src/opengl/tqgl_x11.cpp b/src/opengl/tqgl_x11.cpp index cf82fe355..72870e83d 100644 --- a/src/opengl/tqgl_x11.cpp +++ b/src/opengl/tqgl_x11.cpp @@ -44,7 +44,7 @@ #include "tqmap.h" #include "tqpixmap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqintdict.h" #include "private/tqfontengine_p.h" diff --git a/src/opengl/tqglcolormap.cpp b/src/opengl/tqglcolormap.cpp index a9f176b96..5f1c580f1 100644 --- a/src/opengl/tqglcolormap.cpp +++ b/src/opengl/tqglcolormap.cpp @@ -73,7 +73,7 @@ Example of use: \code - #include <ntqapplication.h> + #include <tqapplication.h> #include <tqglcolormap.h> int main() diff --git a/src/qt.pro b/src/qt.pro index 17de6ea1b..c74e4f2ef 100644 --- a/src/qt.pro +++ b/src/qt.pro @@ -149,9 +149,9 @@ include($$TOOLS_CPP/qt_tools.pri) include($$CODECS_CPP/tqt_codecs.pri) include($$STYLES_CPP/qt_styles.pri) -# qconfig.cpp -exists($$QT_BUILD_TREE/src/tools/qconfig.cpp) { - SOURCES += $$QT_BUILD_TREE/src/tools/qconfig.cpp +# tqconfig.cpp +exists($$QT_BUILD_TREE/src/tools/tqconfig.cpp) { + SOURCES += $$QT_BUILD_TREE/src/tools/tqconfig.cpp } #install directives diff --git a/src/qt_install.pri b/src/qt_install.pri index 6ef9ec193..a0051046b 100644 --- a/src/qt_install.pri +++ b/src/qt_install.pri @@ -4,8 +4,8 @@ INSTALLS += target #headers headers.files = ../include/*.h -headers.files += $$QT_BUILD_TREE/include/ntqconfig.h \ - $$QT_BUILD_TREE/include/ntqmodules.h +headers.files += $$QT_BUILD_TREE/include/tqconfig.h \ + $$QT_BUILD_TREE/include/tqmodules.h isEmpty(headers_p.path):headers_p.path=$$headers.path/private headers_p.files = ../include/private/*.h INSTALLS += headers headers_p diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp index 82dd6247d..3da2dd50c 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -43,7 +43,7 @@ #if defined (Q_OS_WIN32) #include <qt_windows.h> -#include <ntqapplication.h> +#include <tqapplication.h> #endif #include <tqdatetime.h> #include <private/tqsqlextension_p.h> diff --git a/src/sql/tqdatatable.cpp b/src/sql/tqdatatable.cpp index 1e8826d3c..ac4c11267 100644 --- a/src/sql/tqdatatable.cpp +++ b/src/sql/tqdatatable.cpp @@ -45,7 +45,7 @@ #include "tqsqldriver.h" #include "tqsqleditorfactory.h" #include "tqsqlpropertymap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqlayout.h" #include "tqpainter.h" #include "tqpopupmenu.h" diff --git a/src/sql/tqsqldatabase.cpp b/src/sql/tqsqldatabase.cpp index ccdaea94d..f818a8f62 100644 --- a/src/sql/tqsqldatabase.cpp +++ b/src/sql/tqsqldatabase.cpp @@ -75,7 +75,7 @@ #include "drivers/ibase/tqsql_ibase.h" #endif -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqsqlresult.h" #include "tqsqldriver.h" #include "tqsqldriverinterface_p.h" diff --git a/src/sql/tqsqlmanager_p.cpp b/src/sql/tqsqlmanager_p.cpp index 754d572a9..64345bde2 100644 --- a/src/sql/tqsqlmanager_p.cpp +++ b/src/sql/tqsqlmanager_p.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_SQL -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwidget.h" #include "tqsqlcursor.h" #include "tqsqlform.h" diff --git a/src/styles/tqcommonstyle.cpp b/src/styles/tqcommonstyle.cpp index 02b878c38..a18604f48 100644 --- a/src/styles/tqcommonstyle.cpp +++ b/src/styles/tqcommonstyle.cpp @@ -44,7 +44,7 @@ #include "tqmutex.h" #include "tqmenubar.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqdrawutil.h" #include "tqpixmap.h" diff --git a/src/styles/tqinterlacestyle.cpp b/src/styles/tqinterlacestyle.cpp index 3c86f0638..a0cd70c58 100644 --- a/src/styles/tqinterlacestyle.cpp +++ b/src/styles/tqinterlacestyle.cpp @@ -44,7 +44,7 @@ #if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN) -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqdrawutil.h" // for now #include "tqpalette.h" // for now diff --git a/src/styles/tqmotifplusstyle.cpp b/src/styles/tqmotifplusstyle.cpp index 2d65a7c4f..6c9075495 100644 --- a/src/styles/tqmotifplusstyle.cpp +++ b/src/styles/tqmotifplusstyle.cpp @@ -43,7 +43,7 @@ #if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) #include "tqmenubar.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqpalette.h" #include "tqframe.h" diff --git a/src/styles/tqmotifstyle.cpp b/src/styles/tqmotifstyle.cpp index d2248e83f..5e71d6813 100644 --- a/src/styles/tqmotifstyle.cpp +++ b/src/styles/tqmotifstyle.cpp @@ -43,7 +43,7 @@ #if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN) #include "tqpopupmenu.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqdrawutil.h" #include "tqpixmap.h" diff --git a/src/styles/tqplatinumstyle.cpp b/src/styles/tqplatinumstyle.cpp index 2a2ad20fb..4050f075e 100644 --- a/src/styles/tqplatinumstyle.cpp +++ b/src/styles/tqplatinumstyle.cpp @@ -42,7 +42,7 @@ #if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN) -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqcombobox.h" #include "tqdrawutil.h" #include "tqpainter.h" diff --git a/src/styles/tqsgistyle.cpp b/src/styles/tqsgistyle.cpp index c02b64d20..3574dc0d0 100644 --- a/src/styles/tqsgistyle.cpp +++ b/src/styles/tqsgistyle.cpp @@ -43,7 +43,7 @@ #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN) #include "tqpopupmenu.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbutton.h" #include "tqpainter.h" #include "tqdrawutil.h" diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp index d66fbe72d..05418b275 100644 --- a/src/styles/tqstylefactory.cpp +++ b/src/styles/tqstylefactory.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_STYLE -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwindowsstyle.h" #include "tqmotifstyle.h" #include "tqcdestyle.h" diff --git a/src/styles/tqwindowsstyle.cpp b/src/styles/tqwindowsstyle.cpp index 03fc62dd5..02bd43720 100644 --- a/src/styles/tqwindowsstyle.cpp +++ b/src/styles/tqwindowsstyle.cpp @@ -43,7 +43,7 @@ #if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) #include "tqpopupmenu.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqdrawutil.h" // for now #include "tqpixmap.h" // for now diff --git a/src/table/tqtable.cpp b/src/table/tqtable.cpp index d2270ab80..2bffd774c 100644 --- a/src/table/tqtable.cpp +++ b/src/table/tqtable.cpp @@ -51,7 +51,7 @@ #include <tqpainter.h> #include <tqlineedit.h> #include <tqcursor.h> -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqtimer.h> #include <tqobjectlist.h> #include <tqiconset.h> diff --git a/src/tools/tqcomlibrary.cpp b/src/tools/tqcomlibrary.cpp index 5c2510130..a387c9611 100644 --- a/src/tools/tqcomlibrary.cpp +++ b/src/tools/tqcomlibrary.cpp @@ -39,7 +39,7 @@ #include "tqcomlibrary_p.h" #ifndef TQT_NO_COMPONENT -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqsettings.h> #include <tqfileinfo.h> #include <tqdatetime.h> diff --git a/src/tools/tqcomponentfactory.cpp b/src/tools/tqcomponentfactory.cpp index 3b05e94de..4d799b024 100644 --- a/src/tools/tqcomponentfactory.cpp +++ b/src/tools/tqcomponentfactory.cpp @@ -44,7 +44,7 @@ #include "tqsettings.h" #include <private/tqcomlibrary_p.h> #include "tqdir.h" -#include "ntqapplication.h" +#include "tqapplication.h" /*! \class TQComponentFactory tqcomponentfactory.h diff --git a/src/tools/qconfig-dist.h b/src/tools/tqconfig-dist.h index d6075aa4d..d6075aa4d 100644 --- a/src/tools/qconfig-dist.h +++ b/src/tools/tqconfig-dist.h diff --git a/src/tools/qconfig-large.h b/src/tools/tqconfig-large.h index d2f8321ce..d2f8321ce 100644 --- a/src/tools/qconfig-large.h +++ b/src/tools/tqconfig-large.h diff --git a/src/tools/qconfig-medium.h b/src/tools/tqconfig-medium.h index 93bc436e6..93bc436e6 100644 --- a/src/tools/qconfig-medium.h +++ b/src/tools/tqconfig-medium.h diff --git a/src/tools/qconfig-minimal.h b/src/tools/tqconfig-minimal.h index 2d98d14ea..2d98d14ea 100644 --- a/src/tools/qconfig-minimal.h +++ b/src/tools/tqconfig-minimal.h diff --git a/src/tools/qconfig-small.h b/src/tools/tqconfig-small.h index d7d08b795..d7d08b795 100644 --- a/src/tools/qconfig-small.h +++ b/src/tools/tqconfig-small.h diff --git a/src/tools/tqglobal.cpp b/src/tools/tqglobal.cpp index d33bfdf95..d77e284ea 100644 --- a/src/tools/tqglobal.cpp +++ b/src/tools/tqglobal.cpp @@ -820,7 +820,7 @@ void tqObsolete( const char *message ) Example: \code - #include <ntqapplication.h> + #include <tqapplication.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index 15545d1c7..e00cf68a9 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -736,17 +736,17 @@ class TQString; #if !defined(QT_MOC) #if defined(TQCONFIG_LOCAL) -#include "qconfig-local.h" +#include "tqconfig-local.h" #elif defined(TQCONFIG_MINIMAL) -#include "qconfig-minimal.h" +#include "tqconfig-minimal.h" #elif defined(TQCONFIG_SMALL) -#include "qconfig-small.h" +#include "tqconfig-small.h" #elif defined(TQCONFIG_MEDIUM) -#include "qconfig-medium.h" +#include "tqconfig-medium.h" #elif defined(TQCONFIG_LARGE) -#include "qconfig-large.h" +#include "tqconfig-large.h" #else // everything... -#include "ntqconfig.h" +#include "tqconfig.h" #endif #endif @@ -756,7 +756,7 @@ class TQString; #endif // prune to local config -#include "ntqmodules.h" +#include "tqmodules.h" #ifndef TQT_MODULE_DIALOGS # define TQT_NO_DIALOG #endif diff --git a/src/tools/tqthreadstorage_unix.cpp b/src/tools/tqthreadstorage_unix.cpp index 9a7e179b2..977ccf6bb 100644 --- a/src/tools/tqthreadstorage_unix.cpp +++ b/src/tools/tqthreadstorage_unix.cpp @@ -38,7 +38,7 @@ #ifdef TQT_THREAD_SUPPORT -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqthread.h" #include "qplatformdefs.h" diff --git a/src/tqmoc/tqmoc.y b/src/tqmoc/tqmoc.y index 3309ee7b6..5854ce787 100644 --- a/src/tqmoc/tqmoc.y +++ b/src/tqmoc/tqmoc.y @@ -2905,7 +2905,7 @@ void generateClass() // generate C++ source code for a class } } fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath ); + fprintf( out, "#include <%stqapplication.h>\n\n", (const char*)g->qtPath ); fprintf( out, "#include <%sprivate/tqucomextra_p.h>\n", (const char*)g->qtPath ); fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision ); fprintf( out, "#error \"This file was generated using the tqmoc from %s." diff --git a/src/tqmoc/tqmoc_yacc.cpp b/src/tqmoc/tqmoc_yacc.cpp index ea0f36a2d..0422ee4cd 100644 --- a/src/tqmoc/tqmoc_yacc.cpp +++ b/src/tqmoc/tqmoc_yacc.cpp @@ -5780,7 +5780,7 @@ void generateClass() // generate C++ source code for a class } } fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath ); + fprintf( out, "#include <%stqapplication.h>\n\n", (const char*)g->qtPath ); fprintf( out, "#include <%sprivate/tqucomextra_p.h>\n", (const char*)g->qtPath ); fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision ); fprintf( out, "#error \"This file was generated using the tqmoc from %s." diff --git a/src/widgets/tqbutton.cpp b/src/widgets/tqbutton.cpp index 088f9cc6a..bcf9c2ada 100644 --- a/src/widgets/tqbutton.cpp +++ b/src/widgets/tqbutton.cpp @@ -46,7 +46,7 @@ #include "tqtimer.h" #include "tqaccel.h" #include "tqpixmapcache.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpushbutton.h" #include "tqradiobutton.h" #include "tqguardedptr.h" diff --git a/src/widgets/tqbuttongroup.cpp b/src/widgets/tqbuttongroup.cpp index c56af49d9..9b495279c 100644 --- a/src/widgets/tqbuttongroup.cpp +++ b/src/widgets/tqbuttongroup.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_BUTTONGROUP #include "tqbutton.h" #include "tqptrlist.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqradiobutton.h" diff --git a/src/widgets/tqcheckbox.cpp b/src/widgets/tqcheckbox.cpp index 85c3e1845..6b0cc48a6 100644 --- a/src/widgets/tqcheckbox.cpp +++ b/src/widgets/tqcheckbox.cpp @@ -46,7 +46,7 @@ #include "tqpixmapcache.h" #include "tqbitmap.h" #include "tqtextstream.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" /*! diff --git a/src/widgets/tqcombobox.cpp b/src/widgets/tqcombobox.cpp index 1f0ff2e9d..278b555e6 100644 --- a/src/widgets/tqcombobox.cpp +++ b/src/widgets/tqcombobox.cpp @@ -47,7 +47,7 @@ #include "tqstrlist.h" #include "tqpixmap.h" #include "tqtimer.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqlineedit.h" #include "tqbitmap.h" #include "tqeffects_p.h" diff --git a/src/widgets/tqdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp index a01a14694..3820c5604 100644 --- a/src/widgets/tqdatetimeedit.cpp +++ b/src/widgets/tqdatetimeedit.cpp @@ -45,9 +45,8 @@ #include "../kernel/tqinternal_p.h" #include "../kernel/tqrichtext_p.h" #include "tqrangecontrol.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpixmap.h" -#include "ntqapplication.h" #include "tqvaluelist.h" #include "tqstring.h" #include "tqstyle.h" diff --git a/src/widgets/tqdial.cpp b/src/widgets/tqdial.cpp index 6c9b4d499..b1e523956 100644 --- a/src/widgets/tqdial.cpp +++ b/src/widgets/tqdial.cpp @@ -45,7 +45,7 @@ #include "tqpainter.h" #include "tqpointarray.h" #include "tqcolor.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqregion.h" #include "tqbitmap.h" #include "tqstyle.h" diff --git a/src/widgets/tqdialogbuttons.cpp b/src/widgets/tqdialogbuttons.cpp index 12015bceb..0704cc0e0 100644 --- a/src/widgets/tqdialogbuttons.cpp +++ b/src/widgets/tqdialogbuttons.cpp @@ -39,7 +39,7 @@ #include "tqdialogbuttons_p.h" #ifndef TQT_NO_DIALOGBUTTONS -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqpushbutton.h> #include <tqguardedptr.h> #include <tqmap.h> diff --git a/src/widgets/tqdockarea.cpp b/src/widgets/tqdockarea.cpp index 0f14a33a7..9bb4d4a12 100644 --- a/src/widgets/tqdockarea.cpp +++ b/src/widgets/tqdockarea.cpp @@ -44,7 +44,7 @@ #include "tqsplitter.h" #include "tqlayout.h" #include "tqptrvector.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqwidgetlist.h" #include "tqmap.h" diff --git a/src/widgets/tqdockwindow.cpp b/src/widgets/tqdockwindow.cpp index e07a550af..fa20b1745 100644 --- a/src/widgets/tqdockwindow.cpp +++ b/src/widgets/tqdockwindow.cpp @@ -46,7 +46,7 @@ #include "tqwidgetresizehandler_p.h" #include "tqtitlebar_p.h" #include "tqpainter.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqtoolbutton.h" #include "tqtoolbar.h" #include "tqlayout.h" diff --git a/src/widgets/tqeffects.cpp b/src/widgets/tqeffects.cpp index 792456119..0ff1b11d4 100644 --- a/src/widgets/tqeffects.cpp +++ b/src/widgets/tqeffects.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "ntqapplication.h" +#include "tqapplication.h" #ifndef TQT_NO_EFFECTS #include "tqwidget.h" #include "tqeffects_p.h" diff --git a/src/widgets/tqgrid.cpp b/src/widgets/tqgrid.cpp index bdc43f9e1..19e7e2964 100644 --- a/src/widgets/tqgrid.cpp +++ b/src/widgets/tqgrid.cpp @@ -38,7 +38,7 @@ #include "tqgrid.h" #ifndef TQT_NO_GRID #include "tqlayout.h" -#include "ntqapplication.h" +#include "tqapplication.h" /*! \class TQGrid tqgrid.h diff --git a/src/widgets/tqgroupbox.cpp b/src/widgets/tqgroupbox.cpp index c54ff3357..b969f18ac 100644 --- a/src/widgets/tqgroupbox.cpp +++ b/src/widgets/tqgroupbox.cpp @@ -48,7 +48,7 @@ #include "tqfocusdata.h" #include "tqobjectlist.h" #include "tqdrawutil.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqcheckbox.h" #include "tqbuttongroup.h" diff --git a/src/widgets/tqhbox.cpp b/src/widgets/tqhbox.cpp index 41b4fabbf..cb0e0281c 100644 --- a/src/widgets/tqhbox.cpp +++ b/src/widgets/tqhbox.cpp @@ -37,7 +37,7 @@ #include "tqhbox.h" #ifndef TQT_NO_HBOX #include "tqlayout.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqobjectlist.h" diff --git a/src/widgets/tqheader.cpp b/src/widgets/tqheader.cpp index 82df9e63e..540a90508 100644 --- a/src/widgets/tqheader.cpp +++ b/src/widgets/tqheader.cpp @@ -45,7 +45,7 @@ #include "tqpixmap.h" #include "tqbitarray.h" #include "tqptrvector.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" class TQHeaderData diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp index 7af1babc8..1b3170a42 100644 --- a/src/widgets/tqiconview.cpp +++ b/src/widgets/tqiconview.cpp @@ -58,7 +58,7 @@ #include "tqbrush.h" #include "tqtimer.h" #include "tqcursor.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqtextedit.h" #include "tqmemarray.h" #include "tqptrlist.h" diff --git a/src/widgets/tqlabel.cpp b/src/widgets/tqlabel.cpp index b1c5807ec..4550cda3e 100644 --- a/src/widgets/tqlabel.cpp +++ b/src/widgets/tqlabel.cpp @@ -47,7 +47,7 @@ #include "tqimage.h" #include "tqbitmap.h" #include "tqpicture.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqsimplerichtext.h" #include "tqstylesheet.h" #include "tqstyle.h" diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp index 46b1df641..2267706d4 100644 --- a/src/widgets/tqlineedit.cpp +++ b/src/widgets/tqlineedit.cpp @@ -51,7 +51,7 @@ #include "tqfontmetrics.h" #include "tqpixmap.h" #include "tqclipboard.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqvalidator.h" #include "tqdragobject.h" #include "tqtimer.h" diff --git a/src/widgets/tqlistbox.cpp b/src/widgets/tqlistbox.cpp index e7c90ddcb..bbbda6694 100644 --- a/src/widgets/tqlistbox.cpp +++ b/src/widgets/tqlistbox.cpp @@ -51,7 +51,7 @@ #include "tqpainter.h" #include "tqstrlist.h" #include "tqpixmap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqptrdict.h" #include "tqtimer.h" #include "tqstringlist.h" diff --git a/src/widgets/tqlistview.cpp b/src/widgets/tqlistview.cpp index 477743c2a..6d8f3771f 100644 --- a/src/widgets/tqlistview.cpp +++ b/src/widgets/tqlistview.cpp @@ -47,7 +47,7 @@ #include "tqptrstack.h" #include "tqptrlist.h" #include "tqstrlist.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitmap.h" #include "tqdatetime.h" #include "tqptrdict.h" diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp index 609b22289..bc5596645 100644 --- a/src/widgets/tqmainwindow.cpp +++ b/src/widgets/tqmainwindow.cpp @@ -45,7 +45,7 @@ #include "tqlayout.h" #include "tqobjectlist.h" #include "tqintdict.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqptrlist.h" #include "tqmap.h" #include "tqcursor.h" diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp index 8577bda56..58507e4d4 100644 --- a/src/widgets/tqmenubar.cpp +++ b/src/widgets/tqmenubar.cpp @@ -48,7 +48,7 @@ #include "tqaccel.h" #include "tqpainter.h" #include "tqdrawutil.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqguardedptr.h" #include "tqlayout.h" #include "tqcleanuphandler.h" @@ -72,7 +72,7 @@ static bool inMenu = FALSE; #endif #if defined(TQ_WS_X11) -extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp +extern int qt_xfocusout_grab_counter; // defined in tqapplication_x11.cpp #endif /*! diff --git a/src/widgets/tqmenudata.cpp b/src/widgets/tqmenudata.cpp index 148d79790..e0b7deca9 100644 --- a/src/widgets/tqmenudata.cpp +++ b/src/widgets/tqmenudata.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_MENUDATA #include "tqpopupmenu.h" #include "tqmenubar.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqguardedptr.h" class TQMenuItemData { diff --git a/src/widgets/tqmultilineedit.cpp b/src/widgets/tqmultilineedit.cpp index 1ee4b712e..67896224a 100644 --- a/src/widgets/tqmultilineedit.cpp +++ b/src/widgets/tqmultilineedit.cpp @@ -46,7 +46,7 @@ #include "tqclipboard.h" #include "tqpixmap.h" #include "tqregexp.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqdragobject.h" #include "tqpopupmenu.h" #include "tqtimer.h" diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp index e614a328c..c52c00005 100644 --- a/src/widgets/tqpopupmenu.cpp +++ b/src/widgets/tqpopupmenu.cpp @@ -44,7 +44,7 @@ #include "tqaccel.h" #include "tqpainter.h" #include "tqdrawutil.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpixmap.h" #include "tqpixmapcache.h" #include "tqtimer.h" diff --git a/src/widgets/tqpushbutton.cpp b/src/widgets/tqpushbutton.cpp index 7e6add688..e264d2c1e 100644 --- a/src/widgets/tqpushbutton.cpp +++ b/src/widgets/tqpushbutton.cpp @@ -48,7 +48,7 @@ #include "tqbitmap.h" #include "tqpopupmenu.h" #include "tqguardedptr.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqtoolbar.h" #include "tqstyle.h" #if defined(QT_ACCESSIBILITY_SUPPORT) diff --git a/src/widgets/tqradiobutton.cpp b/src/widgets/tqradiobutton.cpp index eac619f59..b296f5d79 100644 --- a/src/widgets/tqradiobutton.cpp +++ b/src/widgets/tqradiobutton.cpp @@ -47,7 +47,7 @@ #include "tqpixmapcache.h" #include "tqbitmap.h" #include "tqtextstream.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" /*! diff --git a/src/widgets/tqscrollbar.cpp b/src/widgets/tqscrollbar.cpp index 3f6c683c7..e49e1f9a9 100644 --- a/src/widgets/tqscrollbar.cpp +++ b/src/widgets/tqscrollbar.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_SCROLLBAR #include "tqpainter.h" #include "tqbitmap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqtimer.h" #include "tqstyle.h" #ifndef TQT_NO_CURSOR diff --git a/src/widgets/tqscrollview.cpp b/src/widgets/tqscrollview.cpp index 2f5e92ea1..40a5bb509 100644 --- a/src/widgets/tqscrollview.cpp +++ b/src/widgets/tqscrollview.cpp @@ -48,7 +48,7 @@ #include "tqfocusdata.h" #include "tqscrollview.h" #include "tqptrdict.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqtimer.h" #include "tqstyle.h" #include "tqlistview.h" diff --git a/src/widgets/tqslider.cpp b/src/widgets/tqslider.cpp index 6b020c620..7c503e1b0 100644 --- a/src/widgets/tqslider.cpp +++ b/src/widgets/tqslider.cpp @@ -44,7 +44,7 @@ #include "tqdrawutil.h" #include "tqtimer.h" #include "tqbitmap.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "tqaccessible.h" diff --git a/src/widgets/tqspinbox.cpp b/src/widgets/tqspinbox.cpp index 6c6b38be5..08af76cb0 100644 --- a/src/widgets/tqspinbox.cpp +++ b/src/widgets/tqspinbox.cpp @@ -48,7 +48,7 @@ #include "tqlineedit.h" #include "tqvalidator.h" #include "tqpixmapcache.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "tqaccessible.h" diff --git a/src/widgets/tqsplashscreen.cpp b/src/widgets/tqsplashscreen.cpp index 78aa19869..ba7b765a6 100644 --- a/src/widgets/tqsplashscreen.cpp +++ b/src/widgets/tqsplashscreen.cpp @@ -40,7 +40,7 @@ #ifndef TQT_NO_SPLASHSCREEN -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpainter.h" #include "tqpixmap.h" diff --git a/src/widgets/tqsplitter.cpp b/src/widgets/tqsplitter.cpp index e9de06731..41b565ef3 100644 --- a/src/widgets/tqsplitter.cpp +++ b/src/widgets/tqsplitter.cpp @@ -43,7 +43,7 @@ #include "tqlayout.h" #include "../kernel/tqlayoutengine_p.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqbitmap.h" #include "tqdrawutil.h" #include "tqmemarray.h" diff --git a/src/widgets/tqtabbar.cpp b/src/widgets/tqtabbar.cpp index cba1906c8..0d3ea9c70 100644 --- a/src/widgets/tqtabbar.cpp +++ b/src/widgets/tqtabbar.cpp @@ -42,7 +42,7 @@ #include "tqbitmap.h" #include "tqtoolbutton.h" #include "tqtooltip.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqpainter.h" #include "tqiconset.h" diff --git a/src/widgets/tqtabwidget.cpp b/src/widgets/tqtabwidget.cpp index 88ec8a06e..ea294e76a 100644 --- a/src/widgets/tqtabwidget.cpp +++ b/src/widgets/tqtabwidget.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_TABWIDGET #include "tqobjectlist.h" #include "tqtabbar.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqwidgetstack.h" #include "tqbitmap.h" #include "tqaccel.h" diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp index 161757d19..584639c61 100644 --- a/src/widgets/tqtextbrowser.cpp +++ b/src/widgets/tqtextbrowser.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_TEXTBROWSER #include "../kernel/tqrichtext_p.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqlayout.h" #include "tqpainter.h" diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp index baddd23c5..cc88b3dd9 100644 --- a/src/widgets/tqtextedit.cpp +++ b/src/widgets/tqtextedit.cpp @@ -58,10 +58,9 @@ #include "tqsize.h" #include "tqevent.h" #include "tqtimer.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqlistbox.h" #include "tqvbox.h" -#include "ntqapplication.h" #include "tqclipboard.h" #include "tqcolordialog.h" #include "tqfontdialog.h" diff --git a/src/widgets/tqtitlebar.cpp b/src/widgets/tqtitlebar.cpp index 83bb8c125..536bf4942 100644 --- a/src/widgets/tqtitlebar.cpp +++ b/src/widgets/tqtitlebar.cpp @@ -45,10 +45,10 @@ #ifndef TQT_NO_TITLEBAR #include <tqcursor.h> -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqdatetime.h" -#include "private/qapplication_p.h" +#include "private/tqapplication_p.h" #include "tqtooltip.h" #include "tqimage.h" #include "tqtimer.h" diff --git a/src/widgets/tqtoolbox.cpp b/src/widgets/tqtoolbox.cpp index ac9df2f82..e5b139035 100644 --- a/src/widgets/tqtoolbox.cpp +++ b/src/widgets/tqtoolbox.cpp @@ -48,7 +48,7 @@ #include <tqpainter.h> #include <tqstyle.h> #include <tqobjectlist.h> -#include <ntqapplication.h> +#include <tqapplication.h> #include <tqwidgetlist.h> #include <tqlayout.h> #include <tqvaluelist.h> diff --git a/src/widgets/tqtoolbutton.cpp b/src/widgets/tqtoolbutton.cpp index b44f93b9e..fab5ffb93 100644 --- a/src/widgets/tqtoolbutton.cpp +++ b/src/widgets/tqtoolbutton.cpp @@ -45,7 +45,7 @@ #include "tqpainter.h" #include "tqpixmap.h" #include "tqwmatrix.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqstyle.h" #include "tqmainwindow.h" #include "tqtooltip.h" diff --git a/src/widgets/tqtooltip.cpp b/src/widgets/tqtooltip.cpp index e044be6ea..32211ec9f 100644 --- a/src/widgets/tqtooltip.cpp +++ b/src/widgets/tqtooltip.cpp @@ -40,7 +40,7 @@ #ifndef TQT_NO_TOOLTIP #include "tqlabel.h" #include "tqptrdict.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqguardedptr.h" #include "tqtimer.h" #include "tqeffects_p.h" diff --git a/src/widgets/tqwhatsthis.cpp b/src/widgets/tqwhatsthis.cpp index 4b38a43d5..6f4a7ec10 100644 --- a/src/widgets/tqwhatsthis.cpp +++ b/src/widgets/tqwhatsthis.cpp @@ -38,7 +38,7 @@ #include "tqwhatsthis.h" #ifndef TQT_NO_WHATSTHIS -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqpaintdevicemetrics.h" #include "tqpixmap.h" #include "tqpainter.h" diff --git a/src/widgets/tqwidgetresizehandler.cpp b/src/widgets/tqwidgetresizehandler.cpp index 342626e53..e16814ba5 100644 --- a/src/widgets/tqwidgetresizehandler.cpp +++ b/src/widgets/tqwidgetresizehandler.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_RESIZEHANDLER #include "tqframe.h" -#include "ntqapplication.h" +#include "tqapplication.h" #include "tqcursor.h" #include "tqsizegrip.h" #if defined(TQ_WS_WIN) diff --git a/src/widgets/tqwidgetstack.cpp b/src/widgets/tqwidgetstack.cpp index d550fa6ef..d751fb243 100644 --- a/src/widgets/tqwidgetstack.cpp +++ b/src/widgets/tqwidgetstack.cpp @@ -48,7 +48,7 @@ #include "tqbutton.h" #include "tqbuttongroup.h" -#include "ntqapplication.h" +#include "tqapplication.h" class TQWidgetStackPrivate { public: diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp index 1677b3a41..ab0f67896 100644 --- a/src/workspace/tqworkspace.cpp +++ b/src/workspace/tqworkspace.cpp @@ -40,7 +40,7 @@ #include "tqworkspace.h" #ifndef TQT_NO_WORKSPACE -#include "ntqapplication.h" +#include "tqapplication.h" #include "../widgets/tqtitlebar_p.h" #include "tqobjectlist.h" #include "tqlayout.h" |