From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libtdepim/addresseeemailselection.cpp | 4 ++-- libtdepim/addresseelineedit.cpp | 26 +++++++++++++------------- libtdepim/addresseeselector.cpp | 4 ++-- libtdepim/addresseeview.cpp | 16 ++++++++-------- libtdepim/addressesdialog.cpp | 10 +++++----- libtdepim/alarmclient.cpp | 2 +- libtdepim/broadcaststatus.cpp | 2 +- libtdepim/collectingprocess.cpp | 26 +++++++++++++------------- libtdepim/collectingprocess.h | 10 +++++----- libtdepim/csshelper.cpp | 8 ++++---- libtdepim/htmldiffalgodisplay.cpp | 4 ++-- libtdepim/kcmdesignerfields.cpp | 6 +++--- libtdepim/kdateedit.cpp | 12 ++++++------ libtdepim/kimportdialog.cpp | 2 +- libtdepim/kincidencechooser.cpp | 4 ++-- libtdepim/komposer/core/pluginmanager.cpp | 2 +- libtdepim/kscoring.cpp | 4 ++-- libtdepim/ksubscription.cpp | 2 +- libtdepim/ktimeedit.cpp | 14 +++++++------- libtdepim/pluginloaderbase.cpp | 2 +- libtdepim/progressdialog.cpp | 2 +- libtdepim/recentaddresses.cpp | 2 +- libtdepim/recentaddresses.h | 2 +- libtdepim/ssllabel.cpp | 2 +- 24 files changed, 84 insertions(+), 84 deletions(-) (limited to 'libtdepim') diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index feec5ff4..fe66adbd 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -133,7 +133,7 @@ TQPixmap AddresseeEmailSelection::itemIcon( const KABC::Addressee &addressee, ui if ( !addressee.photo().data().isNull() ) return addressee.photo().data().smoothScale( 16, 16 ); else - return KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); + return TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); } bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uint ) const @@ -160,7 +160,7 @@ TQString AddresseeEmailSelection::distributionListText( const KABC::Distribution TQPixmap AddresseeEmailSelection::distributionListIcon( const KABC::DistributionList* ) const { - return KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); + return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); } bool AddresseeEmailSelection::distributionListEnabled( const KABC::DistributionList* ) const diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index d076fd3d..3b55024b 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -419,9 +419,9 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) { m_lastSearchMode = ctrlT; - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( mode == KGlobalSettings::CompletionNone ) + if ( mode == TDEGlobalSettings::CompletionNone ) return; if ( s_addressesDirty ) { @@ -447,20 +447,20 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) switch ( mode ) { - case KGlobalSettings::CompletionPopupAuto: + case TDEGlobalSettings::CompletionPopupAuto: { if ( m_searchString.isEmpty() ) break; } - case KGlobalSettings::CompletionPopup: + case TDEGlobalSettings::CompletionPopup: { const TQStringList items = getAdjustedCompletionItems( true ); setCompletedItems( items, false ); break; } - case KGlobalSettings::CompletionShell: + case TDEGlobalSettings::CompletionShell: { TQString match = s_completion->makeCompletion( m_searchString ); if ( !match.isNull() && match != m_searchString ) { @@ -471,8 +471,8 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) break; } - case KGlobalSettings::CompletionMan: // Short-Auto in fact - case KGlobalSettings::CompletionAuto: + case TDEGlobalSettings::CompletionMan: // Short-Auto in fact + case TDEGlobalSettings::CompletionAuto: { //force autoSuggest in KLineEdit::keyPressed or setCompletedText will have no effect setCompletionMode( completionMode() ); @@ -521,7 +521,7 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) break; } - case KGlobalSettings::CompletionNone: + case TDEGlobalSettings::CompletionNone: default: // fall through break; } @@ -594,7 +594,7 @@ void AddresseeLineEdit::loadContacts() int idx = addCompletionSource( i18n( "Distribution Lists" ) ); for ( listIt = distLists.begin(); listIt != distLists.end(); ++listIt ) { - //for KGlobalSettings::CompletionAuto + //for TDEGlobalSettings::CompletionAuto addCompletionItem( (*listIt).simplifyWhiteSpace(), weight, idx ); //for CompletionShell, CompletionPopup @@ -773,9 +773,9 @@ void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, i void AddresseeLineEdit::slotStartLDAPLookup() { - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( mode == KGlobalSettings::CompletionNone ) + if ( mode == TDEGlobalSettings::CompletionNone ) return; if ( !s_LDAPSearch->isAvailable() ) { @@ -828,8 +828,8 @@ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList& adrs ) } if ( (hasFocus() || completionBox()->hasFocus() ) - && completionMode() != KGlobalSettings::CompletionNone - && completionMode() != KGlobalSettings::CompletionShell ) { + && completionMode() != TDEGlobalSettings::CompletionNone + && completionMode() != TDEGlobalSettings::CompletionShell ) { setText( m_previousAddresses + m_searchString ); // only complete again if the user didn't change the selection while we were waiting // otherwise the completion box will be closed diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index c763545a..38bec42d 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -288,8 +288,8 @@ void AddresseeSelector::initGUI() int row = 1; - TQIconSet moveSet = KGlobal::iconLoader()->loadIconSet( "next", KIcon::Small ); - TQIconSet removeSet = KGlobal::iconLoader()->loadIconSet( "previous", KIcon::Small ); + TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", KIcon::Small ); + TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", KIcon::Small ); uint count = mSelection->fieldCount(); for ( uint i = 0; i < count; ++i, ++row ) { diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index b3bccffa..5be001a6 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -62,7 +62,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, TQStyleSheet *sheet = styleSheet(); TQStyleSheetItem *link = sheet->item( "a" ); - link->setColor( KGlobalSettings::linkColor() ); + link->setColor( TDEGlobalSettings::linkColor() ); connect( this, TQT_SIGNAL( mailClick( const TQString&, const TQString& ) ), this, TQT_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); @@ -160,13 +160,13 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // placeholder where we fill in something else (in this case, // the global background color). // - TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name(); + TQString backgroundColor = TDEGlobalSettings::alternateBackgroundColor().name(); TQString cellStyle = TQString::fromLatin1( "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " "background: %1;\"").arg(backgroundColor); - TQString backgroundColor2 = KGlobalSettings::baseColor().name(); + TQString backgroundColor2 = TDEGlobalSettings::baseColor().name(); TQString cellStyle2 = TQString::fromLatin1( "style=\"" "padding-left: 2px; " @@ -207,7 +207,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } else if ( !pic.url().isEmpty() ) { image = (pic.url().startsWith( "http://" ) || pic.url().startsWith( "https://" ) ? pic.url() : "http://" + pic.url()); } else { - image = "file:" + KGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ); + image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ); } } @@ -217,7 +217,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( date.isValid() ) dynamicPart += rowFmtStr .arg( KABC::Addressee::birthdayLabel() ) - .arg( KGlobal::locale()->formatDate( date, true ) ); + .arg( TDEGlobal::locale()->formatDate( date, true ) ); } if ( fieldMask & PhoneFields ) { @@ -532,8 +532,8 @@ void AddresseeView::updateView() "%3" // dynamic part "" "" ) - .arg( KGlobalSettings::textColor().name() ) - .arg( KGlobalSettings::baseColor().name() ) + .arg( TDEGlobalSettings::textColor().name() ) + .arg( TDEGlobalSettings::baseColor().name() ) .arg( strAddr ); TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() ); @@ -554,7 +554,7 @@ void AddresseeView::updateView() } } else { TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL, - KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 128 ) ); + TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 128 ) ); } } diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 667ae97b..4e46705b 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -105,11 +105,11 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add if ( addr.photo().url().isEmpty() ) { if ( addr.photo().data().isNull() ) - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) ); else setPixmap( 0, addr.photo().data().smoothScale( 16, 16 ) ); } else { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) ); } } @@ -135,7 +135,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString d = new AddresseeViewItemPrivate; d->category = DistList; - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) ); } AddresseeViewItem::~AddresseeViewItem() @@ -321,7 +321,7 @@ AddressesDialog::setRecentAddresses( const KABC::Addressee::List& list ) void AddressesDialog::updateRecentAddresses() { - static const TQString &recentGroup = KGlobal::staticQString( i18n( "Recent Addresses" ) ); + static const TQString &recentGroup = TDEGlobal::staticQString( i18n( "Recent Addresses" ) ); if ( !d->recent ) { d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup ); @@ -461,7 +461,7 @@ AddressesDialog::updateAvailableAddressees() d->ui->mAvailableView->clear(); d->groupDict.clear(); - static const TQString &personalGroup = KGlobal::staticQString( i18n( "Other Addresses" ) ); + static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) ); d->ui->mAvailableView->setRootIsDecorated( true ); d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup ); //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp index 5616cd02..da1ef891 100644 --- a/libtdepim/alarmclient.cpp +++ b/libtdepim/alarmclient.cpp @@ -41,7 +41,7 @@ void AlarmClient::startDaemon() return; } - KGlobal::dirs()->addResourceType("autostart", "share/autostart"); + TDEGlobal::dirs()->addResourceType("autostart", "share/autostart"); TQString desktopFile = locate( "autostart", "korgac.desktop" ); if ( desktopFile.isEmpty() ) { kdWarning() << "Couldn't find autostart/korgac.desktop!" << endl; diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index c48d7f41..45a7b51c 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -55,7 +55,7 @@ void BroadcastStatus::setStatusMsg( const TQString& message ) void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message ) { - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) diff --git a/libtdepim/collectingprocess.cpp b/libtdepim/collectingprocess.cpp index 58cdcb5e..e9d640ce 100644 --- a/libtdepim/collectingprocess.cpp +++ b/libtdepim/collectingprocess.cpp @@ -50,7 +50,7 @@ struct CollectingProcess::Private { CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) + : TDEProcess( parent, name ) { d = new Private(); } @@ -61,23 +61,23 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } - return KProcess::start( runmode, comm ); + return TDEProcess::start( runmode, comm ); } -void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStdout( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); @@ -85,7 +85,7 @@ void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) d->stdoutSize += len; } -void CollectingProcess::slotReceivedStderr( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStderr( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); @@ -134,7 +134,7 @@ TQByteArray CollectingProcess::collectedStderr() } void CollectingProcess::virtual_hook( int id, void * data ) { - KProcess::virtual_hook( id, data ); + TDEProcess::virtual_hook( id, data ); } #include "collectingprocess.moc" diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h index 69550ddd..962fe15d 100644 --- a/libtdepim/collectingprocess.h +++ b/libtdepim/collectingprocess.h @@ -39,14 +39,14 @@ namespace KPIM { /** - * @short An output collecting KProcess class. + * @short An output collecting TDEProcess class. * - * This class simplifies the usage of KProcess by collecting all output + * This class simplifies the usage of TDEProcess by collecting all output * (stdout/stderr) of the process. * * @author Ingo Kloecker */ -class KDE_EXPORT CollectingProcess : public KProcess { +class KDE_EXPORT CollectingProcess : public TDEProcess { Q_OBJECT public: @@ -64,8 +64,8 @@ public: TQByteArray collectedStderr(); private slots: - void slotReceivedStdout( KProcess *, char *, int ); - void slotReceivedStderr( KProcess *, char *, int ); + void slotReceivedStdout( TDEProcess *, char *, int ); + void slotReceivedStderr( TDEProcess *, char *, int ); private: class Private; diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index d773c7d6..20de40de 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -74,8 +74,8 @@ namespace KPIM { { // initialize with defaults - should match the corresponding application defaults mForegroundColor = TQApplication::palette().active().text(); - mLinkColor = KGlobalSettings::linkColor(); - mVisitedLinkColor = KGlobalSettings::visitedLinkColor(); + mLinkColor = TDEGlobalSettings::linkColor(); + mVisitedLinkColor = TDEGlobalSettings::visitedLinkColor(); mBackgroundColor = TQApplication::palette().active().base(); cHtmlWarning = TQColor( 0xFF, 0x40, 0x40 ); // warning frame color: light red @@ -89,8 +89,8 @@ namespace KPIM { mQuoteColor[i] = TQColor( 0x00, 0x80 - i * 0x10, 0x00 ); // shades of green mRecycleQuoteColors = false; - TQFont defaultFont = KGlobalSettings::generalFont(); - TQFont defaultFixedFont = KGlobalSettings::fixedFont(); + TQFont defaultFont = TDEGlobalSettings::generalFont(); + TQFont defaultFixedFont = TDEGlobalSettings::fixedFont(); mBodyFont = mPrintFont = defaultFont; mFixedFont = mFixedPrintFont = defaultFixedFont; defaultFont.setItalic( true ); diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp index 4be6b6cd..03553c6d 100644 --- a/libtdepim/htmldiffalgodisplay.cpp +++ b/libtdepim/htmldiffalgodisplay.cpp @@ -45,8 +45,8 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "" ); mText.append( TQString( "" ) - .arg( KGlobalSettings::textColor().name() ) - .arg( KGlobalSettings::baseColor().name() ) ); + .arg( TDEGlobalSettings::textColor().name() ) + .arg( TDEGlobalSettings::baseColor().name() ) ); mText.append( "
" ); mText.append( TQString( "" ) diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index d99128ec..a96a88e7 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -196,7 +196,7 @@ void KCMDesignerFields::importFile() void KCMDesignerFields::loadUiFiles() { - TQStringList list = KGlobal::dirs()->findAllResources( "data", uiPath() + "/*.ui", true, true ); + TQStringList list = TDEGlobal::dirs()->findAllResources( "data", uiPath() + "/*.ui", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { new PageItem( mPageView, *it ); } @@ -411,7 +411,7 @@ void KCMDesignerFields::startDesigner() // check if path exists and create one if not. TQString cepPath = localUiDir(); - if( !KGlobal::dirs()->exists(cepPath) ) { + if( !TDEGlobal::dirs()->exists(cepPath) ) { KIO::NetAccess::mkdir( cepPath, this ); } @@ -421,7 +421,7 @@ void KCMDesignerFields::startDesigner() TQListViewItem *item = mPageView->selectedItem(); if ( item ) { PageItem *pageItem = static_cast( item->parent() ? item->parent() : item ); - cmdLine += " " + KProcess::quote( pageItem->path() ); + cmdLine += " " + TDEProcess::quote( pageItem->path() ); } KRun::runCommand( cmdLine ); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index df2b98c9..73f0586a 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -53,7 +53,7 @@ class DateValidator : public TQValidator return Acceptable; bool ok = false; - KGlobal::locale()->readDate( str, &ok ); + TDEGlobal::locale()->readDate( str, &ok ); if ( ok ) return Acceptable; else @@ -73,7 +73,7 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) setMaxCount( 1 ); mDate = TQDate::currentDate(); - TQString today = KGlobal::locale()->formatDate( mDate, true ); + TQString today = TDEGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); @@ -134,7 +134,7 @@ void KDateEdit::popup() if ( mReadOnly ) return; - TQRect desk = KGlobalSettings::desktopGeometry( this ); + TQRect desk = TDEGlobalSettings::desktopGeometry( this ); TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); @@ -238,7 +238,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( replaced ) (*replaced) = true; } else { - result = KGlobal::locale()->readDate( text ); + result = TDEGlobal::locale()->readDate( text ); } return result; @@ -335,7 +335,7 @@ void KDateEdit::setupKeywords() TQString dayName; for ( int i = 1; i <= 7; ++i ) { - dayName = KGlobal::locale()->calendar()->weekDayName( i ).lower(); + dayName = TDEGlobal::locale()->calendar()->weekDayName( i ).lower(); mKeywordMap.insert( dayName, i + 100 ); } } @@ -351,7 +351,7 @@ void KDateEdit::updateView() { TQString dateString; if ( mDate.isValid() ) - dateString = KGlobal::locale()->formatDate( mDate, true ); + dateString = TDEGlobal::locale()->formatDate( mDate, true ); // We do not want to generate a signal here, // since we explicitly setting the date diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 60d5c24f..d3603e19 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -572,7 +572,7 @@ void KImportDialog::assignTemplate() TQStringList templates; // load all template files - TQStringList list = KGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 68ac5854..f1c43daa 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -201,7 +201,7 @@ void KIncidenceChooser::setLabels() if ( mDiffBut ) mDiffBut->setEnabled( false ); } - mMod1lab->setText( KGlobal::locale()->formatDateTime(inc->lastModified() )); + mMod1lab->setText( TDEGlobal::locale()->formatDateTime(inc->lastModified() )); inc = mInc2; des = mInc2lab; sum = mInc2Sumlab; @@ -219,7 +219,7 @@ void KIncidenceChooser::setLabels() sum->setText( inc->description().left( 30 )); } - mMod2lab->setText( KGlobal::locale()->formatDateTime(inc->lastModified() )); + mMod2lab->setText( TDEGlobal::locale()->formatDateTime(inc->lastModified() )); } void KIncidenceChooser::showIncidence1() diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 1a64a675..b19ead44 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -78,7 +78,7 @@ PluginManager::PluginManager( TQObject *parent ) kapp->ref(); d->shutdownMode = Private::StartingUp; - KSettings::Dispatcher::self()->registerInstance( KGlobal::instance(), + KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index fc156436..4fcc9774 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -785,9 +785,9 @@ KScoringManager::KScoringManager(const TQString& appName) allRules.setAutoDelete(true); // determine filename of the scorefile if(appName.isEmpty()) - mFilename = KGlobal::dirs()->saveLocation("appdata") + "/scorefile"; + mFilename = TDEGlobal::dirs()->saveLocation("appdata") + "/scorefile"; else - mFilename = KGlobal::dirs()->saveLocation("data") + "/" + appName + "/scorefile"; + mFilename = TDEGlobal::dirs()->saveLocation("data") + "/" + appName + "/scorefile"; // open the score file load(); } diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index 2a2347ed..5829d63a 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -223,7 +223,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, i18n("Manage which mail folders you want to see in your folder view") + "

", page); TQToolButton *clearButton = new TQToolButton( page ); - clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet( + clearButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) ); filterEdit = new KLineEdit(page); TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page); diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index c968f235..2a58fc54 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -53,7 +53,7 @@ public: return Intermediate; bool ok = false; - /*TQTime time =*/ KGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok); + /*TQTime time =*/ TDEGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok); if ( ok ) return Acceptable; // kdDebug(5300)<<"Time "<readTime( input, KLocale::WithoutSeconds, &ok ); + TDEGlobal::locale()->readTime( input, KLocale::WithoutSeconds, &ok ); if ( !ok ) { // Also try to accept times in "military format", i.e. no delimiter, like 1200 int tm = input.toInt( &ok ); if ( ( 0 <= tm ) && ( tm < 2400 ) && ( tm%100 < 60 ) && ok ) { - input = KGlobal::locale()->formatTime( TQTime( tm / 100, tm % 100, 0 ) ); + input = TDEGlobal::locale()->formatTime( TQTime( tm / 100, tm % 100, 0 ) ); } } } @@ -119,11 +119,11 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) // Fill combo box with selection of times in localized format. TQTime timeEntry(0,0,0); do { - insertItem(KGlobal::locale()->formatTime(timeEntry)); + insertItem(TDEGlobal::locale()->formatTime(timeEntry)); timeEntry = timeEntry.addSecs(60*15); } while (!timeEntry.isNull()); // Add end of day. - insertItem( KGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) ); + insertItem( TDEGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) ); updateText(); setFocusPolicy(TQ_StrongFocus); @@ -151,7 +151,7 @@ TQTime KTimeEdit::getTime() const //kdDebug(5300) << "KTimeEdit::getTime(), currentText() = " << currentText() << endl; // TODO use KLocale::WithoutSeconds in HEAD bool ok = false; - TQTime time = KGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok ); + TQTime time = TDEGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok ); if ( !ok ) { // Also try to accept times in "military format", i.e. no delimiter, like 1200 int tm = currentText().toInt( &ok ); @@ -257,7 +257,7 @@ void KTimeEdit::keyPressEvent(TQKeyEvent *qke) void KTimeEdit::updateText() { // kdDebug(5300) << "KTimeEdit::updateText() " << endl; - TQString s = KGlobal::locale()->formatTime(mTime); + TQString s = TDEGlobal::locale()->formatTime(mTime); // Set the text but without emitting signals, nor losing the cursor position TQLineEdit *line = lineEdit(); line->blockSignals(true); diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp index 7bf768fd..5d0a89f6 100644 --- a/libtdepim/pluginloaderbase.cpp +++ b/libtdepim/pluginloaderbase.cpp @@ -66,7 +66,7 @@ namespace KPIM { mPluginMap.clear(); const TQStringList list = - KGlobal::dirs()->findAllResources( "data", path, true, true ); + TDEGlobal::dirs()->findAllResources( "data", path, true, true ); for ( TQStringList::const_iterator it = list.begin() ; it != list.end() ; ++it ) { KSimpleConfig config( *it, true ); diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index b058194b..947c0ce8 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -260,7 +260,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c pbClose->setAutoRaise(true); pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); pbClose->setFixedSize( 16, 16 ); - pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); + pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index df7a4549..066ba27b 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -57,7 +57,7 @@ RecentAddresses * RecentAddresses::self( KConfig *config) RecentAddresses::RecentAddresses(KConfig * config) { if ( !config ) - load( KGlobal::config() ); + load( TDEGlobal::config() ); else load( config ); } diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 446f6c68..8d649e81 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -106,7 +106,7 @@ public: /** * Saves the list of recently used addresses to the configfile. - * Make sure to call KGlobal::config()->sync() afterwards, to really save. + * Make sure to call TDEGlobal::config()->sync() afterwards, to really save. */ void save( KConfig * ); diff --git a/libtdepim/ssllabel.cpp b/libtdepim/ssllabel.cpp index 8068aa00..6e4717cd 100644 --- a/libtdepim/ssllabel.cpp +++ b/libtdepim/ssllabel.cpp @@ -67,7 +67,7 @@ void SSLLabel::setState( State state ) case Encrypted: TQToolTip::remove( this ); TQToolTip::add( this, i18n("Connection is encrypted") ); - setPixmap( SmallIcon( "encrypted", KGlobal::instance() ) ); + setPixmap( SmallIcon( "encrypted", TDEGlobal::instance() ) ); show(); break; case Unencrypted: -- cgit v1.2.3
%1 %2