summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--pics/crystalsvg/cr16-app-accessories-character-map.pngbin159 -> 172 bytes
-rw-r--r--pics/crystalsvg/cr22-app-accessories-character-map.pngbin828 -> 664 bytes
-rw-r--r--pics/crystalsvg/cr32-app-accessories-character-map.pngbin1260 -> 949 bytes
-rw-r--r--pics/crystalsvg/cr48-app-accessories-character-map.pngbin1244 -> 899 bytes
-rw-r--r--tdecore/tdeconfigbackend.cpp76
-rw-r--r--tdeioslave/iso/iso.cpp2
-rw-r--r--tdeioslave/iso/kiso.cpp28
-rw-r--r--tdeioslave/iso/qfilehack.h2
-rwxr-xr-xtdeprint/pics/tdeprint_landscape.pngbin954 -> 937 bytes
-rwxr-xr-xtdeprint/pics/tdeprint_portrait.pngbin982 -> 964 bytes
-rwxr-xr-xtdeprint/pics/tdeprint_revlandscape.pngbin940 -> 929 bytes
-rwxr-xr-xtdeprint/pics/tdeprint_revportrait.pngbin963 -> 960 bytes
13 files changed, 26 insertions, 84 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index baecceb88..2aeda5792 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ include( TDESetupPaths )
##### setup and find essential stuff ############
tde_setup_paths( )
-tde_setup_architecture_flags( )
+tde_setup_compiler_flags( )
enable_testing( )
find_package( TQt )
diff --git a/pics/crystalsvg/cr16-app-accessories-character-map.png b/pics/crystalsvg/cr16-app-accessories-character-map.png
index 26a5724f8..5efaa44bd 100644
--- a/pics/crystalsvg/cr16-app-accessories-character-map.png
+++ b/pics/crystalsvg/cr16-app-accessories-character-map.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-app-accessories-character-map.png b/pics/crystalsvg/cr22-app-accessories-character-map.png
index d416fcf36..de92bbbd8 100644
--- a/pics/crystalsvg/cr22-app-accessories-character-map.png
+++ b/pics/crystalsvg/cr22-app-accessories-character-map.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-app-accessories-character-map.png b/pics/crystalsvg/cr32-app-accessories-character-map.png
index ea4370592..93617e567 100644
--- a/pics/crystalsvg/cr32-app-accessories-character-map.png
+++ b/pics/crystalsvg/cr32-app-accessories-character-map.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-app-accessories-character-map.png b/pics/crystalsvg/cr48-app-accessories-character-map.png
index d56136608..a52790297 100644
--- a/pics/crystalsvg/cr48-app-accessories-character-map.png
+++ b/pics/crystalsvg/cr48-app-accessories-character-map.png
Binary files differ
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 707f4fe69..c7944ed12 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -431,80 +431,23 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
return true;
}
-#ifdef HAVE_MMAP
-#ifdef SIGBUS
-static sigjmp_buf mmap_jmpbuf;
-struct sigaction mmap_old_sigact;
-
-extern "C" {
- static void mmap_sigbus_handler(int)
- {
- siglongjmp (mmap_jmpbuf, 1);
- }
-}
-#endif
-#endif
-
extern bool kde_kiosk_exception;
void TDEConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
KEntryMap *pWriteBackMap,
bool bGlobal, bool bDefault)
{
- const char *s; // May get clobbered by sigsetjump, but we don't use them afterwards.
- const char *eof; // May get clobbered by sigsetjump, but we don't use them afterwards.
- TQByteArray data;
-
if (!rFile.isOpen()) // come back, if you have real work for us ;->
return;
- //using kdDebug() here leads to an infinite loop
- //remove this for the release, aleXXX
- //tqWarning("Parsing %s, global = %s default = %s",
- // rFile.name().latin1(), bGlobal ? "true" : "false", bDefault ? "true" : "false");
-
TQCString aCurrentGroup("<default>");
unsigned int ll = localeString.length();
-#ifdef HAVE_MMAP
- static volatile const char *map;
- map = ( const char* ) mmap(0, rFile.size(), PROT_READ, MAP_PRIVATE,
- rFile.handle(), 0);
-
- if ( map != MAP_FAILED )
- {
- s = (const char*) map;
- eof = s + rFile.size();
-
-#ifdef SIGBUS
- struct sigaction act;
- act.sa_handler = mmap_sigbus_handler;
- sigemptyset( &act.sa_mask );
-#ifdef SA_ONESHOT
- act.sa_flags = SA_ONESHOT;
-#else
- act.sa_flags = SA_RESETHAND;
-#endif
- sigaction( SIGBUS, &act, &mmap_old_sigact );
-
- if (sigsetjmp (mmap_jmpbuf, 1))
- {
-tqWarning("SIGBUS while reading %s", rFile.name().latin1());
- munmap(( char* )map, rFile.size());
- sigaction (SIGBUS, &mmap_old_sigact, 0);
- return;
- }
-#endif
- }
- else
-#endif
- {
- rFile.at(0);
- data = rFile.readAll();
- s = data.data();
- eof = s + data.size();
- }
+ rFile.at(0);
+ TQByteArray data = rFile.readAll();
+ const char *s = data.data();
+ const char *eof = s + data.size();
bool fileOptionImmutable = false;
bool groupOptionImmutable = false;
@@ -757,19 +700,8 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1());
}
}
-
if (fileOptionImmutable)
bFileImmutable = true;
-
-#ifdef HAVE_MMAP
- if (map)
- {
- munmap(( char* )map, rFile.size());
-#ifdef SIGBUS
- sigaction (SIGBUS, &mmap_old_sigact, 0);
-#endif
- }
-#endif
}
void TDEConfigINIBackEnd::translateKey(TDELocale& locale, TQCString currentGroup, TQCString key) {
diff --git a/tdeioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index b088dbb6a..40a7eb738 100644
--- a/tdeioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
@@ -274,7 +274,7 @@ void tdeio_isoProtocol::listDir( const KURL & url )
const KArchiveDirectory* dir;
if (!path.isEmpty() && path != "/")
{
- kdDebug() << TQString(TQString("Looking for entry %1").arg(path)) << endl;
+ kdDebug() << TQString("Looking for entry %1").arg(path) << endl;
const KArchiveEntry* e = root->entry( path );
if ( !e )
{
diff --git a/tdeioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp
index fdd2df413..bcc11810d 100644
--- a/tdeioslave/iso/kiso.cpp
+++ b/tdeioslave/iso/kiso.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
/* This file is heavily based on ktar.cpp from tdelibs (c) David Faure */
-
+
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@@ -125,6 +125,8 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype )
mimetype = "application/x-gzip";
else if ( mimetype == "application/x-tbz" ) // that's a bzipped2 tar file, so ask for bz2 filter
mimetype = "application/x-bzip2";
+ else if ( mimetype == "application/x-txz" ) // that's a xzipped tar file, so ask for xz filter
+ mimetype = "application/x-xz";
else
{
// Something else. Check if it's not really gzip though (e.g. for KOffice docs)
@@ -144,6 +146,14 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype )
if ( fourthByte == 4 )
mimetype = "application/x-zip";
}
+ else if ( firstByte == 0xfd && secondByte == '7' && thirdByte == 'z' )
+ {
+ unsigned char fourthByte = file.getch();
+ unsigned char fifthByte = file.getch();
+ unsigned char sixthByte = file.getch();
+ if ( fourthByte == 'X' && fifthByte == 'Z' && sixthByte == 0)
+ mimetype = "application/x-xz";
+ }
}
}
forced = false;
@@ -155,13 +165,13 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype )
void KIso::prepareDevice( const TQString & filename,
const TQString & mimetype, bool forced )
{
- /* 'hack' for Qt's false assumption that only S_ISREG is seekable */
+ /* 'hack' for TQt's false assumption that only S_ISREG is seekable */
if( "inode/blockdevice" == mimetype )
setDevice( new QFileHack( filename ) );
else
{
- if( "application/x-gzip" == mimetype
- || "application/x-bzip2" == mimetype)
+ if("application/x-gzip" == mimetype || "application/x-bzip2" == mimetype ||
+ "application/x-xz" == mimetype)
forced = true;
TQIODevice *dev = KFilterDev::deviceForFile( filename, mimetype, forced );
@@ -295,7 +305,7 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
boot_entry *be;
TQString path;
KIsoFile *entry;
-
+
entry=new KIsoFile( this, "Catalog", dirent->permissions() & ~S_IFDIR,
dirent->date(), dirent->adate(), dirent->cdate(),
dirent->user(), dirent->group(), TQString::null,
@@ -327,7 +337,7 @@ void KIso::readParams()
TDEConfig *config;
config = new TDEConfig("tdeio_isorc");
-
+
showhidden=config->readBoolEntry("showhidden",false);
showrr=config->readBoolEntry("showrr",true);
delete config;
@@ -373,7 +383,7 @@ bool KIso::openArchive( int mode )
if (trackno==0) trackno=1;
for (i=0;i<trackno;i++) {
- c_b=1;c_i=1;c_j=1;
+ c_b=1;c_i=1;c_j=1;
root=rootDir();
if (trackno>1) {
path=TQString::null;
@@ -397,11 +407,11 @@ bool KIso::openArchive( int mode )
if ( !memcmp(EL_TORITO_ID,bootdesc->system_id,ISODCL(8,39)) ) {
path="El Torito Boot";
if (c_b>1) path += " (" + TQString::number(c_b) + ")";
-
+
dirent = new KIsoDirectory( this, path, access | S_IFDIR,
buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString::null );
root->addEntry(dirent);
-
+
addBoot(bootdesc);
c_b++;
}
diff --git a/tdeioslave/iso/qfilehack.h b/tdeioslave/iso/qfilehack.h
index 3f0b1f6a6..fe43217b2 100644
--- a/tdeioslave/iso/qfilehack.h
+++ b/tdeioslave/iso/qfilehack.h
@@ -23,7 +23,7 @@
/**
*@author Szombathelyi György
- * Qt thinks if a file is not S_IFREG, you cannot seek in it. It's false (what about
+ * TQt thinks if a file is not S_IFREG, you cannot seek in it. It's false (what about
* block devices for example?
*/
diff --git a/tdeprint/pics/tdeprint_landscape.png b/tdeprint/pics/tdeprint_landscape.png
index d374455b3..967d3b9f2 100755
--- a/tdeprint/pics/tdeprint_landscape.png
+++ b/tdeprint/pics/tdeprint_landscape.png
Binary files differ
diff --git a/tdeprint/pics/tdeprint_portrait.png b/tdeprint/pics/tdeprint_portrait.png
index 94556f975..4a9df8298 100755
--- a/tdeprint/pics/tdeprint_portrait.png
+++ b/tdeprint/pics/tdeprint_portrait.png
Binary files differ
diff --git a/tdeprint/pics/tdeprint_revlandscape.png b/tdeprint/pics/tdeprint_revlandscape.png
index 7d62ccf29..64ceb7230 100755
--- a/tdeprint/pics/tdeprint_revlandscape.png
+++ b/tdeprint/pics/tdeprint_revlandscape.png
Binary files differ
diff --git a/tdeprint/pics/tdeprint_revportrait.png b/tdeprint/pics/tdeprint_revportrait.png
index 4688d687f..89c04c92d 100755
--- a/tdeprint/pics/tdeprint_revportrait.png
+++ b/tdeprint/pics/tdeprint_revportrait.png
Binary files differ
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-14 11:11:24 +0000