summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-30 23:26:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-30 23:26:07 +0000
commita3beaa08c4d5275d67447e2ed4e9a1bd2a4c3050 (patch)
tree027a7ec3076c84b189236a4b85d37a9357959fa7
parentc0093442ecd61ebdd46f2f682b9f9a3e338677c7 (diff)
downloadtdelibs-a3beaa08c4d5275d67447e2ed4e9a1bd2a4c3050.tar.gz
tdelibs-a3beaa08c4d5275d67447e2ed4e9a1bd2a4c3050.zip
* 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
-rw-r--r--kdecore/kapplication.cpp4
-rw-r--r--kdecore/kdesktopfile.cpp2
-rw-r--r--kdecore/kicontheme.h1
-rw-r--r--kdecore/kpalette.cpp2
-rw-r--r--kdecore/kprocess.h5
-rw-r--r--kdecore/ksortablevaluelist.h8
-rw-r--r--kdecore/kstandarddirs.cpp4
-rw-r--r--kdecore/kstringhandler.cpp6
8 files changed, 19 insertions, 13 deletions
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index 8edc1d170..7d205e055 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -1214,7 +1214,7 @@ void KApplication::commitData( QSessionManager& sm )
if ( sm.allowsInteraction() ) {
TQWidgetList done;
- TQWidgetList *list = TQApplication::topLevelWidgets();
+ TQWidgetList *list = TQWidgetList(TQApplication::topLevelWidgets());
bool canceled = false;
TQWidget* w = list->first();
while ( !canceled && w ) {
@@ -1225,7 +1225,7 @@ void KApplication::commitData( QSessionManager& sm )
if ( !canceled )
done.append( w );
delete list; // one never knows...
- list = TQApplication::topLevelWidgets();
+ list = TQWidgetList(TQApplication::topLevelWidgets());
w = list->first();
} else {
w = list->next();
diff --git a/kdecore/kdesktopfile.cpp b/kdecore/kdesktopfile.cpp
index 915b73429..c8a98e973 100644
--- a/kdecore/kdesktopfile.cpp
+++ b/kdecore/kdesktopfile.cpp
@@ -316,7 +316,7 @@ KDesktopFile::fileName() const { return backEnd->fileName(); }
QString
KDesktopFile::resource() const { return backEnd->resource(); }
-QStringList
+TQStringList
KDesktopFile::sortOrder() const
{
return readListEntry("SortOrder");
diff --git a/kdecore/kicontheme.h b/kdecore/kicontheme.h
index 06c9aea5e..3a1f14fa4 100644
--- a/kdecore/kicontheme.h
+++ b/kdecore/kicontheme.h
@@ -16,6 +16,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqptrlist.h>
+#include <tqvaluelist.h>
#include "kdelibs_export.h"
class KConfig;
diff --git a/kdecore/kpalette.cpp b/kdecore/kpalette.cpp
index 49cacc79b..777340ea6 100644
--- a/kdecore/kpalette.cpp
+++ b/kdecore/kpalette.cpp
@@ -30,7 +30,7 @@
template class TQPtrList<KPalette::kolor>;
-QStringList
+TQStringList
KPalette::getPaletteList()
{
TQStringList paletteList;
diff --git a/kdecore/kprocess.h b/kdecore/kprocess.h
index 320a2d1b7..51366e3e4 100644
--- a/kdecore/kprocess.h
+++ b/kdecore/kprocess.h
@@ -31,7 +31,12 @@
class TQSocketNotifier;
class KProcessPrivate;
+
+#ifdef Q_OS_UNIX
+#include <kpty.h>
+#else
class KPty;
+#endif
/**
* Child process invocation, monitoring and control.
diff --git a/kdecore/ksortablevaluelist.h b/kdecore/ksortablevaluelist.h
index fc164bf07..3f7885ca4 100644
--- a/kdecore/ksortablevaluelist.h
+++ b/kdecore/ksortablevaluelist.h
@@ -25,11 +25,11 @@
#include "kdelibs_export.h"
/**
- * KSortableItem is a QPair that provides several operators
+ * KSortableItem is a TQPair that provides several operators
* for sorting.
* @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:
/**
@@ -37,13 +37,13 @@ public:
* @param i the first 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.
* @param rhs the other item to copy
*/
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.
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
index 15b661676..2568dc7df 100644
--- a/kdecore/kstandarddirs.cpp
+++ b/kdecore/kstandarddirs.cpp
@@ -616,7 +616,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
}
}
-QStringList
+TQStringList
KStandardDirs::findAllResources( const char *type,
const TQString& filter,
bool recursive,
@@ -672,7 +672,7 @@ KStandardDirs::findAllResources( const char *type,
return list;
}
-QStringList
+TQStringList
KStandardDirs::findAllResources( const char *type,
const TQString& filter,
bool recursive,
diff --git a/kdecore/kstringhandler.cpp b/kdecore/kstringhandler.cpp
index 3184c18e2..3c13a9b57 100644
--- a/kdecore/kstringhandler.cpp
+++ b/kdecore/kstringhandler.cpp
@@ -448,7 +448,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
return ( filename == pattern );
}
- QStringList
+ TQStringList
KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
{
bool ignoreMax = 0 == max;
@@ -474,7 +474,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
return l;
}
- QStringList
+ TQStringList
KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
{
bool ignoreMax = 0 == max;
@@ -500,7 +500,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
return l;
}
- QStringList
+ TQStringList
KStringHandler::perlSplit(const TQRegExp & sep, const TQString & s, uint max)
{
bool ignoreMax = 0 == max;