summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-12 21:14:17 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-12 21:14:17 +0000
commit58cfbf297a9ea1656e861eba6bbcda8b9791497e (patch)
treefbd66e57f807d61405e9be2082fb721ea31480e3
parente6e12dd07c6670d8758788e4955ad743b4b9e888 (diff)
downloadtdelibs-58cfbf29.tar.gz
tdelibs-58cfbf29.zip
Fixed a few minor compilation errors
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1162855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdecore/kpalette.cpp4
-rw-r--r--kdecore/kstandarddirs.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/kdecore/kpalette.cpp b/kdecore/kpalette.cpp
index bc446367a..6dc1800f1 100644
--- a/kdecore/kpalette.cpp
+++ b/kdecore/kpalette.cpp
@@ -65,10 +65,10 @@ KPalette::KPalette(const TQString &name)
// Read first line
// Expected "GIMP Palette"
- if (paletteFile.readLine(line.ascii(), maxLength) == -1) return;
+ if (paletteFile.readLine(const_cast<char *>(line.ascii()), maxLength) == -1) return;
if (line.find(" Palette") == -1) return;
- while( paletteFile.readLine(line.ascii(), maxLength) != -1)
+ while( paletteFile.readLine(const_cast<char *>(line.ascii()), maxLength) != -1)
{
if (line[0] == '#')
{
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
index f64acbd90..34af28657 100644
--- a/kdecore/kstandarddirs.cpp
+++ b/kdecore/kstandarddirs.cpp
@@ -492,7 +492,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
while( ( ep = readdir( dp ) ) != 0L )
{
TQString fn( TQFile::decodeName(ep->d_name));
- if (fn == _dot || fn == _dotdot || (TQCString)(fn.at(fn.length() - 1).latin1()) == (QChar)'~')
+ if (fn == _dot || fn == _dotdot || (TQCString)(fn.at(fn.length() - 1).latin1()) == '~')
continue;
if (!recursive && !regexp.exactMatch(fn))