summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app/Dialogs/krprogress.cpp4
-rw-r--r--src/app/VFS/krquery.cpp11
-rw-r--r--src/app/main.cpp4
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,