* More TQt/Qt4 features

* Various compilation fixes for Slackware


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1170159 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent c0093442ec
commit a3beaa08c4

@ -1214,7 +1214,7 @@ void KApplication::commitData( QSessionManager& sm )
if ( sm.allowsInteraction() ) { if ( sm.allowsInteraction() ) {
TQWidgetList done; TQWidgetList done;
TQWidgetList *list = TQApplication::topLevelWidgets(); TQWidgetList *list = TQWidgetList(TQApplication::topLevelWidgets());
bool canceled = false; bool canceled = false;
TQWidget* w = list->first(); TQWidget* w = list->first();
while ( !canceled && w ) { while ( !canceled && w ) {
@ -1225,7 +1225,7 @@ void KApplication::commitData( QSessionManager& sm )
if ( !canceled ) if ( !canceled )
done.append( w ); done.append( w );
delete list; // one never knows... delete list; // one never knows...
list = TQApplication::topLevelWidgets(); list = TQWidgetList(TQApplication::topLevelWidgets());
w = list->first(); w = list->first();
} else { } else {
w = list->next(); w = list->next();

@ -316,7 +316,7 @@ KDesktopFile::fileName() const { return backEnd->fileName(); }
QString QString
KDesktopFile::resource() const { return backEnd->resource(); } KDesktopFile::resource() const { return backEnd->resource(); }
QStringList TQStringList
KDesktopFile::sortOrder() const KDesktopFile::sortOrder() const
{ {
return readListEntry("SortOrder"); return readListEntry("SortOrder");

@ -16,6 +16,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqvaluelist.h>
#include "kdelibs_export.h" #include "kdelibs_export.h"
class KConfig; class KConfig;

@ -30,7 +30,7 @@
template class TQPtrList<KPalette::kolor>; template class TQPtrList<KPalette::kolor>;
QStringList TQStringList
KPalette::getPaletteList() KPalette::getPaletteList()
{ {
TQStringList paletteList; TQStringList paletteList;

@ -31,7 +31,12 @@
class TQSocketNotifier; class TQSocketNotifier;
class KProcessPrivate; class KProcessPrivate;
#ifdef Q_OS_UNIX
#include <kpty.h>
#else
class KPty; class KPty;
#endif
/** /**
* Child process invocation, monitoring and control. * Child process invocation, monitoring and control.

@ -25,11 +25,11 @@
#include "kdelibs_export.h" #include "kdelibs_export.h"
/** /**
* KSortableItem is a QPair that provides several operators * KSortableItem is a TQPair that provides several operators
* for sorting. * for sorting.
* @see KSortableValueList * @see KSortableValueList
*/ */
template<class T, class Key = int> class KSortableItem : public QPair<Key,T> template<class T, class Key = int> class KSortableItem : public TQPair<Key,T>
{ {
public: public:
/** /**
@ -37,13 +37,13 @@ public:
* @param i the first value * @param i the first value
* @param t the second value * @param t the second value
*/ */
KSortableItem( Key i, const T& t ) : QPair<Key, T>( i, t ) {} KSortableItem( Key i, const T& t ) : TQPair<Key, T>( i, t ) {}
/** /**
* Creates a new KSortableItem that copies another one. * Creates a new KSortableItem that copies another one.
* @param rhs the other item to copy * @param rhs the other item to copy
*/ */
KSortableItem( const KSortableItem<T, Key> &rhs ) KSortableItem( const KSortableItem<T, Key> &rhs )
: QPair<Key,T>( rhs.first, rhs.second ) {} : TQPair<Key,T>( rhs.first, rhs.second ) {}
/** /**
* Creates a new KSortableItem with uninitialized values. * Creates a new KSortableItem with uninitialized values.

@ -616,7 +616,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
} }
} }
QStringList TQStringList
KStandardDirs::findAllResources( const char *type, KStandardDirs::findAllResources( const char *type,
const TQString& filter, const TQString& filter,
bool recursive, bool recursive,
@ -672,7 +672,7 @@ KStandardDirs::findAllResources( const char *type,
return list; return list;
} }
QStringList TQStringList
KStandardDirs::findAllResources( const char *type, KStandardDirs::findAllResources( const char *type,
const TQString& filter, const TQString& filter,
bool recursive, bool recursive,

@ -448,7 +448,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
return ( filename == pattern ); return ( filename == pattern );
} }
QStringList TQStringList
KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max) KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
{ {
bool ignoreMax = 0 == max; bool ignoreMax = 0 == max;
@ -474,7 +474,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
return l; return l;
} }
QStringList TQStringList
KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max) KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
{ {
bool ignoreMax = 0 == max; bool ignoreMax = 0 == max;
@ -500,7 +500,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
return l; return l;
} }
QStringList TQStringList
KStringHandler::perlSplit(const TQRegExp & sep, const TQString & s, uint max) KStringHandler::perlSplit(const TQRegExp & sep, const TQString & s, uint max)
{ {
bool ignoreMax = 0 == max; bool ignoreMax = 0 == max;

Loading…
Cancel
Save