TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

Browse Source
pull/16/head
Automated System 12 years ago
parent de1db784f3 fc3c9d3c5f
commit 1053cdc43c
23 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
dcop/dcopidlng/kalyptus
Unescape View File

@ -111,7 +111,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
QT_NO_REMOTE => 'QT_NO_REMOTE', QT_NO_REMOTE => 'QT_NO_REMOTE',
QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
Q_WS_X11 => 'Q_WS_X11', Q_WS_X11 => 'Q_WS_X11',
Q_DISABLE_COPY => 'Q_DISABLE_COPY', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
Q_WS_QWS => 'undef', Q_WS_QWS => 'undef',
Q_WS_MAC => 'undef', Q_WS_MAC => 'undef',
Q_OBJECT => <<'CODE', Q_OBJECT => <<'CODE',
@ -713,7 +713,7 @@ sub identifyDecl
elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template
\s*(class|struct|union|namespace) # 2 struct type \s*(class|struct|union|namespace) # 2 struct type
\s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export \s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export
(?:\s*Q_PACKED)? (?:\s*TQ_PACKED)?
(?:\s*Q_REFCOUNT)? (?:\s*Q_REFCOUNT)?
\s+([\w_]+ # 4 name \s+([\w_]+ # 4 name
(?:<[\w_ :,]+?>)? # maybe explicit template (?:<[\w_ :,]+?>)? # maybe explicit template

2
dcop/kdatastream.h
Unescape View File

@ -19,7 +19,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b)
} }
#endif // USE_QT3 #endif // USE_QT3
#if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) #if TQT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
inline TQDataStream & operator << (TQDataStream & str, long long int ll) inline TQDataStream & operator << (TQDataStream & str, long long int ll)
{ {
TQ_UINT32 l1,l2; TQ_UINT32 l1,l2;

6
kab/addressbook.cc
Unescape View File

@ -162,7 +162,7 @@ bool AddressBook::Entry::Address::nameOfField(const char* key, TQString& value)
// as fields is static // as fields is static
int counter=0; int counter=0;
fields=new KeyNameMap; fields=new KeyNameMap;
Q_CHECK_PTR(fields); TQ_CHECK_PTR(fields);
if(!fields->insert if(!fields->insert
(map<const char*, TQString, less<const char*> >::value_type (map<const char*, TQString, less<const char*> >::value_type
(Fields[counter++], i18n("Headline"))).second (Fields[counter++], i18n("Headline"))).second
@ -257,7 +257,7 @@ bool AddressBook::Entry::nameOfField(const char* key, TQString& value)
// as fields is static // as fields is static
int counter=0; int counter=0;
fields=new KeyNameMap; fields=new KeyNameMap;
Q_CHECK_PTR(fields); TQ_CHECK_PTR(fields);
if(!fields->insert if(!fields->insert
(map<const char*, TQString, less<const char*> >::value_type (map<const char*, TQString, less<const char*> >::value_type
(Fields[counter++], i18n("person","Title"))).second (Fields[counter++], i18n("person","Title"))).second
@ -2003,7 +2003,7 @@ AddressBook::ErrorCode AddressBook::categories(CategoriesMap& cat)
StringStringMap::iterator pos; StringStringMap::iterator pos;
// ----- query categories section: // ----- query categories section:
section=categoriesSection(); section=categoriesSection();
Q_CHECK_PTR(section); TQ_CHECK_PTR(section);
// ----- // -----
if(!section->find(KAB_CATEGORY_KEY, categories)) if(!section->find(KAB_CATEGORY_KEY, categories))
{ {

4
kab/kabapi.cc
Unescape View File

@ -39,7 +39,7 @@ KabAPI::KabAPI(TQWidget* parent, const char* name)
listbox(new KListBox(this)), listbox(new KListBox(this)),
selection(-1) selection(-1)
{ {
Q_CHECK_PTR(listbox); TQ_CHECK_PTR(listbox);
setMainWidget(listbox); setMainWidget(listbox);
showButtonApply(false); showButtonApply(false);
enableButtonSeparator(true); enableButtonSeparator(true);
@ -141,7 +141,7 @@ AddressBook::ErrorCode KabAPI::add(const AddressBook::Entry& entry, KabKey& key,
AddressBook::ErrorCode KabAPI::remove(const KabKey& key) AddressBook::ErrorCode KabAPI::remove(const KabKey& key)
{ {
Q_CHECK_PTR(book); TQ_CHECK_PTR(book);
// ############################################################################ // ############################################################################
if(book->AddressBook::remove(key)==AddressBook::NoError) if(book->AddressBook::remove(key)==AddressBook::NoError)
{ {

4
kate/data/cpp.xml
Unescape View File

@ -87,7 +87,7 @@
<item> Q_ARG </item> <item> Q_ARG </item>
<item> Q_ASSERT </item> <item> Q_ASSERT </item>
<item> Q_ASSERT_X </item> <item> Q_ASSERT_X </item>
<item> Q_CHECK_PTR </item> <item> TQ_CHECK_PTR </item>
<item> Q_CLASSINFO </item> <item> Q_CLASSINFO </item>
<item> Q_CLEANUP_RESOURCE </item> <item> Q_CLEANUP_RESOURCE </item>
<item> Q_D </item> <item> Q_D </item>
@ -100,7 +100,7 @@
<item> Q_DECLARE_PUBLIC </item> <item> Q_DECLARE_PUBLIC </item>
<item> Q_DECLARE_SHARED </item> <item> Q_DECLARE_SHARED </item>
<item> Q_DECLARE_TYPEINFO </item> <item> Q_DECLARE_TYPEINFO </item>
<item> Q_DISABLE_COPY </item> <item> TQ_DISABLE_COPY </item>
<item> Q_ENUMS </item> <item> Q_ENUMS </item>
<item> Q_EXPORT </item> <item> Q_EXPORT </item>
<item> Q_FLAGS </item> <item> Q_FLAGS </item>

2
kate/data/objectivecpp.xml
Unescape View File

@ -109,7 +109,7 @@
<item> Q_DECLARE_PUBLIC </item> <item> Q_DECLARE_PUBLIC </item>
<item> Q_D </item> <item> Q_D </item>
<item> Q_Q </item> <item> Q_Q </item>
<item> Q_DISABLE_COPY </item> <item> TQ_DISABLE_COPY </item>
<item> Q_INTERFACES </item> <item> Q_INTERFACES </item>
<item> Q_FLAGS </item> <item> Q_FLAGS </item>
<item> Q_SCRIPTABLE </item> <item> Q_SCRIPTABLE </item>

2
khtml/test_regression_fontoverload.cpp
Unescape View File

@ -245,7 +245,7 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
// fe->setScale( scale ); // fe->setScale( scale );
QFontCache::Key key( request, script, fp->screen QFontCache::Key key( request, script, fp->screen
#if QT_VERSION >= 0x030308 #if TQT_VERSION >= 0x030308
, fp->paintdevice , fp->paintdevice
#endif #endif
); );

2
kio/kfile/kdiskfreesp.cpp
Unescape View File

@ -46,7 +46,7 @@
KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name)
: TQObject(parent,name) : TQObject(parent,name)
{ {
dfProc = new KProcess(); Q_CHECK_PTR(dfProc); dfProc = new KProcess(); TQ_CHECK_PTR(dfProc);
dfProc->setEnvironment("LANGUAGE", "C"); dfProc->setEnvironment("LANGUAGE", "C");
connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ), connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) ); this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) );

2
kstyles/klegacy/klegacystyle.h
Unescape View File

@ -137,7 +137,7 @@ protected:
private: private:
KLegacyStylePrivate *priv; KLegacyStylePrivate *priv;
#if defined(Q_DISABLE_COPY) #if defined(TQ_DISABLE_COPY)
KLegacyStyle( const KLegacyStyle & ); KLegacyStyle( const KLegacyStyle & );
KLegacyStyle& operator=( const KLegacyStyle & ); KLegacyStyle& operator=( const KLegacyStyle & );
#endif #endif

2
tdecore/kkeyserver_x11.cpp
Unescape View File

@ -234,7 +234,7 @@ static const TransKey g_rgQtToSymX[] =
{ '-', XK_KP_Subtract }, { '-', XK_KP_Subtract },
{ '+', XK_KP_Add }, { '+', XK_KP_Add },
{ Qt::Key_Return, XK_KP_Enter } { Qt::Key_Return, XK_KP_Enter }
#if QT_VERSION >= 0x030100 #if TQT_VERSION >= 0x030100
// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
// multimedia keys. They are included here as not every system has them. // multimedia keys. They are included here as not every system has them.

6
tdecore/kprocess.cpp
Unescape View File

@ -957,7 +957,7 @@ int KProcess::commSetupDoneP()
if (communication & Stdin) { if (communication & Stdin) {
fcntl(in[1], F_SETFL, O_NONBLOCK | fcntl(in[1], F_GETFL)); fcntl(in[1], F_SETFL, O_NONBLOCK | fcntl(in[1], F_GETFL));
innot = new TQSocketNotifier(in[1], TQSocketNotifier::Write, this); innot = new TQSocketNotifier(in[1], TQSocketNotifier::Write, this);
Q_CHECK_PTR(innot); TQ_CHECK_PTR(innot);
innot->setEnabled(false); // will be enabled when data has to be sent innot->setEnabled(false); // will be enabled when data has to be sent
TQObject::connect(innot, TQT_SIGNAL(activated(int)), TQObject::connect(innot, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotSendData(int))); this, TQT_SLOT(slotSendData(int)));
@ -965,7 +965,7 @@ int KProcess::commSetupDoneP()
if (communication & Stdout) { if (communication & Stdout) {
outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this); outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this);
Q_CHECK_PTR(outnot); TQ_CHECK_PTR(outnot);
TQObject::connect(outnot, TQT_SIGNAL(activated(int)), TQObject::connect(outnot, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotChildOutput(int))); this, TQT_SLOT(slotChildOutput(int)));
if (communication & NoRead) if (communication & NoRead)
@ -974,7 +974,7 @@ int KProcess::commSetupDoneP()
if (communication & Stderr) { if (communication & Stderr) {
errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this ); errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this );
Q_CHECK_PTR(errnot); TQ_CHECK_PTR(errnot);
TQObject::connect(errnot, TQT_SIGNAL(activated(int)), TQObject::connect(errnot, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotChildError(int))); this, TQT_SLOT(slotChildError(int)));
} }

2
tdecore/libqt-mt.nmcheck
Unescape View File

@ -9,7 +9,7 @@ qDebug
qFatal qFatal
qWarning qWarning
qApp qApp
qAppName tqAppName
qVersion qVersion
qSysInfo qSysInfo
qObsolete qObsolete

6
tdecore/libqt-mt_weak.nmcheck
Unescape View File

@ -5,7 +5,7 @@ Q*::*
qstrcmp qstrcmp
qstrcpy qstrcpy
qstrlen tqstrlen
qAlpha qAlpha
qRed qRed
qGreen qGreen
@ -13,8 +13,8 @@ qBlue
qGray qGray
qRgba qRgba
qRgb qRgb
qSwap tqSwap
qCopy tqCopy
qHeapSort qHeapSort
qHeapSortHelper qHeapSortHelper
qHeapSortPushDown qHeapSortPushDown

4
tdecore/tests/kurltest.cpp
Unescape View File

@ -816,7 +816,7 @@ int main(int argc, char *argv[])
check("host",ulong.host(),"swww.gad.de"); check("host",ulong.host(),"swww.gad.de");
check("path",ulong.path(),"/servlet/CookieAccepted"); check("path",ulong.path(),"/servlet/CookieAccepted");
#if QT_VERSION < 300 #if TQT_VERSION < 300
qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) );
#else #else
TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) );
@ -861,7 +861,7 @@ int main(int argc, char *argv[])
testAdjustPath(); testAdjustPath();
#if QT_VERSION < 300 #if TQT_VERSION < 300
qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) ); qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) );
#else #else
TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) ); TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) );

2
tdefx/kstyle.cpp
Unescape View File

@ -597,7 +597,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
else else
// General handle, probably a kicker applet handle. // General handle, probably a kicker applet handle.
drawKStylePrimitive( KPE_GeneralHandle, p, widget, r, cg, flags, opt ); drawKStylePrimitive( KPE_GeneralHandle, p, widget, r, cg, flags, opt );
#if QT_VERSION >= 0x030300 #if TQT_VERSION >= 0x030300
#ifdef HAVE_XRENDER #ifdef HAVE_XRENDER
} else if ( d->semiTransparentRubberband && pe == TQStyle::PE_RubberBand ) { } else if ( d->semiTransparentRubberband && pe == TQStyle::PE_RubberBand ) {
TQRect rect = r.normalize(); TQRect rect = r.normalize();

12
tdeprint/kmfactory.cpp
Unescape View File

@ -96,7 +96,7 @@ KMFactory::KMFactory()
m_implementation = 0; m_implementation = 0;
m_factory = 0; m_factory = 0;
m_printconfig = 0; m_printconfig = 0;
#if QT_VERSION >= 230 #if TQT_VERSION >= 230
// Qt's default behavior, to generate EPS in some cases and not in others, sucks. // Qt's default behavior, to generate EPS in some cases and not in others, sucks.
// This is fixed in Qt 3.0, but for Qt 2.x we need to disable it explicitly. // This is fixed in Qt 3.0, but for Qt 2.x we need to disable it explicitly.
// If this is a problem for anyone, we can add a public method to set this flag. // If this is a problem for anyone, we can add a public method to set this flag.
@ -134,7 +134,7 @@ KMManager* KMFactory::manager()
{ {
if (!m_manager) if (!m_manager)
createManager(); createManager();
Q_CHECK_PTR(m_manager); TQ_CHECK_PTR(m_manager);
return m_manager; return m_manager;
} }
@ -142,7 +142,7 @@ KMJobManager* KMFactory::jobManager()
{ {
if (!m_jobmanager) if (!m_jobmanager)
createJobManager(); createJobManager();
Q_CHECK_PTR(m_jobmanager); TQ_CHECK_PTR(m_jobmanager);
return m_jobmanager; return m_jobmanager;
} }
@ -150,7 +150,7 @@ KMUiManager* KMFactory::uiManager()
{ {
if (!m_uimanager) if (!m_uimanager)
createUiManager(); createUiManager();
Q_CHECK_PTR(m_uimanager); TQ_CHECK_PTR(m_uimanager);
return m_uimanager; return m_uimanager;
} }
@ -158,7 +158,7 @@ KPrinterImpl* KMFactory::printerImplementation()
{ {
if (!m_implementation) if (!m_implementation)
createPrinterImpl(); createPrinterImpl();
Q_CHECK_PTR(m_implementation); TQ_CHECK_PTR(m_implementation);
return m_implementation; return m_implementation;
} }
@ -229,7 +229,7 @@ KConfig* KMFactory::printConfig(const TQString& group)
if (!m_printconfig) if (!m_printconfig)
{ {
m_printconfig = new KConfig("tdeprintrc"); m_printconfig = new KConfig("tdeprintrc");
Q_CHECK_PTR(m_printconfig); TQ_CHECK_PTR(m_printconfig);
} }
if (!group.isEmpty()) if (!group.isEmpty())
m_printconfig->setGroup(group); m_printconfig->setGroup(group);

4
tdeprint/kmmanager.cpp
Unescape View File

@ -47,9 +47,9 @@ KMManager::KMManager(TQObject *parent, const char *name)
m_printerfilter = new PrinterFilter(this); m_printerfilter = new PrinterFilter(this);
m_specialmgr = new KMSpecialManager(this); m_specialmgr = new KMSpecialManager(this);
Q_CHECK_PTR(m_specialmgr); TQ_CHECK_PTR(m_specialmgr);
m_virtualmgr = new KMVirtualManager(this); m_virtualmgr = new KMVirtualManager(this);
Q_CHECK_PTR(m_virtualmgr); TQ_CHECK_PTR(m_virtualmgr);
// set default to true to not disturb code that // set default to true to not disturb code that
// hasn't been adapted yet. Otherwise, should be false // hasn't been adapted yet. Otherwise, should be false

2
tdeprint/kxmlcommand.cpp
Unescape View File

@ -555,7 +555,7 @@ KXmlCommandManager* KXmlCommandManager::self()
if (!m_self) if (!m_self)
{ {
m_self = new KXmlCommandManager; m_self = new KXmlCommandManager;
Q_CHECK_PTR(m_self); TQ_CHECK_PTR(m_self);
} }
return m_self; return m_self;
} }

2
tdeprint/management/kmdriverdb.cpp
Unescape View File

@ -38,7 +38,7 @@ KMDriverDB* KMDriverDB::self()
if (!m_self) if (!m_self)
{ {
m_self = new KMDriverDB(); m_self = new KMDriverDB();
Q_CHECK_PTR(m_self); TQ_CHECK_PTR(m_self);
} }
return m_self; return m_self;
} }

2
tdeprint/management/kmtimer.cpp
Unescape View File

@ -29,7 +29,7 @@ KMTimer* KMTimer::self()
if (!m_self) if (!m_self)
{ {
m_self = new KMTimer(KMFactory::self(), "InternalTimer"); m_self = new KMTimer(KMFactory::self(), "InternalTimer");
Q_CHECK_PTR(m_self); TQ_CHECK_PTR(m_self);
} }
return m_self; return m_self;
} }

4
tdeui/kcursor.cpp
Unescape View File

@ -78,7 +78,7 @@ TQCursor KCursor::handCursor()
hand_cursor = new TQCursor(PointingHandCursor); hand_cursor = new TQCursor(PointingHandCursor);
} }
Q_CHECK_PTR(hand_cursor); TQ_CHECK_PTR(hand_cursor);
return *hand_cursor; return *hand_cursor;
} }
@ -135,7 +135,7 @@ TQCursor KCursor::workingCursor()
working_cursor->handle(); working_cursor->handle();
} }
Q_CHECK_PTR(working_cursor); TQ_CHECK_PTR(working_cursor);
return *working_cursor; return *working_cursor;
} }

2
tdeui/kxmlguifactory.cpp
Unescape View File

@ -125,7 +125,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
return TQString::null; return TQString::null;
} }
#if QT_VERSION <= 0x030302 #if TQT_VERSION <= 0x030302
// Work around bug in TQString::fromUtf8 (which calls strlen). // Work around bug in TQString::fromUtf8 (which calls strlen).
TQByteArray buffer(file.size() + 1); TQByteArray buffer(file.size() + 1);
buffer = file.readAll(); buffer = file.readAll();

4
win/qeventloopex.cpp
Unescape View File

@ -186,13 +186,13 @@ void QEventLoopEx::registerSocketNotifier( TQSocketNotifier *notifier )
if ( ! list ) { if ( ! list ) {
// create new list, the QSockNotType destructor will delete it for us // create new list, the QSockNotType destructor will delete it for us
list = new TQPtrList<QSockNotEx>; list = new TQPtrList<QSockNotEx>;
Q_CHECK_PTR( list ); TQ_CHECK_PTR( list );
list->setAutoDelete( TRUE ); list->setAutoDelete( TRUE );
d->sn_vec[type].list = list; d->sn_vec[type].list = list;
} }
sn = new QSockNotEx; sn = new QSockNotEx;
Q_CHECK_PTR( sn ); TQ_CHECK_PTR( sn );
sn->obj = notifier; sn->obj = notifier;
sn->fd = sockfd; sn->fd = sockfd;
sn->queue = &d->sn_vec[type].pending_fds; sn->queue = &d->sn_vec[type].pending_fds;

Write Preview
Loading…
Cancel
Save