Browse Source

Rename KApplication to TDEApplication to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
85fc36f10e
7 changed files with 45 additions and 45 deletions
  1. 13
    13
      acinclude.m4
  2. 7
    7
      krename/ProgressDialog.cpp
  3. 1
    1
      krename/coorddialog.cpp
  4. 12
    12
      krename/kmylistbox.cpp
  5. 10
    10
      krename/krenameimpl.cpp
  6. 1
    1
      krename/main.cpp
  7. 1
    1
      krename/threadedlister.cpp

+ 13
- 13
acinclude.m4 View File

@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>

int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");

+ 7
- 7
krename/ProgressDialog.cpp View File

@@ -135,7 +135,7 @@ void ProgressDialog::print( TQString text, TQString pixmap )
{
if( !m_timer->isActive() )
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
m_timer->start( TIMER_INTERVAL );
}
@@ -152,7 +152,7 @@ void ProgressDialog::error( TQString text )
{
if( !m_timer->isActive() )
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
m_timer->start( TIMER_INTERVAL );
}
@@ -166,7 +166,7 @@ void ProgressDialog::warning( TQString text )
{
if( !m_timer->isActive() )
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
m_timer->start( TIMER_INTERVAL );
}
@@ -177,13 +177,13 @@ void ProgressDialog::warning( TQString text )

void ProgressDialog::quitAll()
{
KApplication::exit(0);
TDEApplication::exit(0);
}

void ProgressDialog::done( int errors, int successfull, bool allowundo )
{
m_timer->stop();
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();

display->setUpdatesEnabled( true );
display->setSorting( 1, true );
@@ -301,7 +301,7 @@ void ProgressDialog::undo()
FileOperation fop;
m_timer->start( TIMER_INTERVAL );
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
for( unsigned int i = 0; i < m_size; i++ )
{
setProgress( i );
@@ -339,7 +339,7 @@ void ProgressDialog::undo()
print( i18n("Undoing the renaming operation has been completed."), "undo" );
m_timer->stop();
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
TQWidget* krename = KRenameImpl::launch( TQRect( 0, 0, 0, 0 ), list );
krename->show();

+ 1
- 1
krename/coorddialog.cpp View File

@@ -80,7 +80,7 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char *
int w = fm.width( file );
if( w > width() )
resize(
( w < KApplication::desktop()->width() - 40 ? w + 40 : KApplication::desktop()->width() ), height() );
( w < TDEApplication::desktop()->width() - 40 ? w + 40 : TDEApplication::desktop()->width() ), height() );
}

CoordDialog::~CoordDialog()

+ 12
- 12
krename/kmylistbox.cpp View File

@@ -140,13 +140,13 @@ void KMyListBox::addDir( const KURL & dirname, const TQString & filter, bool hid
thl->setHidden( hidden );
thl->setRecursive( recursively );
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
thl->start();
}

void KMyListBox::addDirName( const KURL & dirname, const TQString & filter, bool hidden, bool recursive )
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );

if( recursive ) {
ThreadedLister* thl = new ThreadedLister( &m_add_mutex, &m_running_lister_counter, this );
@@ -178,7 +178,7 @@ void KMyListBox::dropEvent(TQDropEvent* e)
if( KURLDrag::decode( e, list ) )
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );

setUpdatesEnabled( false );

@@ -213,7 +213,7 @@ void KMyListBox::viewportMousePressEvent( TQMouseEvent* e )

void KMyListBox::viewportMouseMoveEvent( TQMouseEvent* e )
{
if ( mousePressed && ( presspos - e->pos() ).manhattanLength() > KApplication::startDragDistance() ) {
if ( mousePressed && ( presspos - e->pos() ).manhattanLength() > TDEApplication::startDragDistance() ) {
mousePressed = FALSE;
TQListBoxItem *item = itemAt( presspos );
if ( item ) {
@@ -297,7 +297,7 @@ void KMyListBox::moveMode()
{
if ( !moving ) {
moving = true;
KApplication::setOverrideCursor( TQt::sizeAllCursor );
TDEApplication::setOverrideCursor( TQt::sizeAllCursor );
}
}

@@ -338,7 +338,7 @@ void KMyListBox::preview( KURL::List list )
connect( job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap &) ), this, TQT_SLOT( previewDone( const KFileItem*, const TQPixmap &) ) );
connect( job, TQT_SIGNAL( failed( const KFileItem*)), this, TQT_SLOT( previewFailed( const KFileItem* ) ));
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( previewFinished() ) );
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
}

void KMyListBox::previewDone( const KFileItem* item, const TQPixmap &pixmap )
@@ -369,7 +369,7 @@ void KMyListBox::previewFailed( const KFileItem* item )
void KMyListBox::previewFinished()
{
triggerUpdate( true ); //maybe false is enough
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

void KMyListBox::setPreview( bool prv )
@@ -401,7 +401,7 @@ void KMyListBox::setName( bool name )

void KMyListBox::move( int i )
{
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
moving = false;

if( !count() )
@@ -505,7 +505,7 @@ void KMyListBox::listerDone( ThreadedLister* lister )
if( lister )
delete lister;
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
setUpdatesEnabled( false );
setPreview( KMyListBoxItem::preview() );
@@ -566,7 +566,7 @@ void KMyListBox::sortNummeric()

void KMyListBox::sortList()
{
KApplication::setOverrideCursor( TQt::WaitCursor );
TDEApplication::setOverrideCursor( TQt::WaitCursor );

if( m_sorting == ASCENDING )
sort( true );
@@ -577,7 +577,7 @@ void KMyListBox::sortList()
unsigned int p = 0;
for( unsigned int i = 0;i<count();i++)
{
p = KApplication::random() % count();
p = TDEApplication::random() % count();
if( p != i ) // This prevents the creation of a new ListBoxItem
// on the same position as before. It would not change
// the position of item, but cost a little bit of speed
@@ -612,7 +612,7 @@ void KMyListBox::sortList()
}
}

KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

void KMyListBox::setSorting( int s )

+ 10
- 10
krename/krenameimpl.cpp View File

@@ -165,7 +165,7 @@ void KRenameImpl::setup( bool wizardmode )
// Load Configuration
loadConfig();
page_1->setEnabled( true );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
filename->setText( "$" ); // no i18n() ! ;)
extemplate->setText( "$" );
@@ -1244,9 +1244,9 @@ void KRenameImpl::updatePreview()
BatchRenamer b;
if( setupBatchRenamer( &b, true ) )
{
KApplication::setOverrideCursor( TQt::WaitCursor );
TDEApplication::setOverrideCursor( TQt::WaitCursor );
b.createPreview( preview );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}
preview->horizontalScrollBar()->setValue( h );
preview->verticalScrollBar()->setValue( v );
@@ -1307,7 +1307,7 @@ void KRenameImpl::loadConfig()

//parent->show();
page_1->setEnabled( false );
KApplication::setOverrideCursor( TQt::WaitCursor );
TDEApplication::setOverrideCursor( TQt::WaitCursor );
plugin->loadPlugins( m_loadplugins );
setupTab1();
config->setGroup("GUISettings");
@@ -1359,20 +1359,20 @@ void KRenameImpl::replace()

void KRenameImpl::toggleImagePreview()
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
fileList->setPreview( checkPreview->isChecked() );
checkName->setEnabled( checkPreview->isChecked() );
if( !checkPreview->isChecked() )
checkName->setChecked( true );
fileList->setName( checkName->isChecked() );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

void KRenameImpl::toggleName()
{
KApplication::setOverrideCursor( TQt::waitCursor );
TDEApplication::setOverrideCursor( TQt::waitCursor );
fileList->setName( checkName->isChecked() );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}

void KRenameImpl::preferences()
@@ -1786,9 +1786,9 @@ void KRenameImpl::setCounterStart( int index )

void KRenameImpl::loadFilePlugins()
{
KApplication::setOverrideCursor( TQt::WaitCursor );
TDEApplication::setOverrideCursor( TQt::WaitCursor );
plugin->loadPlugins( true );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
pluginHelpChanged();
enableControls();

+ 1
- 1
krename/main.cpp View File

@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication a;
TDEApplication a;
a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) );

KImageIO::registerFormats();

+ 1
- 1
krename/threadedlister.cpp View File

@@ -88,7 +88,7 @@ void ThreadedLister::run()
m_internal->lock();
m_internal->unlock();
KApplication::postEvent( m_list, new TQCustomEvent( (TQEvent::Type)ThreadedLister::TYPE(), (void*)this ) );
TDEApplication::postEvent( m_list, new TQCustomEvent( (TQEvent::Type)ThreadedLister::TYPE(), (void*)this ) );
}



Loading…
Cancel
Save