DEB pinentry-tqt: use tq* headers
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>pull/35/head
parent
1f3d423094
commit
ff287d2f48
GPG Key ID:
2A75B7CA8ADED5CF
@ -0,0 +1,190 @@
|
||||
--- a/tqt/main.cpp
|
||||
+++ b/tqt/main.cpp
|
||||
@@ -26,9 +26,9 @@
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include <ntqapplication.h>
|
||||
-#include <ntqwidget.h>
|
||||
-#include <ntqmessagebox.h>
|
||||
+#include <tqapplication.h>
|
||||
+#include <tqwidget.h>
|
||||
+#include <tqmessagebox.h>
|
||||
#include "secqstring.h"
|
||||
|
||||
#include "pinentrydialog.h"
|
||||
--- a/tqt/pinentrydialog.cpp
|
||||
+++ b/tqt/pinentrydialog.cpp
|
||||
@@ -18,12 +18,12 @@
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
-#include <ntqlayout.h>
|
||||
-#include <ntqpushbutton.h>
|
||||
-#include <ntqlabel.h>
|
||||
-#include <ntqmessagebox.h>
|
||||
-#include <ntqprogressbar.h>
|
||||
-#include <ntqtooltip.h>
|
||||
+#include <tqlayout.h>
|
||||
+#include <tqpushbutton.h>
|
||||
+#include <tqlabel.h>
|
||||
+#include <tqmessagebox.h>
|
||||
+#include <tqprogressbar.h>
|
||||
+#include <tqtooltip.h>
|
||||
|
||||
#include "secqlineedit.h"
|
||||
|
||||
--- a/tqt/pinentrydialog.h
|
||||
+++ b/tqt/pinentrydialog.h
|
||||
@@ -20,7 +20,7 @@
|
||||
#ifndef __PINENTRYDIALOG_H__
|
||||
#define __PINENTRYDIALOG_H__
|
||||
|
||||
-#include <ntqdialog.h>
|
||||
+#include <tqdialog.h>
|
||||
#include "pinentry.h"
|
||||
|
||||
class TQLabel;
|
||||
--- a/tqt/secqinternal.cpp
|
||||
+++ b/tqt/secqinternal.cpp
|
||||
@@ -38,10 +38,10 @@
|
||||
**********************************************************************/
|
||||
|
||||
#include "secqinternal_p.h"
|
||||
-#include "ntqwidget.h"
|
||||
-#include "ntqpixmap.h"
|
||||
-#include "ntqpainter.h"
|
||||
-#include "ntqcleanuphandler.h"
|
||||
+#include "tqwidget.h"
|
||||
+#include "tqpixmap.h"
|
||||
+#include "tqpainter.h"
|
||||
+#include "tqcleanuphandler.h"
|
||||
|
||||
static TQPixmap* qdb_shared_pixmap = 0;
|
||||
static TQPixmap *qdb_force_pixmap = 0;
|
||||
--- a/tqt/secqinternal_p.h
|
||||
+++ b/tqt/secqinternal_p.h
|
||||
@@ -52,11 +52,11 @@
|
||||
//
|
||||
//
|
||||
#ifndef QT_H
|
||||
-#include "ntqnamespace.h"
|
||||
-#include "ntqrect.h"
|
||||
-#include "ntqptrlist.h"
|
||||
-#include "ntqcstring.h"
|
||||
-#include "ntqiodevice.h"
|
||||
+#include "tqnamespace.h"
|
||||
+#include "tqrect.h"
|
||||
+#include "tqptrlist.h"
|
||||
+#include "tqcstring.h"
|
||||
+#include "tqiodevice.h"
|
||||
#endif // QT_H
|
||||
|
||||
class TQWidget;
|
||||
--- a/tqt/secqlineedit.cpp
|
||||
+++ b/tqt/secqlineedit.cpp
|
||||
@@ -67,27 +67,27 @@
|
||||
**********************************************************************/
|
||||
|
||||
#include "secqlineedit.h"
|
||||
-#include "ntqpainter.h"
|
||||
-#include "ntqdrawutil.h"
|
||||
-#include "ntqfontmetrics.h"
|
||||
-#include "ntqpixmap.h"
|
||||
-#include "ntqclipboard.h"
|
||||
-#include "ntqapplication.h"
|
||||
-#include "ntqtimer.h"
|
||||
-#include "ntqpopupmenu.h"
|
||||
-#include "ntqstringlist.h"
|
||||
-#include "ntqguardedptr.h"
|
||||
-#include "ntqstyle.h"
|
||||
-#include "ntqwhatsthis.h"
|
||||
+#include "tqpainter.h"
|
||||
+#include "tqdrawutil.h"
|
||||
+#include "tqfontmetrics.h"
|
||||
+#include "tqpixmap.h"
|
||||
+#include "tqclipboard.h"
|
||||
+#include "tqapplication.h"
|
||||
+#include "tqtimer.h"
|
||||
+#include "tqpopupmenu.h"
|
||||
+#include "tqstringlist.h"
|
||||
+#include "tqguardedptr.h"
|
||||
+#include "tqstyle.h"
|
||||
+#include "tqwhatsthis.h"
|
||||
#include "secqinternal_p.h"
|
||||
-#include "private/qtextlayout_p.h"
|
||||
-#include "ntqvaluevector.h"
|
||||
+#include "private/tqtextlayout_p.h"
|
||||
+#include "tqvaluevector.h"
|
||||
#if defined(QT_ACCESSIBILITY_SUPPORT)
|
||||
-#include "ntqaccessible.h"
|
||||
+#include "tqaccessible.h"
|
||||
#endif
|
||||
|
||||
#ifndef TQT_NO_ACCEL
|
||||
-#include "ntqkeysequence.h"
|
||||
+#include "tqkeysequence.h"
|
||||
#define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
|
||||
#else
|
||||
#define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
|
||||
--- a/tqt/secqlineedit.h
|
||||
+++ b/tqt/secqlineedit.h
|
||||
@@ -1,8 +1,8 @@
|
||||
-/* secntqlineedit.h - Secure version of TQLineEdit.
|
||||
+/* secqlineedit.h - Secure version of TQLineEdit.
|
||||
* Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
|
||||
* Copyright (C) 2003 g10 Code GmbH
|
||||
*
|
||||
- * The license of the original ntqlineedit.h file from which this file
|
||||
+ * The license of the original tqlineedit.h file from which this file
|
||||
* is derived can be found below. Modified by Marcus Brinkmann
|
||||
* <marcus@g10code.de>. All modifications are licensed as follows, so
|
||||
* that the intersection of the two licenses is then the GNU General
|
||||
@@ -73,8 +73,8 @@
|
||||
class TQPopupMenu;
|
||||
|
||||
#ifndef QT_H
|
||||
-#include "ntqframe.h"
|
||||
-#include "ntqstring.h"
|
||||
+#include "tqframe.h"
|
||||
+#include "tqstring.h"
|
||||
#endif // QT_H
|
||||
|
||||
class TQTextParagraph;
|
||||
--- a/tqt/secqstring.cpp
|
||||
+++ b/tqt/secqstring.cpp
|
||||
@@ -138,7 +138,7 @@
|
||||
and join a list of strings into a single string with an optional
|
||||
separator using SecTQStringList::join(). You can obtain a list of
|
||||
strings from a string list that contain a particular substring or
|
||||
- that match a particular \link ntqregexp.html regex\endlink using
|
||||
+ that match a particular \link tqregexp.html regex\endlink using
|
||||
SecTQStringList::grep().
|
||||
|
||||
<b>Note for C programmers</b>
|
||||
--- a/tqt/secqstring.h
|
||||
+++ b/tqt/secqstring.h
|
||||
@@ -1,8 +1,8 @@
|
||||
-/* secntqstring.h - Secure version of TQString.
|
||||
+/* sectqstring.h - Secure version of TQString.
|
||||
* Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
|
||||
* Copyright (C) 2003 g10 Code GmbH
|
||||
*
|
||||
- * The license of the original ntqstring.h file from which this file is
|
||||
+ * The license of the original tqstring.h file from which this file is
|
||||
* derived can be found below. Modified by Marcus Brinkmann
|
||||
* <marcus@g10code.de>. All modifications are licensed as follows, so
|
||||
* that the intersection of the two licenses is then the GNU General
|
||||
@@ -71,10 +71,10 @@
|
||||
/* We need the original qchar and qstring for transparent conversion
|
||||
from TQChar to TQChar and TQString to SecTQString (but not the other
|
||||
way round). */
|
||||
-#include <ntqstring.h>
|
||||
+#include <tqstring.h>
|
||||
|
||||
#ifndef QT_H
|
||||
-#include "ntqcstring.h"
|
||||
+#include "tqcstring.h"
|
||||
#endif // QT_H
|
||||
|
||||
|
||||
Loading…
Reference in New Issue