From ebee8a024a015b117e10d5c830fd0c05a0c98b60 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 10 Nov 2025 10:29:45 +0900 Subject: Don't use old TQt compatibility code and remove RELEASE_NAME support Signed-off-by: Michele Calgaro --- src/app/Dialogs/krprogress.cpp | 4 +--- src/app/VFS/krquery.cpp | 11 ++++++----- src/app/main.cpp | 4 ---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/app/Dialogs/krprogress.cpp b/src/app/Dialogs/krprogress.cpp index 1d489d5..fa97ec4 100644 --- a/src/app/Dialogs/krprogress.cpp +++ b/src/app/Dialogs/krprogress.cpp @@ -129,9 +129,7 @@ KrProgress::KrProgress( TDEIO::Job* job ) // change to modal & move to Krusader's center TQPoint center((krApp->width()-width())/2,(krApp->height()-height())/2); center = center+(krApp->pos()); - reparent(krApp,WType_Modal,center); - //setWFlags(WType_Modal); - //move((krApp->width()-width())/2,(krApp->height()-height())/2); + reparent(krApp,WType_Dialog | WShowModal,center); show(); } diff --git a/src/app/VFS/krquery.cpp b/src/app/VFS/krquery.cpp index 7ceeca9..7d4507c 100644 --- a/src/app/VFS/krquery.cpp +++ b/src/app/VFS/krquery.cpp @@ -163,11 +163,11 @@ bool KRQuery::matchCommon( const TQString &nameIn, const TQStringList &matchList if( ndx != -1 ) // but the end of the filename is OK name = nameIn.mid( ndx + 1 ); - unsigned int len; for ( unsigned int i = 0; i < excludeList.count(); ++i ) { - TQRegExp( *excludeList.at( i ), matchesCaseSensitive, true ).match( name, 0, ( int* ) & len ); - if ( len == name.length() ) return false; + TQRegExp re = TQRegExp( *excludeList.at( i ), matchesCaseSensitive, true ); + re.search( name, 0 ); + if ( re.matchedLength() == name.length() ) return false; } if( matchList.count() == 0 ) @@ -175,8 +175,9 @@ bool KRQuery::matchCommon( const TQString &nameIn, const TQStringList &matchList for ( unsigned int i = 0; i < matchList.count(); ++i ) { - TQRegExp( *matchList.at( i ), matchesCaseSensitive, true ).match( name, 0, ( int* ) & len ); - if ( len == name.length() ) return true; + TQRegExp re = TQRegExp( *matchList.at( i ), matchesCaseSensitive, true ); + re.search( name, 0 ); + if ( re.matchedLength() == name.length() ) return true; } return false; } diff --git a/src/app/main.cpp b/src/app/main.cpp index d36f734..cb4d158 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -104,11 +104,7 @@ int main(int argc, char *argv[]) { // ============ end icon-stuff =========== // ABOUT data information -#ifdef RELEASE_NAME - TQString versionName = TQString("%1 \"%2\"").arg(VERSION).arg(RELEASE_NAME); -#else TQString versionName = VERSION; -#endif TDEAboutData aboutData( "krusader", ( geteuid() ? I18N_NOOP("Krusader") : I18N_NOOP("Krusader - ROOT PRIVILEGES")), versionName.latin1(), description, TDEAboutData::License_GPL, -- cgit v1.2.3