summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-26 23:32:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-26 23:32:43 -0600
commitea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree996d29b80c30d453dda86d1a23162d441628f169 /src/kernel/qapplication_x11.cpp
parentaaf89d4b48f69c9293feb187db26362e550b5561 (diff)
downloadtqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz
tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip
Update to latest tqt3 automated conversion
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
-rw-r--r--src/kernel/qapplication_x11.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 7f0d4d3d..1c285c44 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -64,45 +64,45 @@
# undef truncate
#endif
-#include "qapplication.h"
+#include "ntqapplication.h"
#include "qapplication_p.h"
#include "qcolor_p.h"
-#include "qcursor.h"
-#include "qwidget.h"
+#include "ntqcursor.h"
+#include "ntqwidget.h"
#include "qwidget_p.h"
-#include "qobjectlist.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qbitarray.h"
-#include "qpainter.h"
-#include "qpixmapcache.h"
-#include "qdatetime.h"
-#include "qtextcodec.h"
-#include "qdatastream.h"
-#include "qbuffer.h"
-#include "qsocketnotifier.h"
-#include "qsessionmanager.h"
-#include "qvaluelist.h"
-#include "qdict.h"
-#include "qguardedptr.h"
-#include "qclipboard.h"
-#include "qwhatsthis.h" // ######## dependency
-#include "qsettings.h"
-#include "qstylefactory.h"
-#include "qfileinfo.h"
+#include "ntqobjectlist.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqbitarray.h"
+#include "ntqpainter.h"
+#include "ntqpixmapcache.h"
+#include "ntqdatetime.h"
+#include "ntqtextcodec.h"
+#include "ntqdatastream.h"
+#include "ntqbuffer.h"
+#include "ntqsocketnotifier.h"
+#include "ntqsessionmanager.h"
+#include "ntqvaluelist.h"
+#include "ntqdict.h"
+#include "ntqguardedptr.h"
+#include "ntqclipboard.h"
+#include "ntqwhatsthis.h" // ######## dependency
+#include "ntqsettings.h"
+#include "ntqstylefactory.h"
+#include "ntqfileinfo.h"
// Input method stuff - UNFINISHED
#ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
#endif // QT_NO_IM
#include "qinternal_p.h" // shared double buffer cleanup
#if defined(QT_THREAD_SUPPORT)
-# include "qthread.h"
+# include "ntqthread.h"
#endif
#if defined(QT_DEBUG) && defined(Q_OS_LINUX)
-# include "qfile.h"
+# include "ntqfile.h"
#endif
#include "qt_x11_p.h"
@@ -1636,7 +1636,7 @@ static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *nc
#include <X11/keysymdef.h>
// ### This should be static but it isn't because of the friend declaration
-// ### in qpaintdevice.h which then should have a static too but can't have
+// ### in ntqpaintdevice.h which then should have a static too but can't have
// ### it because "storage class specifiers invalid in friend function
// ### declarations" :-) Ideas anyone?
void qt_init_internal( int *argcptr, char **argv,