From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdeui/kaboutapplication.cpp | 2 +- tdeui/kaboutdialog.cpp | 6 +- tdeui/kaction.cpp | 4 +- tdeui/kactionclasses.cpp | 10 +-- tdeui/kactioncollection.cpp | 2 +- tdeui/kanimwidget.cpp | 4 +- tdeui/kbugreport.cpp | 20 +++--- tdeui/kbugreport.h | 4 +- tdeui/kcmenumngr.cpp | 2 +- tdeui/kcmodule.cpp | 8 +-- tdeui/kcolorbutton.cpp | 2 +- tdeui/kcolordialog.cpp | 8 +-- tdeui/kcombobox.cpp | 12 ++-- tdeui/kcombobox.h | 8 +-- tdeui/kcompletionbox.cpp | 2 +- tdeui/kcompletionbox.h | 2 +- tdeui/kcursor.cpp | 4 +- tdeui/kdatepicker.cpp | 28 ++++---- tdeui/kdatetbl.cpp | 60 ++++++++--------- tdeui/kdatewidget.cpp | 8 +-- tdeui/kdialog.cpp | 4 +- tdeui/kdialogbase.cpp | 6 +- tdeui/kdialogbase.h | 4 +- tdeui/kdockwidget.cpp | 6 +- tdeui/kdockwidget.h | 2 +- tdeui/kdualcolorbutton.cpp | 2 +- tdeui/kedittoolbar.cpp | 56 ++++++++-------- tdeui/kedittoolbar.h | 12 ++-- tdeui/kfontcombo.cpp | 4 +- tdeui/kfontdialog.cpp | 6 +- tdeui/kguiitem.h | 4 +- tdeui/khelpmenu.cpp | 2 +- tdeui/kiconview.cpp | 10 +-- tdeui/kjanuswidget.cpp | 2 +- tdeui/kkeydialog.cpp | 22 +++---- tdeui/kkeydialog.h | 22 +++---- tdeui/klineedit.cpp | 110 ++++++++++++++++---------------- tdeui/klineedit.h | 12 ++-- tdeui/klistbox.cpp | 6 +- tdeui/klistview.cpp | 26 ++++---- tdeui/kmainwindow.cpp | 10 +-- tdeui/kmainwindow.h | 4 +- tdeui/kmenubar.cpp | 4 +- tdeui/kmessagebox.cpp | 16 ++--- tdeui/kmessagebox.h | 2 +- tdeui/knuminput.cpp | 4 +- tdeui/knumvalidator.cpp | 6 +- tdeui/kpanelapplet.h | 2 +- tdeui/kpanelextension.h | 2 +- tdeui/kpanelmenu.cpp | 2 +- tdeui/kpassdlg.cpp | 6 +- tdeui/kpassivepopup.cpp | 4 +- tdeui/kpixmapio.cpp | 2 +- tdeui/kpushbutton.cpp | 4 +- tdeui/kpushbutton.h | 2 +- tdeui/ksconfig.cpp | 12 ++-- tdeui/kscrollview.cpp | 2 +- tdeui/kshortcutdialog.cpp | 4 +- tdeui/kspell.cpp | 12 ++-- tdeui/kspell.h | 6 +- tdeui/ksplashscreen.cpp | 2 +- tdeui/kstatusbar.cpp | 2 +- tdeui/kstdaction.cpp | 4 +- tdeui/kswitchlanguagedialog.cpp | 14 ++-- tdeui/ksyntaxhighlighter.cpp | 6 +- tdeui/ksystemtray.cpp | 2 +- tdeui/ksystemtray.h | 4 +- tdeui/ktabbar.cpp | 6 +- tdeui/ktabwidget.cpp | 6 +- tdeui/ktextbrowser.cpp | 2 +- tdeui/ktextedit.cpp | 2 +- tdeui/ktimezonewidget.h | 2 +- tdeui/ktip.cpp | 24 +++---- tdeui/ktoolbar.cpp | 44 ++++++------- tdeui/ktoolbar.h | 4 +- tdeui/ktoolbarbutton.cpp | 12 ++-- tdeui/ktoolbarbutton.h | 2 +- tdeui/kurllabel.cpp | 4 +- tdeui/kwizard.cpp | 2 +- tdeui/kxmlguibuilder.cpp | 6 +- tdeui/kxmlguiclient.cpp | 32 +++++----- tdeui/kxmlguifactory.cpp | 20 +++--- tdeui/kxmlguifactory_p.cpp | 34 +++++----- tdeui/tests/itemcontainertest.cpp | 2 +- tdeui/tests/kcomboboxtest.cpp | 4 +- tdeui/tests/klistviewtest.cpp | 4 +- tdeui/tests/ktoolbarlabelactiontest.cpp | 2 +- tdeui/tests/kxmlguitest.cpp | 2 +- 88 files changed, 435 insertions(+), 435 deletions(-) (limited to 'tdeui') diff --git a/tdeui/kaboutapplication.cpp b/tdeui/kaboutapplication.cpp index 4be70c48c..1b7808fd0 100644 --- a/tdeui/kaboutapplication.cpp +++ b/tdeui/kaboutapplication.cpp @@ -40,7 +40,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name, Close, Close, parent, name, modal ) { - buildDialog(KGlobal::instance()->aboutData()); + buildDialog(TDEGlobal::instance()->aboutData()); } KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent, diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp index 3ed785891..5e6edaeae 100644 --- a/tdeui/kaboutdialog.cpp +++ b/tdeui/kaboutdialog.cpp @@ -436,7 +436,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) { if( mTitleLabel ) { - TQFont f( KGlobalSettings::generalFont() ); + TQFont f( TDEGlobalSettings::generalFont() ); f.setBold( true ); int fs = f.pointSize(); if (fs == -1) @@ -447,7 +447,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) if( mVersionLabel ) { - TQFont f( KGlobalSettings::generalFont() ); + TQFont f( TDEGlobalSettings::generalFont() ); f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); @@ -502,7 +502,7 @@ TQFrame *KAboutContainerBase::addLicensePage( const TQString &title, TQVBoxLayout* const vbox = new TQVBoxLayout( page, KDialog::spacingHint() ); KTextEdit* const textEdit = new KTextEdit( page, "license" ); - textEdit->setFont( KGlobalSettings::fixedFont() ); + textEdit->setFont( TDEGlobalSettings::fixedFont() ); textEdit->setReadOnly( true ); textEdit->setWordWrap( TQTextEdit::NoWrap ); textEdit->setText( text ); diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 89e397450..6fad7d34b 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -662,7 +662,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( KIcon::Small, 0, instance ), d->text(), this,//dsweet TQT_SLOT( slotPopupActivated() ), keyQt, -1, index ); @@ -702,7 +702,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index e83a9f05d..4be388afe 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -1101,7 +1101,7 @@ void KRecentFilesAction::addURL( const KURL& url ) void KRecentFilesAction::addURL( const KURL& url, const TQString& name ) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; const TQString file = url.pathOrURL(); TQStringList lst = KSelectAction::items(); @@ -1282,7 +1282,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ), isEnabled(), plainText(), @@ -1832,7 +1832,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), @@ -1958,7 +1958,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), @@ -2294,7 +2294,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp index 9cc76902b..9654d0ffd 100644 --- a/tdeui/kactioncollection.cpp +++ b/tdeui/kactioncollection.cpp @@ -462,7 +462,7 @@ void KActionCollection::setInstance( TDEInstance *instance ) if ( instance ) d->m_instance = instance; else - d->m_instance = KGlobal::instance(); + d->m_instance = TDEGlobal::instance(); } TDEInstance *KActionCollection::instance() const diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index 899ba7bd3..7a5928ab3 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -185,9 +185,9 @@ void KAnimWidget::updateIcons() if (parent()->inherits( "KToolBar" )) d->size = ((KToolBar*)parent())->iconSize(); if (!d->size) - d->size = KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + d->size = TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); - TQString path = KGlobal::iconLoader()->iconPath(d->icon_name, -d->size); + TQString path = TDEGlobal::iconLoader()->iconPath(d->icon_name, -d->size); TQImage img(path); if (img.isNull()) diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 37f84a802..3e63af8f9 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -79,11 +79,11 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou d = new KBugReportPrivate; // Use supplied aboutdata, otherwise the one from the active instance - // otherwise the KGlobal one. _activeInstance should neved be 0L in theory. + // otherwise the TDEGlobal one. _activeInstance should neved be 0L in theory. m_aboutData = aboutData ? aboutData - : ( KGlobal::_activeInstance ? KGlobal::_activeInstance->aboutData() - : KGlobal::instance()->aboutData() ); + : ( TDEGlobal::_activeInstance ? TDEGlobal::_activeInstance->aboutData() + : TDEGlobal::instance()->aboutData() ); m_process = 0; TQWidget * parent = plainPage(); d->submitBugButton = 0; @@ -318,9 +318,9 @@ void KBugReport::appChanged(int i) void KBugReport::slotConfigureEmail() { if (m_process) return; - m_process = new KProcess; + m_process = new TDEProcess; *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom())); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom())); if (!m_process->start()) { kdDebug() << "Couldn't start kcmshell.." << endl; @@ -460,9 +460,9 @@ TQString KBugReport::text() const bodyText += line; } - if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { + if (severity == TQString::fromLatin1("i18n") && TDEGlobal::locale()->language() != KLocale::defaultLanguage()) { // Case 1 : i18n bug - TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); + TQString package = TQString::fromLatin1("i18n_%1").arg(TDEGlobal::locale()->language()); package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); return TQString::fromLatin1("Package: %1").arg(package) + TQString::fromLatin1("\n" @@ -498,11 +498,11 @@ bool KBugReport::sendBugReport() TQString subject = m_subject->text(); command += " --subject "; - command += KProcess::quote(subject); + command += TDEProcess::quote(subject); command += " --recipient "; - command += KProcess::quote(recipient); + command += TDEProcess::quote(recipient); command += " > "; - command += KProcess::quote(outputfile.name()); + command += TDEProcess::quote(outputfile.name()); fflush(stdin); fflush(stderr); diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h index 2c60b091b..b8ddd39f7 100644 --- a/tdeui/kbugreport.h +++ b/tdeui/kbugreport.h @@ -24,7 +24,7 @@ class TQMultiLineEdit; class TQLineEdit; class TQHButtonGroup; -class KProcess; +class TDEProcess; class TDEAboutData; class KBugReportPrivate; @@ -100,7 +100,7 @@ protected: */ bool sendBugReport(); - KProcess * m_process; + TDEProcess * m_process; const TDEAboutData * m_aboutData; TQMultiLineEdit * m_lineedit; diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 640b9c7ac..0745bccd9 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -35,7 +35,7 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; + KConfigGroupSaver saver ( TDEGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp index a047fe6b8..bba0e5247 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/kcmodule.cpp @@ -65,10 +65,10 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) init(); if (name && strlen(name)) { d->_instance = new TDEInstance(name); - KGlobal::locale()->insertCatalogue(name); + TDEGlobal::locale()->insertCatalogue(name); } else d->_instance = new TDEInstance("kcmunnamed"); - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); d->managers.setAutoDelete( true ); @@ -82,11 +82,11 @@ KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & if (instance) { - KGlobal::locale()->insertCatalogue(instance->instanceName()); + TDEGlobal::locale()->insertCatalogue(instance->instanceName()); } d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); } void KCModule::init() diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index ceded0f58..b28002ebc 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -175,7 +175,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { if( (e->state() & Qt::LeftButton) && - (e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) + (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { // Drag color object KColorDrag *dg = new KColorDrag( color(), this); diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index ec3930fa3..7db3807a7 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -429,7 +429,7 @@ void KColorCells::mouseMoveEvent( TQMouseEvent *e ) if( !(e->state() & Qt::LeftButton)) return; if(inMouse) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(e->x() > mPos.x()+delay || e->x() < mPos.x()-delay || e->y() > mPos.y()+delay || e->y() < mPos.y()-delay){ // Drag color object @@ -645,7 +645,7 @@ KPaletteTable::readNamedColor( void ) return; // Strings already present } - KGlobal::locale()->insertCatalogue("tdelibs_colors"); + TDEGlobal::locale()->insertCatalogue("tdelibs_colors"); // // Code somewhat inspired by KPalette. @@ -1254,7 +1254,7 @@ void KColorDialog::slotDefaultColorClicked() void KColorDialog::readSettings() { - KConfigGroup group( KGlobal::config(), "Colors" ); + KConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = group.readEntry("CurrentPalette"); d->table->setPalette(palette); @@ -1263,7 +1263,7 @@ KColorDialog::readSettings() void KColorDialog::slotWriteSettings() { - KConfigGroup group( KGlobal::config(), "Colors" ); + KConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = d->table->palette(); if (!group.hasDefault("CurrentPalette") && diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 198a1e200..5d3914327 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -111,13 +111,13 @@ void KComboBox::setAutoCompletion( bool autocomplete ) { if ( autocomplete ) { - d->klineEdit->setCompletionMode( KGlobalSettings::CompletionAuto ); - setCompletionMode( KGlobalSettings::CompletionAuto ); + d->klineEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); + setCompletionMode( TDEGlobalSettings::CompletionAuto ); } else { - d->klineEdit->setCompletionMode( KGlobalSettings::completionMode() ); - setCompletionMode( KGlobalSettings::completionMode() ); + d->klineEdit->setCompletionMode( TDEGlobalSettings::completionMode() ); + setCompletionMode( TDEGlobalSettings::completionMode() ); } } } @@ -290,8 +290,8 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )) ); connect( d->klineEdit, - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion )), - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion))); + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); connect( d->klineEdit, TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index de3b07aab..41963a56b 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -251,7 +251,7 @@ public: * @return @p true when completion mode is automatic. */ bool autoCompletion() const { - return completionMode() == KGlobalSettings::CompletionAuto; + return completionMode() == TDEGlobalSettings::CompletionAuto; } /** @@ -331,7 +331,7 @@ public: /** * @returns the completion-box, that is used in completion mode - * KGlobalSettings::CompletionPopup and KGlobalSettings::CompletionPopupAuto. + * TDEGlobalSettings::CompletionPopup and TDEGlobalSettings::CompletionPopupAuto. * This method will create a completion-box by calling * KLineEdit::completionBox, if none is there, yet. * @@ -373,7 +373,7 @@ signals: * The argument is the current text being edited. * * Note that this signal is @em not available when the widget is non-editable - * or the completion mode is set to @p KGlobalSettings::CompletionNone. + * or the completion mode is set to @p TDEGlobalSettings::CompletionNone. */ void completion( const TQString& ); @@ -399,7 +399,7 @@ signals: * Emitted whenever the completion mode is changed by the user * through the context menu. */ - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); /** * Emitted before the context menu is displayed. diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp index 56d52b88a..efcda9ebe 100644 --- a/tdeui/kcompletionbox.cpp +++ b/tdeui/kcompletionbox.cpp @@ -275,7 +275,7 @@ void KCompletionBox::sizeAndPosition() int x = currentPos.x(), y = currentPos.y(); if ( d->m_parent ) { if ( !isVisible() ) { - TQRect screenSize = KGlobalSettings::desktopGeometry(d->m_parent); + TQRect screenSize = TDEGlobalSettings::desktopGeometry(d->m_parent); TQPoint orig = d->m_parent->mapToGlobal( TQPoint(0, d->m_parent->height()) ); x = orig.x() + geom.x(); diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h index 8016ceab2..5f2f5b660 100644 --- a/tdeui/kcompletionbox.h +++ b/tdeui/kcompletionbox.h @@ -36,7 +36,7 @@ class TQEvent; * It is filled with all possible matches for a completion, so the user * can select the one he wants. * - * It is used when KGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto. + * It is used when TDEGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto. * * @author Carsten Pfeiffer */ diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 1458f88dc..d09b4e9ee 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -46,7 +46,7 @@ TQCursor KCursor::handCursor() if (!hand_cursor) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); #ifndef Q_WS_WIN // this mask doesn't work too well on win32 @@ -369,7 +369,7 @@ KCursorPrivate::KCursorPrivate() { hideCursorDelay = 5000; // 5s default value - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); enabled = kc->readBoolEntry( TQString::fromLatin1("Autohiding cursor enabled"), true ); diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index ded20474a..1ba83bad1 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -65,7 +65,7 @@ public: void KDatePicker::fillWeeksCombo(const TQDate &date) { // every year can have a different number of weeks - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); // it could be that we had 53,1..52 and now 1..53 which is the same number but different // so always fill with new values @@ -150,9 +150,9 @@ void KDatePicker::init( const TQDate &dt ) line = new KLineEdit(this); val = new KDateValidator(this); table = new KDateTable(this); - fontsize = KGlobalSettings::generalFont().pointSize(); + fontsize = TDEGlobalSettings::generalFont().pointSize(); if (fontsize == -1) - fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize(); + fontsize = TQFontInfo(TDEGlobalSettings::generalFont()).pointSize(); fontsize++; // Make a little bigger @@ -247,9 +247,9 @@ KDatePicker::dateChangedSlot(TQDate date) { kdDebug(298) << "KDatePicker::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); selectMonth->setText(calendar->monthName(date, false)); fillWeeksCombo(date); @@ -301,7 +301,7 @@ void KDatePicker::monthForwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); + temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); setDate( temp ); } @@ -310,7 +310,7 @@ void KDatePicker::monthBackwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); + temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); setDate( temp ); } @@ -319,7 +319,7 @@ void KDatePicker::yearForwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); + temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); setDate( temp ); } @@ -328,7 +328,7 @@ void KDatePicker::yearBackwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); + temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); setDate( temp ); } @@ -338,7 +338,7 @@ void KDatePicker::selectWeekClicked() {} // ### in 3.2 obsolete; kept for binar void KDatePicker::weekSelected(int week) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date = table->getDate(); int year = calendar->year(date); @@ -355,7 +355,7 @@ void KDatePicker::selectMonthClicked() { // every year can have different month names (in some calendar systems) - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date = table->getDate(); int i, month, months = calendar->monthsInYear(date); @@ -379,7 +379,7 @@ KDatePicker::selectMonthClicked() void KDatePicker::selectYearClicked() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); if (selectYear->state() == TQButton::Off) { @@ -499,8 +499,8 @@ KDatePicker::setFontSize(int s) for (int i = 1; ; ++i) { - TQString str = KGlobal::locale()->calendar()->monthName(i, - KGlobal::locale()->calendar()->year(table->getDate()), false); + TQString str = TDEGlobal::locale()->calendar()->monthName(i, + TDEGlobal::locale()->calendar()->year(table->getDate()), false); if (str.isNull()) break; r=metrics.boundingRect(str); maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width())); diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 9387a6322..632c7deea 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -99,7 +99,7 @@ KDateValidator::validate(TQString& text, int&) const TQValidator::State KDateValidator::date(const TQString& text, TQDate& d) const { - TQDate tmp = KGlobal::locale()->readDate(text); + TQDate tmp = TDEGlobal::locale()->readDate(text); if (!tmp.isNull()) { d = tmp; @@ -129,7 +129,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); @@ -145,7 +145,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(TQDate::currentDate()); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); } @@ -169,8 +169,8 @@ void KDateTable::initAccels() int KDateTable::posFromDate( const TQDate &dt ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - const int firstWeekDay = KGlobal::locale()->weekStartDay(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); + const int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int pos = calendar->day( dt ); int offset = (firstday - firstWeekDay + 7) % 7; // make sure at least one day of the previous month is visible. @@ -182,10 +182,10 @@ int KDateTable::posFromDate( const TQDate &dt ) TQDate KDateTable::dateFromPos( int pos ) { TQDate pCellDate; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); calendar->setYMD(pCellDate, calendar->year(date), calendar->month(date), 1); - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int offset = (firstday - firstWeekDay + 7) % 7; // make sure at least one day of the previous month is visible. // adjust this <1 if more days should be forced visible: @@ -211,14 +211,14 @@ KDateTable::paintEmptyArea(TQPainter *paint, int, int, int, int) void KDateTable::paintCell(TQPainter *painter, int row, int col) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQRect rect; TQString text; TQPen pen; int w=cellWidth(); int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); + TQFont font=TDEGlobalSettings::generalFont(); // ----- if(row == 0) @@ -226,7 +226,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) font.setBold(true); painter->setFont(font); bool normalday = true; - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int daynum = ( col+firstWeekDay < 8 ) ? col+firstWeekDay : col+firstWeekDay-7; if ( daynum == calendar->weekDayOfPray() || @@ -234,8 +234,8 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) normalday=false; TQBrush brushInvertTitle(colorGroup().base()); - TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); - TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); + TQColor titleColor(isEnabled()?( TDEGlobalSettings::activeTitleColor() ):( TDEGlobalSettings::inactiveTitleColor() ) ); + TQColor textColor(isEnabled()?( TDEGlobalSettings::activeTextColor() ):( TDEGlobalSettings::inactiveTextColor() ) ); if (!normalday) { painter->setPen(textColor); @@ -298,7 +298,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } pen=painter->pen(); - int firstWeekDay=KGlobal::locale()->weekStartDay(); + int firstWeekDay=TDEGlobal::locale()->weekStartDay(); int offset=firstday-firstWeekDay; if(offset<1) offset+=7; @@ -339,13 +339,13 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) void KDateTable::nextMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); setDate(calendar->addMonths( date, 1 )); } void KDateTable::previousMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); setDate(calendar->addMonths( date, -1 )); } @@ -433,7 +433,7 @@ KDateTable::setFontSize(int size) maxCell.setHeight(0); for(count=0; count<7; ++count) { - rect=metrics.boundingRect(KGlobal::locale()->calendar() + rect=metrics.boundingRect(TDEGlobal::locale()->calendar() ->weekDayName(count+1, true)); maxCell.setWidth(QMAX(maxCell.width(), rect.width())); maxCell.setHeight(QMAX(maxCell.height(), rect.height())); @@ -500,7 +500,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e) if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) { KPopupMenu *menu = new KPopupMenu(); - menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) ); + menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); emit aboutToShowContextMenu( menu, clickedDate ); menu->popup(e->globalPos()); } @@ -524,7 +524,7 @@ KDateTable::setDate(const TQDate& date_) emit(dateChanged(date)); changed=true; } - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); calendar->setYMD(temp, calendar->year(date), calendar->month(date), 1); //temp.setYMD(date.year(), date.month(), 1); @@ -614,7 +614,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); @@ -686,7 +686,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker // ----- activeCol = -1; activeRow = -1; - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); @@ -694,17 +694,17 @@ KDateInternalMonthPicker::KDateInternalMonthPicker setNumCols(3); d = new KDateInternalMonthPrivate(date.year(), date.month(), date.day()); // For monthsInYear != 12 - setNumRows( (KGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); + setNumRows( (TDEGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); - viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker // ----- find the preferred size // (this is slow, possibly, but unfortunately it is needed here): TQFontMetrics metrics(font); for(int i = 1; ; ++i) { - TQString str = KGlobal::locale()->calendar()->monthName(i, - KGlobal::locale()->calendar()->year(date), false); + TQString str = TDEGlobal::locale()->calendar()->monthName(i, + TDEGlobal::locale()->calendar()->year(date), false); if (str.isNull()) break; rect=metrics.boundingRect(str); if(max.width()setPen(KGlobalSettings::textColor()); + p->setPen(TDEGlobalSettings::textColor()); } void @@ -745,8 +745,8 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) TQString text; // ----- find the number of the cell: index=3*row+col+1; - text=KGlobal::locale()->calendar()->monthName(index, - KGlobal::locale()->calendar()->year(TQDate(d->year, d->month, + text=TDEGlobal::locale()->calendar()->monthName(index, + TDEGlobal::locale()->calendar()->year(TQDate(d->year, d->month, d->day)), false); painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); if ( activeCol == col && activeRow == row ) @@ -855,7 +855,7 @@ KDateInternalYearSelector::KDateInternalYearSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); // we have to respect the limits of TQDate here, I fear: @@ -879,7 +879,7 @@ KDateInternalYearSelector::yearEnteredSlot() return; } //date.setYMD(year, 1, 1); - KGlobal::locale()->calendar()->setYMD(date, year, 1, 1); + TDEGlobal::locale()->calendar()->setYMD(date, year, 1, 1); if(!date.isValid()) { KNotifyClient::beep(); @@ -982,7 +982,7 @@ void KPopupFrame::popup(const TQPoint &pos) { // Make sure the whole popup is visible. - TQRect d = KGlobalSettings::desktopGeometry(pos); + TQRect d = TDEGlobalSettings::desktopGeometry(pos); int x = pos.x(); int y = pos.y(); diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp index ba46a599b..cb690b0ea 100644 --- a/tdeui/kdatewidget.cpp +++ b/tdeui/kdatewidget.cpp @@ -72,7 +72,7 @@ KDateWidget::KDateWidget( TQDate date, TQWidget *parent, void KDateWidget::init() { d = new KDateWidgetPrivate; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); @@ -96,7 +96,7 @@ void KDateWidget::init() void KDateWidget::init(const TQDate& date) { d = new KDateWidgetPrivate; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); @@ -125,7 +125,7 @@ KDateWidget::~KDateWidget() // ### HPB change TQDate to const TQDate & in KDE 4.0 void KDateWidget::setDate( TQDate date ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); d->m_day->blockSignals(true); d->m_month->blockSignals(true); @@ -151,7 +151,7 @@ TQDate KDateWidget::date() const void KDateWidget::slotDateChanged( ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date; int y,m,day; diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 868eb3b44..0b99c550c 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -342,7 +342,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) seperatorbox->setMargin(0); TQWidget* ticon = new TQWidget( frame ); - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap trinityPixmap = ldr->loadIcon("kmenu", KIcon::Panel, KIcon::SizeLarge, KIcon::DefaultState, 0L, true); // Manually draw the alpha portions of the icon onto the widget background color... @@ -431,7 +431,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent) // Center the dialog TQSize sh = sizeHint(); - TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); show(); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 1fb00aa6d..c18bead0a 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -656,7 +656,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, } } - setButtonStyle( KGlobalSettings::buttonLayout() ); + setButtonStyle( TDEGlobalSettings::buttonLayout() ); } @@ -1740,7 +1740,7 @@ void KDialogBase::showTile( bool state ) TQSize KDialogBase::configDialogSize( const TQString& groupName ) const { - return configDialogSize( *KGlobal::config(), groupName ); + return configDialogSize( *TDEGlobal::config(), groupName ); } @@ -1764,7 +1764,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config, void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) { - saveDialogSize( *KGlobal::config(), groupName, global ); + saveDialogSize( *TDEGlobal::config(), groupName, global ); } diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index c47a6a2e9..893e049f7 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -831,7 +831,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param groupName Name of the group to read from. The old group - * of KGlobal::config is preserved. + * of TDEGlobal::config is preserved. */ TQSize configDialogSize( const TQString& groupName ) const; @@ -841,7 +841,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group - * of KGlobal::config is preserved. + * of TDEGlobal::config is preserved. * @since 3.2 */ TQSize configDialogSize( KConfig& config, const TQString& groupName ) const; diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 95ceb33dd..192c24b05 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1635,7 +1635,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) d->mainDockWidget=0; #ifndef NO_KDE2 - d->splitterOpaqueResize = KGlobalSettings::opaqueResize(); + d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize(); #else d->splitterOpaqueResize = false; #endif @@ -2531,7 +2531,7 @@ void KDockManager::setReadDockConfigMode(int mode) void KDockManager::writeConfig( KConfig* c, TQString group ) { //debug("BEGIN Write Config"); - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); @@ -2672,7 +2672,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) #include void KDockManager::readConfig( KConfig* c, TQString group ) { - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h index 4f54e5f13..8f5c288ec 100644 --- a/tdeui/kdockwidget.h +++ b/tdeui/kdockwidget.h @@ -1033,7 +1033,7 @@ public: KDockWidget* getDockWidgetFromName( const TQString& dockName ); /** - * Enables opaque resizing. Opaque resizing defaults to KGlobalSettings::opaqueResize(). + * Enables opaque resizing. Opaque resizing defaults to TDEGlobalSettings::opaqueResize(). * Call this method before you create any dock widgets! */ void setSplitterOpaqueResize(bool b=true); diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index f6d49a97e..f0cd5cae1 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -224,7 +224,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) void KDualColorButton::mouseMoveEvent(TQMouseEvent *ev) { if(!miniCtlFlag){ - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(ev->x() >= mPos.x()+delay || ev->x() <= mPos.x()-delay || ev->y() >= mPos.y()+delay || ev->y() <= mPos.y()-delay) { KColorDrag *d = new KColorDrag( curColor == Foreground ? diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index b89a5b97a..3f116b903 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -254,8 +254,8 @@ public: */ ToolbarList findToolbars(TQDomNode n) { - static const TQString &tagToolbar = KGlobal::staticQString( "ToolBar" ); - static const TQString &attrNoEdit = KGlobal::staticQString( "noEdit" ); + static const TQString &tagToolbar = TDEGlobal::staticQString( "ToolBar" ); + static const TQString &attrNoEdit = TDEGlobal::staticQString( "noEdit" ); ToolbarList list; for( ; !n.isNull(); n = n.nextSibling() ) @@ -278,9 +278,9 @@ public: */ TQString toolbarName( const XmlData& xmlData, const TQDomElement& it ) const { - static const TQString &tagText = KGlobal::staticQString( "text" ); - static const TQString &tagText2 = KGlobal::staticQString( "Text" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagText = TDEGlobal::staticQString( "text" ); + static const TQString &tagText2 = TDEGlobal::staticQString( "Text" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString name; TQCString txt( it.namedItem( tagText ).toElement().text().utf8() ); @@ -306,7 +306,7 @@ public: */ TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement elem = n.toElement(); @@ -466,7 +466,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { - const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); + const TDEInstance *instance = client->instance() ? client->instance() : TDEGlobal::instance(); file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); } else @@ -488,7 +488,7 @@ void KEditToolbar::slotDefault() int slash = d->m_file.findRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); - TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); + TQString xml_file = locateLocal("data", TQString::fromLatin1( TDEGlobal::instance()->instanceName() + '/' ) + d->m_file); if ( TQFile::exists( xml_file ) ) if ( !TQFile::remove( xml_file ) ) @@ -903,7 +903,7 @@ void KEditToolbarWidget::setupLayout() void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); // just in case, we clear our combo m_toolbarCombo->clear(); @@ -942,11 +942,11 @@ void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) void KEditToolbarWidget::loadActionList(TQDomElement& elem) { - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &tagMerge = KGlobal::staticQString( "Merge" ); - static const TQString &tagActionList= KGlobal::staticQString( "ActionList" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); + static const TQString &tagActionList= TDEGlobal::staticQString( "ActionList" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); int sep_num = 0; TQString sep_name("separator_%1"); @@ -966,7 +966,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) TQMap active_list; // see if our current action is in this toolbar - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQDomNode n = elem.lastChild(); for( ; !n.isNull(); n = n.previousSibling() ) { @@ -1108,7 +1108,7 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item) ToolbarItem* toolitem = static_cast(item); m_removeAction->setEnabled( item ); - static const TQString &tagAction = KGlobal::staticQString( "Action" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); d->m_changeIcon->setEnabled( item && d->m_hasKDialog && toolitem->internalTag() == tagAction ); @@ -1191,11 +1191,11 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before, if (!item) return; - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" ); - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); TQDomElement new_item; // let's handle the separator specially @@ -1238,7 +1238,7 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item) if (!item) return; - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); // we're modified, so let this change emit enableOk(true); @@ -1306,7 +1306,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before ) d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before )); // and set this container as a noMerge - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); d->m_currentToolbarElem.setAttribute( attrNoMerge, "1"); // update the local doc @@ -1330,7 +1330,7 @@ void KEditToolbarWidget::slotDownButton() void KEditToolbarWidget::updateLocal(TQDomElement& elem) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); XmlDataList::Iterator xit = d->m_xmlFiles.begin(); for ( ; xit != d->m_xmlFiles.end(); ++xit) @@ -1389,7 +1389,7 @@ void KEditToolbarWidget::slotChangeIcon() (*d->m_kdialogProcess) << "--geticon"; (*d->m_kdialogProcess) << "Toolbar"; (*d->m_kdialogProcess) << "Actions"; - if ( !d->m_kdialogProcess->start( KProcess::NotifyOnExit ) ) { + if ( !d->m_kdialogProcess->start( TDEProcess::NotifyOnExit ) ) { kdError(240) << "Can't run " << kdialogExe << endl; delete d->m_kdialogProcess; d->m_kdialogProcess = 0; @@ -1399,11 +1399,11 @@ void KEditToolbarWidget::slotChangeIcon() m_activeList->setEnabled( false ); // don't change the current item m_toolbarCombo->setEnabled( false ); // don't change the current toolbar - connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( KProcess* ) ), - this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); + connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), + this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); } -void KEditToolbarWidget::slotProcessExited( KProcess* ) +void KEditToolbarWidget::slotProcessExited( TDEProcess* ) { m_activeList->setEnabled( true ); m_toolbarCombo->setEnabled( true ); diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index 60a15d5de..cc1a0069a 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -23,7 +23,7 @@ #include #include -class KProcess; +class TDEProcess; class KActionCollection; class TQComboBox; class TQToolButton; @@ -66,7 +66,7 @@ namespace * \code * void MyClass::slotConfigureToolbars() * { - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -76,7 +76,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * createGUI(); - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -91,7 +91,7 @@ namespace * An example would be: * * \code - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -100,7 +100,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * // Do NOT call createGUI()! - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -406,7 +406,7 @@ protected slots: void slotChangeIcon(); private slots: - void slotProcessExited( KProcess* ); + void slotProcessExited( TDEProcess* ); protected: // KDE4: make private void setupLayout(); diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp index 9ef3af912..54b2932aa 100644 --- a/tdeui/kfontcombo.cpp +++ b/tdeui/kfontcombo.cpp @@ -373,8 +373,8 @@ void KFontCombo::updateFonts() bool KFontCombo::displayFonts() { - KConfigGroupSaver saver(KGlobal::config(), "KDE"); - return KGlobal::config()->readBoolEntry("DisplayFontItems", true); + KConfigGroupSaver saver(TDEGlobal::config(), "KDE"); + return TDEGlobal::config()->readBoolEntry("DisplayFontItems", true); } void KFontCombo::virtual_hook( int id, void* data ) diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp index eb5b262f8..23d514092 100644 --- a/tdeui/kfontdialog.cpp +++ b/tdeui/kfontdialog.cpp @@ -290,7 +290,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, row ++; sampleEdit = new TQLineEdit( page, "sampleEdit"); - TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); + TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black ); sampleEdit->setFont(tmpFont); //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); @@ -325,12 +325,12 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, vbox->addWidget( xlfdEdit ); // lets initialize the display if possible - setFont( KGlobalSettings::generalFont(), usingFixed ); + setFont( TDEGlobalSettings::generalFont(), usingFixed ); // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h index 189dc1292..e7d53568a 100644 --- a/tdeui/kguiitem.h +++ b/tdeui/kguiitem.h @@ -61,10 +61,10 @@ public: TQString text() const; TQString plainText() const; #ifndef KDE_NO_COMPAT - TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; TQIconSet iconSet() const { return iconSet( KIcon::Small ); } #else - TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; #endif TQString iconName() const; diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 670439444..0faa137e4 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // I use hardcoded menu id's here. Reason is to stay backward // compatible. // - const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : TDEGlobal::instance()->aboutData(); TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new KPopupMenu(); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 0392f7d50..430a23fa0 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -125,7 +125,7 @@ void KIconView::slotSettingsChanged(int category) { if ( category != TDEApplication::SETTINGS_MOUSE ) return; - m_bUseSingle = KGlobalSettings::singleClick(); + m_bUseSingle = TDEGlobalSettings::singleClick(); //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, @@ -150,8 +150,8 @@ void KIconView::slotSettingsChanged(int category) // const TQPoint & ) ) ); } - m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); - m_autoSelectDelay = m_bUseSingle ? KGlobalSettings::autoSelectDelay() : -1; + m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); + m_autoSelectDelay = m_bUseSingle ? TDEGlobalSettings::autoSelectDelay() : -1; if( !m_bUseSingle || !m_bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -467,7 +467,7 @@ KIconViewItem::~KIconViewItem() void KIconViewItem::calcRect( const TQString& text_ ) { - bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); Q_ASSERT( iconView() ); if ( !iconView() ) @@ -704,7 +704,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) { - bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); int textX; if (drawRoundedRect == true) textX = textRect( false ).x() + 4; diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 4c291eda4..6cf02e75e 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -703,7 +703,7 @@ void KJanusWidget::slotFontChanged() { if( mTitleLabel ) { - mTitleLabel->setFont( KGlobalSettings::generalFont() ); + mTitleLabel->setFont( TDEGlobalSettings::generalFont() ); TQFont titleFont( mTitleLabel->font() ); titleFont.setBold( true ); mTitleLabel->setFont( titleFont ); diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 6d197d813..d9ae693f3 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -171,7 +171,7 @@ KKeyChooser::KKeyChooser( KAccel* pAccel, TQWidget* parent, bool bAllowLetterSho insert( pAccel ); } -KKeyChooser::KKeyChooser( KGlobalAccel* pAccel, TQWidget* parent ) +KKeyChooser::KKeyChooser( TDEGlobalAccel* pAccel, TQWidget* parent ) : TQWidget( parent ) { initGUI( ApplicationGlobal, false ); @@ -201,7 +201,7 @@ KKeyChooser::KKeyChooser( KAccel* actions, TQWidget* parent, insert( actions ); } -KKeyChooser::KKeyChooser( KGlobalAccel* actions, TQWidget* parent, +KKeyChooser::KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent, bool bCheckAgainstStdKeys, bool bAllowLetterShortcuts, bool /*bAllowWinKey*/ ) @@ -256,7 +256,7 @@ bool KKeyChooser::insert( KAccel* pAccel ) return insert( pList ); } -bool KKeyChooser::insert( KGlobalAccel* pAccel ) +bool KKeyChooser::insert( TDEGlobalAccel* pAccel ) { KShortcutList* pList = new KAccelShortcutList( pAccel ); d->rgpListsAllocated.append( pList ); @@ -296,7 +296,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) m_type = type; d->bAllowLetterShortcuts = bAllowLetterShortcuts; - d->bPreferFourModifierKeys = KGlobalAccel::useFourModifierKeys(); + d->bPreferFourModifierKeys = TDEGlobalAccel::useFourModifierKeys(); // // TOP LAYOUT MANAGER @@ -587,7 +587,7 @@ void KKeyChooser::readGlobalKeys() void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map ) { - TQMap mapEntry = KGlobal::config()->entryMap( "Global Shortcuts" ); + TQMap mapEntry = TDEGlobal::config()->entryMap( "Global Shortcuts" ); TQMap::Iterator it( mapEntry.begin() ); for( uint i = 0; it != mapEntry.end(); ++it, i++ ) map[it.key()] = KShortcut(*it); @@ -679,7 +679,7 @@ void KKeyChooser::syncToConfig( const TQString& sConfigGroup, KConfigBase* pConf { kdDebug(125) << "KKeyChooser::syncToConfig( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); KConfigGroupSaver cgs( pConfig, sConfigGroup ); TQListViewItemIterator it( d->pList ); @@ -1094,7 +1094,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } @@ -1106,14 +1106,14 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } KKeyDialog::~KKeyDialog() { - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); group.writeEntry( "Dialog Size", size(), true, true ); } @@ -1154,7 +1154,7 @@ int KKeyDialog::configure( KAccel* keys, TQWidget* parent, bool bSaveSettings ) return configure( keys, true, parent, bSaveSettings); } -int KKeyDialog::configure( KGlobalAccel* keys, TQWidget* parent, bool bSaveSettings ) +int KKeyDialog::configure( TDEGlobalAccel* keys, TQWidget* parent, bool bSaveSettings ) { return configure( keys, true, parent, bSaveSettings); } @@ -1169,7 +1169,7 @@ int KKeyDialog::configure( KAccel* keys, bool bAllowLetterShortcuts, TQWidget *p return b; } -int KKeyDialog::configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings ) +int KKeyDialog::configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings ) { KKeyDialog dlg( KKeyChooser::ApplicationGlobal, bAllowLetterShortcuts, parent ); dlg.m_pKeyChooser->insert( keys ); diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h index d291a87d9..b457f133b 100644 --- a/tdeui/kkeydialog.h +++ b/tdeui/kkeydialog.h @@ -35,17 +35,17 @@ class KAccel; class KAccelActions; class KActionCollection; class KConfigBase; -class KGlobalAccel; +class TDEGlobalAccel; class KKeySequence; class KShortcut; class KShortcutList; class KKeyChooserItem; /** - * @short Widget for configuration of KAccel and KGlobalAccel. + * @short Widget for configuration of KAccel and TDEGlobalAccel. * * Configure dictionaries of key/action associations for KAccel and - * KGlobalAccel. + * TDEGlobalAccel. * * The class takes care of all aspects of configuration, including * handling key conflicts internally. Connect to the allDefault() @@ -80,7 +80,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget KKeyChooser( KActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts = true ); KKeyChooser( KAccel* actions, TQWidget* parent, bool bAllowLetterShortcuts = true ); - KKeyChooser( KGlobalAccel* actions, TQWidget* parent ); + KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent ); KKeyChooser( KShortcutList*, TQWidget* parent, ActionType type = Application, bool bAllowLetterShortcuts = true ); virtual ~KKeyChooser(); @@ -169,7 +169,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget void initGUI( ActionType type, bool bAllowLetterShortcuts ); bool insert( KAccel* ); - bool insert( KGlobalAccel* ); + bool insert( TDEGlobalAccel* ); bool insert( KShortcutList* ); /// @since 3.1 void buildListView( uint iList, const TQString &title = TQString::null ); @@ -234,7 +234,7 @@ private slots: /** * @obsolete */ - KKeyChooser( KGlobalAccel* actions, TQWidget* parent, + KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent, bool bCheckAgainstStdKeys, bool bAllowLetterShortcuts, bool bAllowWinKey = false ); @@ -256,10 +256,10 @@ private slots: typedef KKeyChooser KKeyChooser; /** - * @short Dialog for configuration of KActionCollection, KAccel, and KGlobalAccel. + * @short Dialog for configuration of KActionCollection, KAccel, and TDEGlobalAccel. * * The KKeyDialog class is used for configuring dictionaries of key/action - * associations for KActionCollection, KAccel, and KGlobalAccel. It uses the KKeyChooser widget + * associations for KActionCollection, KAccel, and TDEGlobalAccel. It uses the KKeyChooser widget * and offers buttons to set all keys to defaults and invoke on-line help. * * Several static methods are supplied which provide the most convenient interface @@ -345,7 +345,7 @@ public: * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function. */ - static int configure( KGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); + static int configure( TDEGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); /** @@ -371,7 +371,7 @@ public: * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function. **/ - static int configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true + static int configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true /** * @deprecated Obsolete. @@ -383,7 +383,7 @@ public: * @deprecated Obsolete. * Please use KKeyDialog::configure instead */ - static KDE_DEPRECATED int configureKeys( KGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) + static KDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) { return configure( keys, parent, save_settings ); } /** * @deprecated Obsolete. diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index bc667aaf0..ece9a3ffe 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -62,7 +62,7 @@ public: if ( !initialized ) { - KConfigGroup config( KGlobal::config(), "General" ); + KConfigGroup config( TDEGlobal::config(), "General" ); backspacePerformsCompletion = config.readBoolEntry( "Backspace performs completion", false ); initialized = true; @@ -132,10 +132,10 @@ void KLineEdit::init() KCursor::setAutoHideCursor( this, true, true ); installEventFilter( this ); - KGlobalSettings::Completion mode = completionMode(); - d->autoSuggest = (mode == KGlobalSettings::CompletionMan || - mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionAuto); + TDEGlobalSettings::Completion mode = completionMode(); + d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan || + mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionAuto); connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors())); TQPalette p = palette(); @@ -147,26 +147,26 @@ void KLineEdit::init() d->drawClickMsg = false; } -void KLineEdit::setCompletionMode( KGlobalSettings::Completion mode ) +void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode ) { - KGlobalSettings::Completion oldMode = completionMode(); + TDEGlobalSettings::Completion oldMode = completionMode(); - if ( oldMode != mode && (oldMode == KGlobalSettings::CompletionPopup || - oldMode == KGlobalSettings::CompletionPopupAuto ) && + if ( oldMode != mode && (oldMode == TDEGlobalSettings::CompletionPopup || + oldMode == TDEGlobalSettings::CompletionPopupAuto ) && d->completionBox && d->completionBox->isVisible() ) d->completionBox->hide(); // If the widgets echo mode is not Normal, no completion // feature will be enabled even if one is requested. if ( echoMode() != TQLineEdit::Normal ) - mode = KGlobalSettings::CompletionNone; // Override the request. + mode = TDEGlobalSettings::CompletionNone; // Override the request. if ( kapp && !kapp->authorize("lineedit_text_completion") ) - mode = KGlobalSettings::CompletionNone; + mode = TDEGlobalSettings::CompletionNone; - if ( mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan ) + if ( mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan ) d->autoSuggest = true; else d->autoSuggest = false; @@ -194,11 +194,11 @@ void KLineEdit::setCompletedText( const TQString& t, bool marked ) void KLineEdit::setCompletedText( const TQString& text ) { - KGlobalSettings::Completion mode = completionMode(); - bool marked = ( mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan || - mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ); + TDEGlobalSettings::Completion mode = completionMode(); + bool marked = ( mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan || + mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ); setCompletedText( text, marked ); } @@ -226,15 +226,15 @@ void KLineEdit::rotateText( KCompletionBase::KeyBindingType type ) void KLineEdit::makeCompletion( const TQString& text ) { KCompletion *comp = compObj(); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( !comp || mode == KGlobalSettings::CompletionNone ) + if ( !comp || mode == TDEGlobalSettings::CompletionNone ) return; // No completion object... TQString match = comp->makeCompletion( text ); - if ( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) + if ( mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ) { if ( match.isNull() ) { @@ -254,7 +254,7 @@ void KLineEdit::makeCompletion( const TQString& text ) if ( match.isNull() || match == text ) return; - if ( mode != KGlobalSettings::CompletionShell ) + if ( mode != TDEGlobalSettings::CompletionShell ) setUserSelection(false); if ( d->autoSuggest ) @@ -522,17 +522,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // Filter key-events if EchoMode is normal and // completion mode is not set to CompletionNone if ( echoMode() == TQLineEdit::Normal && - completionMode() != KGlobalSettings::CompletionNone ) + completionMode() != TDEGlobalSettings::CompletionNone ) { KeyBindingMap keys = getKeyBindings(); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); bool noModifier = (e->state() == Qt::NoButton || e->state() == TQt::ShiftButton || e->state() == TQt::Keypad); - if ( (mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionMan) && noModifier ) + if ( (mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionMan) && noModifier ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && @@ -571,8 +571,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } - if ( (mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan) && noModifier ) + if ( (mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || @@ -639,8 +639,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } - else if (( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) && + else if (( mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ) && noModifier && !e->text().isEmpty() ) { TQString old_txt = text(); @@ -709,7 +709,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } if ( (e->key() == Key_Backspace || e->key() == Key_Delete ) && - mode == KGlobalSettings::CompletionPopupAuto ) + mode == TDEGlobalSettings::CompletionPopupAuto ) d->autoSuggest=true; e->accept(); @@ -720,7 +720,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) return; } - else if ( mode == KGlobalSettings::CompletionShell ) + else if ( mode == TDEGlobalSettings::CompletionShell ) { // Handles completion. KShortcut cut; @@ -749,7 +749,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } // handle rotation - if ( mode != KGlobalSettings::CompletionNone ) + if ( mode != TDEGlobalSettings::CompletionNone ) { // Handles previous match KShortcut cut; @@ -895,20 +895,20 @@ TQPopupMenu *KLineEdit::createPopupMenu() subMenu->setAccel( KStdAccel::completion(), ShellCompletion ); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); subMenu->setItemChecked( NoCompletion, - mode == KGlobalSettings::CompletionNone ); + mode == TDEGlobalSettings::CompletionNone ); subMenu->setItemChecked( ShellCompletion, - mode == KGlobalSettings::CompletionShell ); + mode == TDEGlobalSettings::CompletionShell ); subMenu->setItemChecked( PopupCompletion, - mode == KGlobalSettings::CompletionPopup ); + mode == TDEGlobalSettings::CompletionPopup ); subMenu->setItemChecked( AutoCompletion, - mode == KGlobalSettings::CompletionAuto ); + mode == TDEGlobalSettings::CompletionAuto ); subMenu->setItemChecked( ShortAutoCompletion, - mode == KGlobalSettings::CompletionMan ); + mode == TDEGlobalSettings::CompletionMan ); subMenu->setItemChecked( PopupAutoCompletion, - mode == KGlobalSettings::CompletionPopupAuto ); - if ( mode != KGlobalSettings::completionMode() ) + mode == TDEGlobalSettings::CompletionPopupAuto ); + if ( mode != TDEGlobalSettings::completionMode() ) { subMenu->insertSeparator(); subMenu->insertItem( i18n("Default"), Default ); @@ -925,30 +925,30 @@ TQPopupMenu *KLineEdit::createPopupMenu() void KLineEdit::completionMenuActivated( int id ) { - KGlobalSettings::Completion oldMode = completionMode(); + TDEGlobalSettings::Completion oldMode = completionMode(); switch ( id ) { case Default: - setCompletionMode( KGlobalSettings::completionMode() ); + setCompletionMode( TDEGlobalSettings::completionMode() ); break; case NoCompletion: - setCompletionMode( KGlobalSettings::CompletionNone ); + setCompletionMode( TDEGlobalSettings::CompletionNone ); break; case AutoCompletion: - setCompletionMode( KGlobalSettings::CompletionAuto ); + setCompletionMode( TDEGlobalSettings::CompletionAuto ); break; case ShortAutoCompletion: - setCompletionMode( KGlobalSettings::CompletionMan ); + setCompletionMode( TDEGlobalSettings::CompletionMan ); break; case ShellCompletion: - setCompletionMode( KGlobalSettings::CompletionShell ); + setCompletionMode( TDEGlobalSettings::CompletionShell ); break; case PopupCompletion: - setCompletionMode( KGlobalSettings::CompletionPopup ); + setCompletionMode( TDEGlobalSettings::CompletionPopup ); break; case PopupAutoCompletion: - setCompletionMode( KGlobalSettings::CompletionPopupAuto ); + setCompletionMode( TDEGlobalSettings::CompletionPopupAuto ); break; default: return; @@ -956,8 +956,8 @@ void KLineEdit::completionMenuActivated( int id ) if ( oldMode != completionMode() ) { - if ( (oldMode == KGlobalSettings::CompletionPopup || - oldMode == KGlobalSettings::CompletionPopupAuto ) && + if ( (oldMode == TDEGlobalSettings::CompletionPopup || + oldMode == TDEGlobalSettings::CompletionPopupAuto ) && d->completionBox && d->completionBox->isVisible() ) d->completionBox->hide(); emit completionModeChanged( completionMode() ); @@ -1101,7 +1101,7 @@ void KLineEdit::setCompletionBox( KCompletionBox *box ) void KLineEdit::userCancelled(const TQString & cancelText) { - if ( completionMode() != KGlobalSettings::CompletionPopupAuto ) + if ( completionMode() != TDEGlobalSettings::CompletionPopupAuto ) { // TODO: this sets modified==false. But maybe it was true before... setText(cancelText); diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index fc1f4ba4a..84e554316 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -80,7 +80,7 @@ class KURL; * second argument. * * If @p EchoMode for this widget is set to something other than @p TQLineEdit::Normal, - * the completion mode will always be defaulted to KGlobalSettings::CompletionNone. + * the completion mode will always be defaulted to TDEGlobalSettings::CompletionNone. * This is done purposefully to guard against protected entries such as passwords being * cached in KCompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the * completion mode is automatically disabled. @@ -204,7 +204,7 @@ public: * * See KCompletionBase::setCompletionMode */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Enables/disables the popup (context) menu. @@ -269,7 +269,7 @@ public: /** * @returns the completion-box, that is used in completion mode - * KGlobalSettings::CompletionPopup. + * TDEGlobalSettings::CompletionPopup. * This method will create a completion-box if none is there, yet. * * @param create Set this to false if you don't want the box to be created @@ -320,7 +320,7 @@ public: /** * Set the completion-box to be used in completion mode - * KGlobalSettings::CompletionPopup. + * TDEGlobalSettings::CompletionPopup. * This will do nothing if a completion-box already exists. * * @param box The KCompletionBox to set @@ -382,7 +382,7 @@ signals: * @p setKeyBinding for details. * * Note that this signal is @em not emitted if the completion - * mode is set to @p KGlobalSettings::CompletionNone or + * mode is set to @p TDEGlobalSettings::CompletionNone or * @p echoMode() is @em not normal. */ void textRotation( KCompletionBase::KeyBindingType ); @@ -391,7 +391,7 @@ signals: * Emitted when the user changed the completion mode by using the * popupmenu. */ - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); /** * Emitted before the context menu is displayed. diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp index 04705ad36..d4fb92ef2 100644 --- a/tdeui/klistbox.cpp +++ b/tdeui/klistbox.cpp @@ -73,7 +73,7 @@ void KListBox::slotSettingsChanged(int category) { if (category != TDEApplication::SETTINGS_MOUSE) return; - m_bUseSingle = KGlobalSettings::singleClick(); + m_bUseSingle = TDEGlobalSettings::singleClick(); disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), @@ -99,8 +99,8 @@ void KListBox::slotSettingsChanged(int category) // const TQPoint & ) ) ); } - m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); - m_autoSelectDelay = KGlobalSettings::autoSelectDelay(); + m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); + m_autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); if( !m_bUseSingle || !m_bChangeCursorOverItem ) viewport()->unsetCursor(); diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp index 29f255c3a..8aff145b8 100644 --- a/tdeui/klistview.cpp +++ b/tdeui/klistview.cpp @@ -71,7 +71,7 @@ public: : pCurrentItem (0), autoSelectDelay(0), dragOverItem(0), - dragDelay (KGlobalSettings::dndEventDelay()), + dragDelay (TDEGlobalSettings::dndEventDelay()), editor (new KListViewLineEdit (listview)), cursorInExecuteArea(false), itemsMovable (true), @@ -94,14 +94,14 @@ public: selectionDirection(0), tooltipColumn (0), selectionMode (Single), - contextMenuKey (KGlobalSettings::contextMenuKey()), - showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()), + contextMenuKey (TDEGlobalSettings::contextMenuKey()), + showContextMenusOnPress (TDEGlobalSettings::showContextMenusOnPress()), mDropVisualizerWidth (4), paintAbove (0), paintCurrent (0), paintBelow (0), painting (false), - shadeSortColumn(KGlobalSettings::shadeSortColumn()) + shadeSortColumn(TDEGlobalSettings::shadeSortColumn()) { renameable.append(0); connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int))); @@ -464,7 +464,7 @@ KListView::KListView( TQWidget *parent, const char *name ) connect (this, TQT_SIGNAL (menuShortCutPressed (KListView*, TQListViewItem*)), this, TQT_SLOT (emitContextMenu (KListView*, TQListViewItem*))); - d->alternateBackground = KGlobalSettings::alternateBackgroundColor(); + d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor(); } KListView::~KListView() @@ -544,8 +544,8 @@ void KListView::slotSettingsChanged(int category) switch (category) { case TDEApplication::SETTINGS_MOUSE: - d->dragDelay = KGlobalSettings::dndEventDelay(); - d->bUseSingle = KGlobalSettings::singleClick(); + d->dragDelay = TDEGlobalSettings::dndEventDelay(); + d->bUseSingle = TDEGlobalSettings::singleClick(); disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); @@ -554,9 +554,9 @@ void KListView::slotSettingsChanged(int category) connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); - d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); + d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); if ( !d->disableAutoSelection ) - d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); + d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); if( !d->bUseSingle || !d->bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -564,8 +564,8 @@ void KListView::slotSettingsChanged(int category) break; case TDEApplication::SETTINGS_POPUPMENU: - d->contextMenuKey = KGlobalSettings::contextMenuKey (); - d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); + d->contextMenuKey = TDEGlobalSettings::contextMenuKey (); + d->showContextMenusOnPress = TDEGlobalSettings::showContextMenusOnPress (); if (d->showContextMenusOnPress) { @@ -753,7 +753,7 @@ void KListView::leaveEvent( TQEvent *e ) bool KListView::event( TQEvent *e ) { if (e->type() == TQEvent::ApplicationPaletteChange) - d->alternateBackground=KGlobalSettings::alternateBackgroundColor(); + d->alternateBackground=TDEGlobalSettings::alternateBackgroundColor(); return TQListView::event(e); } @@ -2135,7 +2135,7 @@ void KListView::resetAutoSelection() return; d->disableAutoSelection = false; - d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); + d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); } void KListView::doubleClicked( TQListViewItem *item, const TQPoint &pos, int c ) diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index 5d2a1e705..487d4f197 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -430,7 +430,7 @@ KXMLGUIFactory *KMainWindow::guiFactory() int KMainWindow::configureToolbars() { - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); KEditToolbar dlg(actionCollection(), xmlFile(), true, this); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig())); return dlg.exec(); @@ -439,7 +439,7 @@ int KMainWindow::configureToolbars() void KMainWindow::saveNewToolbarConfig() { createGUI(xmlFile()); - applyMainWindowSettings( KGlobal::config() ); + applyMainWindowSettings( TDEGlobal::config() ); } void KMainWindow::setupGUI( int options, const TQString & xmlfile ) { @@ -1026,7 +1026,7 @@ void KMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWind this, TQT_SLOT( setSettingsDirty() ) ); // Now read the previously saved settings - applyMainWindowSettings( KGlobal::config(), groupName ); + applyMainWindowSettings( TDEGlobal::config(), groupName ); } void KMainWindow::resetAutoSaveSettings() @@ -1050,8 +1050,8 @@ void KMainWindow::saveAutoSaveSettings() { Q_ASSERT( d->autoSaveSettings ); //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl; - saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup ); - KGlobal::config()->sync(); + saveMainWindowSettings( TDEGlobal::config(), d->autoSaveGroup ); + TDEGlobal::config()->sync(); d->settingsDirty = false; if ( d->settingsTimer ) d->settingsTimer->stop(); diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index 56b5f2666..a90d3dc12 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -428,7 +428,7 @@ public: * Call this to enable "auto-save" of toolbar/menubar/statusbar settings * (and optionally window size). * If the *bars were moved around/shown/hidden when the window is closed, - * saveMainWindowSettings( KGlobal::config(), groupName ) will be called. + * saveMainWindowSettings( TDEGlobal::config(), groupName ) will be called. * * @param groupName a name that identifies this "type of window". * You can have several types of window in the same application. @@ -731,7 +731,7 @@ public slots: * Example (adding a help button to the first toolbar): * * \code - * KIconLoader &loader = *KGlobal::iconLoader(); + * KIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 7f6983275..7266d8d91 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -235,7 +235,7 @@ void KMenuBar::show() void KMenuBar::slotReadConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE" ); setTopLevelMenuInternal( config->readBoolEntry( "macStyle", false ) ); } @@ -329,7 +329,7 @@ void KMenuBar::selectionTimeout() if ( d->topLevel ) { d->fallback_mode = true; // KMenuBar is handling its position itself - KConfigGroup xineramaConfig(KGlobal::config(),"Xinerama"); + KConfigGroup xineramaConfig(TDEGlobal::config(),"Xinerama"); int screen = xineramaConfig.readNumEntry("MenubarScreen", TQApplication::desktop()->screenNumber(TQPoint(0,0)) ); TQRect area; diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 2dd4c8ca5..4037ffdcc 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -82,7 +82,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) break; } - TQPixmap ret = KGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap ret = TDEGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (ret.isNull()) return TQMessageBox::standardIcon(icon); @@ -174,7 +174,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, dialog->font()); - TQRect d = KGlobalSettings::desktopGeometry(dialog); + TQRect d = TDEGlobalSettings::desktopGeometry(dialog); pref_width = d.width() / 3; rt.setWidth(pref_width); @@ -343,7 +343,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); if (dontAsk == "yes") { @@ -362,7 +362,7 @@ KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); } @@ -373,7 +373,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); config->sync(); @@ -384,7 +384,7 @@ KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); config->sync(); @@ -935,7 +935,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri void KMessageBox::enableAllMessages() { - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; @@ -955,7 +955,7 @@ KMessageBox::enableAllMessages() void KMessageBox::enableMessage(const TQString &dontShowAgainName) { - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h index f9d76688c..574ae9ea8 100644 --- a/tdeui/kmessagebox.h +++ b/tdeui/kmessagebox.h @@ -1094,7 +1094,7 @@ public: /** * Use @p cfg for all settings related to the dontShowAgainName feature. - * If @p cfg is 0 (default) KGlobal::config() will be used. + * If @p cfg is 0 (default) TDEGlobal::config() will be used. * @since 3.2 */ static void setDontShowAskAgainConfig(KConfig* cfg); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 238eeee7a..f6c3d9dd7 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -1129,7 +1129,7 @@ void KDoubleSpinBox::setLineStep( double step ) { TQString KDoubleSpinBox::mapValueToText( int value ) { if ( acceptLocalizedNumbers() ) - return KGlobal::locale() + return TDEGlobal::locale() ->formatNumber( d->mapToDouble( value ), d->mPrecision ); else return TQString().setNum( d->mapToDouble( value ), 'f', d->mPrecision ); @@ -1138,7 +1138,7 @@ TQString KDoubleSpinBox::mapValueToText( int value ) { int KDoubleSpinBox::mapTextToValue( bool * ok ) { double value; if ( acceptLocalizedNumbers() ) - value = KGlobal::locale()->readNumber( cleanText(), ok ); + value = TDEGlobal::locale()->readNumber( cleanText(), ok ); else value = cleanText().toDouble( ok ); if ( !*ok ) return 0; diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp index fdc51022c..89f0ca88c 100644 --- a/tdeui/knumvalidator.cpp +++ b/tdeui/knumvalidator.cpp @@ -214,13 +214,13 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==TDEGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { val = newStr.toDouble(&ok); if(!ok && d->acceptLocalizedNumbers) - val= KGlobal::locale()->readNumber(newStr,&ok); + val= TDEGlobal::locale()->readNumber(newStr,&ok); } else { val = 0; @@ -326,7 +326,7 @@ void KDoubleValidator::setAcceptLocalizedNumbers( bool accept ) { TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const { TQString s = input; if ( acceptLocalizedNumbers() ) { - KLocale * l = KGlobal::locale(); + KLocale * l = TDEGlobal::locale(); // ok, we have to re-format the number to have: // 1. decimalSymbol == '.' // 2. negativeSign == '-' diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 5209c515f..50a16fd27 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -80,7 +80,7 @@ class TQPopupMenu; * { * KPanelApplet* init(TQWidget *parent, const TQString& configFile) * { - * KGlobal::locale()->insertCatalogue("exampleapplet"); + * TDEGlobal::locale()->insertCatalogue("exampleapplet"); * return new ExampleApplet(configFile, KPanelApplet::Normal, * KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, * parent, "exampleapplet"); diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index e8d7e5a28..437f3795e 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -80,7 +80,7 @@ class KPanelExtensionPrivate; * { * KPanelExtension* init(TQWidget *parent, const TQString& configFile) * { - * KGlobal::locale()->insertCatalogue("exampleextension"); + * TDEGlobal::locale()->insertCatalogue("exampleextension"); * return new ExampleExtension(configFile, KPanelExtension::Normal, * KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences, * parent, "exampleextension"); diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index ed13502a4..194801ff2 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -63,7 +63,7 @@ void KPanelMenu::init(const TQString& path) connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); // setup cache timer - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("menus"); d->clearDelay = config->readNumEntry("MenuCacheTime", 60000); // 1 minute diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 489e14d8f..3b3d74be2 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -110,7 +110,7 @@ KPasswordEdit::KPasswordEdit(TQWidget *parent, const char *name) { init(); - KConfig* const cfg = KGlobal::config(); + KConfig* const cfg = TDEGlobal::config(); KConfigGroupSaver saver(cfg, "Passwords"); const TQString val = cfg->readEntry("EchoMode", "OneStar"); @@ -338,7 +338,7 @@ void KPasswordDialog::init() { m_Row = 0; - KConfig* const cfg = KGlobal::config(); + KConfig* const cfg = TDEGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) @@ -351,7 +351,7 @@ void KPasswordDialog::init() // Row 1: pixmap + prompt TQLabel *lbl; - const TQPixmap pix( KGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + const TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 1e86bc57f..fe2414a67 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -300,7 +300,7 @@ void KPassivePopup::moveNear( TQRect target ) int w = width(); int h = height(); - TQRect r = KGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); + TQRect r = TDEGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); if( d->popupStyle == Balloon ) { @@ -359,7 +359,7 @@ void KPassivePopup::updateMask() { // get screen-geometry for screen our anchor is on // (geometry can differ from screen to screen! - TQRect deskRect = KGlobalSettings::desktopGeometry(d->anchor); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(d->anchor); int xh = 70, xl = 40; if( width() < 80 ) diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index aafb7f3c2..4164e7db2 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -87,7 +87,7 @@ KPixmapIO::KPixmapIO() #ifdef HAVE_MITSHM setShmPolicy(ShmDontKeep); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (!config->readBoolEntry("UseMitShm", true)) return; diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 07127cdc8..c61d140dd 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -114,7 +114,7 @@ void KPushButton::init( const KGuiItem &item ) void KPushButton::readSettings() { - s_useIcons = KGlobalSettings::showIconsOnPushButtons(); + s_useIcons = TDEGlobalSettings::showIconsOnPushButtons(); } void KPushButton::setGuiItem( const KGuiItem& item ) @@ -195,7 +195,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) if ( (e->state() & Qt::LeftButton) && (e->pos() - startPos).manhattanLength() > - KGlobalSettings::dndEventDelay() ) + TDEGlobalSettings::dndEventDelay() ) { startDrag(); setDown( false ); diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h index 2beed9e52..ee7bb3b52 100644 --- a/tdeui/kpushbutton.h +++ b/tdeui/kpushbutton.h @@ -102,7 +102,7 @@ public: /** * Sets the Icon Set for this button. It also takes into account hte - * KGlobalSettings::showIconsOnPushButtons() setting. + * TDEGlobalSettings::showIconsOnPushButtons() setting. */ void setIconSet( const TQIconSet &iconSet ); diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 5ca0c2b85..824e92bfc 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -80,7 +80,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, , clientcombo(0) { d = new KSpellConfigPrivate; - kc = KGlobal::config(); + kc = TDEGlobal::config(); if( !_ksc ) { @@ -277,12 +277,12 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, // but since aspell 0.6 also 3-character ISO-codes can be used if ( (dname.length() == 2) || (dname.length() == 3) ) { lname = dname; - hname = KGlobal::locale()->twoAlphaToLanguageName( lname ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName( lname ); } else if ( (dname.length() == 5) && (dname[2] == '_') ) { lname = dname.left(2); - hname = KGlobal::locale()->twoAlphaToLanguageName(lname); - TQString country = KGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName(lname); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); if ( extension.isEmpty() ) extension = country; else @@ -363,9 +363,9 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, } //We have explicitly chosen English as the default here. - if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") && + if ( ( TDEGlobal::locale()->language() == TQString::fromLatin1("C") && lname==TQString::fromLatin1("en") ) || - KGlobal::locale()->language() == lname ) + TDEGlobal::locale()->language() == lname ) return true; return false; diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index 1d37d03d3..5750c8832 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -54,7 +54,7 @@ KScrollView::~KScrollView() void KScrollView::scrollBy(int dx, int dy) { - KConfigGroup cfg( KGlobal::config(), "KDE" ); + KConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", true )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp index 27d721626..1ed3b7df7 100644 --- a/tdeui/kshortcutdialog.cpp +++ b/tdeui/kshortcutdialog.cpp @@ -119,7 +119,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T setShortcut( shortcut ); resize( 0, 0 ); - s_showMore = KConfigGroup(KGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); + s_showMore = KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); updateDetails(); #ifdef Q_WS_X11 @@ -129,7 +129,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T KShortcutDialog::~KShortcutDialog() { - KConfigGroup group(KGlobal::config(), "General"); + KConfigGroup group(TDEGlobal::config(), "General"); group.writeEntry("ShowAlternativeShortcutConfig", s_showMore); } diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp index 7a17ad607..b91c74a4d 100644 --- a/tdeui/kspell.cpp +++ b/tdeui/kspell.cpp @@ -296,11 +296,11 @@ KSpell::startIspell() if (trystart == 0) //don't connect these multiple times { - connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(ispellErrors(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(ispellExit (KProcess *)) ); + connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(ispellExit (TDEProcess *)) ); OUTPUT(KSpell2); } @@ -313,7 +313,7 @@ KSpell::startIspell() } void -KSpell::ispellErrors( KProcess *, char *buffer, int buflen ) +KSpell::ispellErrors( TDEProcess *, char *buffer, int buflen ) { buffer[buflen-1] = '\0'; // kdDebug(750) << "ispellErrors [" << buffer << "]\n" << endl; @@ -1313,7 +1313,7 @@ void KSpell::cleanUp() proc->closeStdin(); } -void KSpell::ispellExit( KProcess* ) +void KSpell::ispellExit( TDEProcess* ) { kdDebug() << "KSpell::ispellExit() " << m_status << endl; diff --git a/tdeui/kspell.h b/tdeui/kspell.h index e96b61a2e..fef733507 100644 --- a/tdeui/kspell.h +++ b/tdeui/kspell.h @@ -28,7 +28,7 @@ class TQTextCodec; class KProcIO; -class KProcess; +class TDEProcess; class KSpellDlg; /** @@ -461,9 +461,9 @@ protected slots: void suggestWord( KProcIO * ); void slotStopCancel (int); - void ispellExit (KProcess *); + void ispellExit (TDEProcess *); void emitDeath(); - void ispellErrors (KProcess *, char *, int); + void ispellErrors (TDEProcess *, char *, int); void checkNext(); private slots: diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp index 6d605dcd7..b88be8e06 100644 --- a/tdeui/ksplashscreen.cpp +++ b/tdeui/ksplashscreen.cpp @@ -27,7 +27,7 @@ KSplashScreen::KSplashScreen(const TQPixmap &pixmap, WFlags f): TQSplashScreen(pixmap, f) { - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); resize(pixmap.width(), pixmap.height()); setGeometry( ( desk.width() / 2 ) - ( width() / 2 ) + desk.left(), ( desk.height() / 2 ) - ( height() / 2 ) + desk.top(), diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index b70c8ae9c..444f34c6b 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -63,7 +63,7 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name ) { // make the size grip stuff configurable // ...but off by default (sven) - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString group(config->group()); config->setGroup(TQString::fromLatin1("StatusBar style")); bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false); diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp index befd93fc1..2f33e4843 100644 --- a/tdeui/kstdaction.cpp +++ b/tdeui/kstdaction.cpp @@ -64,13 +64,13 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch case Preferences: case HelpContents: { - const TDEAboutData *aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData(); /* TODO KDE4 const TDEAboutData *aboutData; if ( parent ) aboutData = parent->instance()->aboutData(); else - aboutData = KGlobal::instance()->aboutData(); + aboutData = TDEGlobal::instance()->aboutData(); */ TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name()); sLabel = i18n(pInfo->psLabel).arg(appName); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index fa43dcaf2..5ce1bc074 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -114,7 +114,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( if (defaultLanguages.count() == 0) { - d->addLanguageButton(KGlobal::locale()->defaultLanguage(), true); + d->addLanguageButton(TDEGlobal::locale()->defaultLanguage(), true); } TQHBoxLayout *addButtonHorizontalLayout = new TQHBoxLayout(); @@ -185,7 +185,7 @@ void KSwitchLanguageDialog::languageOnButtonChanged(const TQString & languageCod { //update all buttons which have matching id //might update buttons which were not changed, but well... - languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode)); + languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode)); } } } @@ -207,7 +207,7 @@ void KSwitchLanguageDialog::slotOk() first = false; } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (d->applicationLanguageList().join(":") != languageString) { @@ -241,7 +241,7 @@ KSwitchLanguageDialogPrivate::KSwitchLanguageDialogPrivate( void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *button) { - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQStringList allLanguages = locale->allLanguagesTwoAlpha(); for ( TQStringList::ConstIterator it = allLanguages.begin(); it != allLanguages.end(); ++it ) { @@ -258,7 +258,7 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList languagesList; if (config->hasGroup("Locale")) @@ -272,7 +272,7 @@ TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() } if (languagesList.empty()) { - languagesList = KGlobal::locale()->languageList(); + languagesList = TDEGlobal::locale()->languageList(); } return languagesList; } @@ -283,7 +283,7 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo KLanguageButton *languageButton = new KLanguageButton(page); - languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode)); + languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode)); fillApplicationLanguages(languageButton); diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index e118fcd74..66b43e26f 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -290,7 +290,7 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, d->checksDone = 0; d->completeRehighlightRequired = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "KSpell" ); d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 ); d->disablePercentage = QMIN( d->disablePercentage, 101 ); @@ -335,7 +335,7 @@ KDictSpellingHighlighter::~KDictSpellingHighlighter() void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) { kdDebug(0) << "KDictSpellingHighlighter::slotSpellReady( " << spell << " )" << endl; - KConfigGroup cg( KGlobal::config(),"KSpell" ); + KConfigGroup cg( TDEGlobal::config(),"KSpell" ); if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { @@ -539,7 +539,7 @@ void KDictSpellingHighlighter::slotLocalSpellConfigChanged() TQString KDictSpellingHighlighter::spellKey() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "KSpell" ); config->reparseConfiguration(); TQString key; diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 668f070dd..e24fde38a 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -95,7 +95,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) { d->on_all_desktops = false; } - setCaption( KGlobal::instance()->aboutData()->programName()); + setCaption( TDEGlobal::instance()->aboutData()->programName()); setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h index a74dc9be6..151cf0166 100644 --- a/tdeui/ksystemtray.h +++ b/tdeui/ksystemtray.h @@ -117,7 +117,7 @@ public: * * @since 3.2 */ - static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=TDEGlobal::instance() ); /** * Loads an icon @p icon using the icon loader class of the given instance @p instance. @@ -128,7 +128,7 @@ public: * * @since 3.5.12 */ - static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=TDEGlobal::instance() ); signals: /** diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index a2d20a505..35242da4c 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mDragSwitchTab = 0; } - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } else if ( e->state() == Qt::MidButton ) { if (mReorderStartTab==-1) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index a87a677d6..1be5985ad 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -42,9 +42,9 @@ public: KTabWidgetPrivate() { m_automaticResizeTabs = false; - KConfigGroupSaver groupsaver(KGlobal::config(), "General"); - m_maxLength = KGlobal::config()->readNumEntry("MaximumTabLength", 30); - m_minLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3); + KConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); + m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30); + m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3); m_CurrentMaxLength = m_minLength; } }; diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index 6b3685a81..15f14d711 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -112,7 +112,7 @@ void KTextBrowser::viewportMouseMoveEvent( TQMouseEvent* e) void KTextBrowser::contentsWheelEvent( TQWheelEvent *e ) { - if ( KGlobalSettings::wheelMouseZooms() ) + if ( TDEGlobalSettings::wheelMouseZooms() ) TQTextBrowser::contentsWheelEvent( e ); else // thanks, we don't want to zoom, so skip QTextEdit's impl. TQScrollView::contentsWheelEvent( e ); diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index bc077ddb2..5b1795321 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -252,7 +252,7 @@ TQPopupMenu *KTextEdit::createPopupMenu() void KTextEdit::contentsWheelEvent( TQWheelEvent *e ) { - if ( KGlobalSettings::wheelMouseZooms() ) + if ( TDEGlobalSettings::wheelMouseZooms() ) TQTextEdit::contentsWheelEvent( e ); else // thanks, we don't want to zoom, so skip QTextEdit's impl. TQScrollView::contentsWheelEvent( e ); diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h index 8e42e3a6a..3400e256b 100644 --- a/tdeui/ktimezonewidget.h +++ b/tdeui/ktimezonewidget.h @@ -98,7 +98,7 @@ public: * transformed via an i18n lookup, so the caller should previously have * set the timezone catalogue: * \code - * KGlobal::locale()->insertCatalogue("timezones"); + * TDEGlobal::locale()->insertCatalogue("timezones"); * \endcode * * @return formatted timezone name. diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 3be1d57e6..b9e3bc594 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) { TQString tipFile = _tipFile; if (tipFile.isEmpty()) - tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; + tipFile = TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips"; loadTips(tipFile); @@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) { if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) ) { - addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); + addTips(TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips"); } else { @@ -180,7 +180,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQImage img; int h,s,v; - mBlendedColor = KGlobalSettings::activeTitleColor(); + mBlendedColor = TDEGlobalSettings::activeTitleColor(); mBlendedColor.hsv(&h,&s,&v); mBlendedColor.setHsv(h, int(s*(71/76.0)), int(v*(67/93.0))); @@ -194,11 +194,11 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); } - mBaseColor = KGlobalSettings::alternateBackgroundColor(); + mBaseColor = TDEGlobalSettings::alternateBackgroundColor(); mBaseColor.hsv(&h,&s,&v); mBaseColor.setHsv(h, int(s*(10/6.0)), int(v*(93/99.0))); - mTextColor = KGlobalSettings::textColor(); + mTextColor = TDEGlobalSettings::textColor(); mDatabase = db; @@ -206,8 +206,8 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) setCaption(i18n("Tip of the Day")); #ifdef Q_WS_X11 KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint()); @@ -222,7 +222,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *titlePane = new TQLabel(this); titlePane->setBackgroundPixmap(locate("data", "tdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); - titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); + titlePane->setFont(TQFont(TDEGlobalSettings::generalFont().family(), 20, TQFont::Bold)); titlePane->setAlignment(TQLabel::AlignCenter); pl->addWidget(titlePane, 100); } @@ -244,7 +244,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mTipText->setWrapPolicy( TQTextEdit::AtWordOrDocumentBoundary ); mTipText->mimeSourceFactory()->addFilePath( - KGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); + TDEGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); mTipText->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); mTipText->setHScrollBarMode(TQScrollView::AlwaysOff); mTipText->setLinkUnderline(false); @@ -258,7 +258,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) pal.setColor( TQPalette::Inactive, TQColorGroup::Link, mBlendedColor ); mTipText->setPalette(pal); - TQStringList icons = KGlobal::dirs()->resourceDirs("icon"); + TQStringList icons = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::Iterator it; for (it = icons.begin(); it != icons.end(); ++it) mTipText->mimeSourceFactory()->addFilePath(*it); @@ -273,7 +273,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) resize(550, 230); TQSize sh = size(); - TQRect rect = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect rect = TDEGlobalSettings::splashScreenDesktopGeometry(); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); @@ -374,7 +374,7 @@ static TQString fixTip(TQString tip) if (iconRegExp.search(tip)>-1) { TQString iconName = iconRegExp.cap(1); if (!iconName.isEmpty()) - if (KGlobal::dirs()->findResource("icon", iconName).isEmpty()) + if (TDEGlobal::dirs()->findResource("icon", iconName).isEmpty()) tip.replace("crystalsvg","hicolor"); } diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index 0fd9e5ada..b6c67568d 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -913,9 +913,9 @@ int KToolBar::iconSize() const int KToolBar::iconSizeDefault() const { if (!::qstrcmp(name(), "mainToolBar")) - return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + return TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); - return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); + return TDEGlobal::iconLoader()->currentSize(KIcon::Toolbar); } void KToolBar::setEnableContextMenu(bool enable ) @@ -1020,7 +1020,7 @@ void KToolBar::saveState() } // if that didn't work, we save to the config file - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); saveSettings(config, TQString::null); config->sync(); } @@ -1469,13 +1469,13 @@ void KToolBar::slotReadConfig() // Read appearance settings (hmm, we used to do both here, // but a well behaved application will call applyMainWindowSettings // anyway, right ?) - applyAppearanceSettings(KGlobal::config(), TQString::null ); + applyAppearanceSettings(TDEGlobal::config(), TQString::null ); } void KToolBar::slotAppearanceChanged() { // Read appearance settings from global file. - applyAppearanceSettings(KGlobal::config(), TQString::null, true /* lose local settings */ ); + applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ ); // And remember to save the new look later KMainWindow *kmw = tqt_dynamic_cast(mainWindow()); @@ -1487,24 +1487,24 @@ void KToolBar::slotAppearanceChanged() bool KToolBar::highlightSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); } //static bool KToolBar::transparentSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); } //static KToolBar::IconText KToolBar::iconTextSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + TQString icontext = TDEGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; else if ( icontext == "IconTextBottom" ) @@ -1527,12 +1527,12 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG // This is the reason for the xmlgui tests below. bool xmlgui = d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty(); - KConfig *gconfig = KGlobal::config(); + KConfig *gconfig = TDEGlobal::config(); - static const TQString &attrIconText = KGlobal::staticQString("IconText"); - static const TQString &attrHighlight = KGlobal::staticQString("Highlighting"); - static const TQString &attrTrans = KGlobal::staticQString("TransparentMoving"); - static const TQString &attrIconSize = KGlobal::staticQString("IconSize"); + static const TQString &attrIconText = TDEGlobal::staticQString("IconText"); + static const TQString &attrHighlight = TDEGlobal::staticQString("Highlighting"); + static const TQString &attrTrans = TDEGlobal::staticQString("TransparentMoving"); + static const TQString &attrIconSize = TDEGlobal::staticQString("IconSize"); // we actually do this in two steps. // First, we read in the global styles [Toolbar style] (from the KControl module). @@ -1670,11 +1670,11 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool { KConfigGroupSaver cgs(config, configGroup); - static const TQString &attrPosition = KGlobal::staticQString("Position"); - static const TQString &attrIndex = KGlobal::staticQString("Index"); - static const TQString &attrOffset = KGlobal::staticQString("Offset"); - static const TQString &attrNewLine = KGlobal::staticQString("NewLine"); - static const TQString &attrHidden = KGlobal::staticQString("Hidden"); + static const TQString &attrPosition = TDEGlobal::staticQString("Position"); + static const TQString &attrIndex = TDEGlobal::staticQString("Index"); + static const TQString &attrOffset = TDEGlobal::staticQString("Offset"); + static const TQString &attrNewLine = TDEGlobal::staticQString("NewLine"); + static const TQString &attrHidden = TDEGlobal::staticQString("Hidden"); TQString position = config->readEntry(attrPosition, d->PositionDefault); int index = config->readNumEntry(attrIndex, -1); @@ -2062,7 +2062,7 @@ KPopupMenu *KToolBar::contextMenu() KPopupMenu *size = new KPopupMenu( context, "size" ); size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); // Query the current theme for available sizes - KIconTheme *theme = KGlobal::instance()->iconLoader()->theme(); + KIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); TQValueList avSizes; if (theme) { diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index aa3717324..5fffdd592 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -207,7 +207,7 @@ public: */ int insertButton(const TQString& icon, int id, bool enabled = true, const TQString& text = TQString::null, int index=-1, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * This is the same as above, but with specified signals and @@ -230,7 +230,7 @@ public: int insertButton(const TQString& icon, int id, const char *signal, const TQObject *receiver, const char *slot, bool enabled = true, const TQString& text = TQString::null, - int index=-1, TDEInstance *_instance = KGlobal::instance() ); + int index=-1, TDEInstance *_instance = TDEGlobal::instance() ); /** * Inserts a button (a KToolBarButton) with the specified diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index 66b9d6ee9..5a4240f04 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -69,7 +69,7 @@ public: m_iconSize = 0; m_parent = 0; - m_instance = KGlobal::instance(); + m_instance = TDEGlobal::instance(); } ~KToolBarButtonPrivate() { @@ -209,7 +209,7 @@ void KToolBarButton::modeChange() if (d->m_iconText != KToolBar::IconOnly) { // okay, we have to deal with fonts. let's get our information now - TQFont tmp_font = KGlobalSettings::toolBarFont(); + TQFont tmp_font = TDEGlobalSettings::toolBarFont(); // now parse out our font sizes from our chosen font TQFontMetrics fm(tmp_font); @@ -421,7 +421,7 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if ((mev->pos() - d->m_mousePressPos).manhattanLength() - > KGlobalSettings::dndEventDelay()) + > TDEGlobalSettings::dndEventDelay()) { openPopup(); return true; @@ -498,7 +498,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); int dx, dy; - TQFont tmp_font(KGlobalSettings::toolBarFont()); + TQFont tmp_font(TDEGlobalSettings::toolBarFont()); TQFontMetrics fm(tmp_font); TQRect textRect; int textFlags = 0; @@ -606,11 +606,11 @@ void KToolBarButton::drawButton( TQPainter *_painter ) // Draw the text at the position given by textRect, and using textFlags if (!textLabel().isNull() && !textRect.isNull()) { - _painter->setFont(KGlobalSettings::toolBarFont()); + _painter->setFont(TDEGlobalSettings::toolBarFont()); if (!isEnabled()) _painter->setPen(palette().disabled().dark()); else if(d->m_isRaised) - _painter->setPen(KGlobalSettings::toolBarHighlightColor()); + _painter->setPen(TDEGlobalSettings::toolBarHighlightColor()); else _painter->setPen( colorGroup().buttonText() ); _painter->drawText(textRect, textFlags, textLabel()); diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h index df26fea7c..126f8923a 100644 --- a/tdeui/ktoolbarbutton.h +++ b/tdeui/ktoolbarbutton.h @@ -61,7 +61,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 71f90abd9..0a95a2c70 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -36,7 +36,7 @@ class KURLLabel::Private public: Private (const TQString& url, KURLLabel* label) : URL (url), - LinkColor (KGlobalSettings::linkColor()), + LinkColor (TDEGlobalSettings::linkColor()), HighlightedLinkColor (Qt::red), Tip(url), Cursor (0L), @@ -358,7 +358,7 @@ bool KURLLabel::event (TQEvent *e) p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setColor(TQColorGroup::Foreground, palette().active().foreground()); setPalette(p); - d->LinkColor = KGlobalSettings::linkColor(); + d->LinkColor = TDEGlobalSettings::linkColor(); setLinkColor(d->LinkColor); return true; } diff --git a/tdeui/kwizard.cpp b/tdeui/kwizard.cpp index 21462faad..0e378dbf2 100644 --- a/tdeui/kwizard.cpp +++ b/tdeui/kwizard.cpp @@ -31,7 +31,7 @@ KWizard::KWizard( TQWidget *parent, const char *name, bool modal, WFlags f ) : TQWizard( parent, name, modal, f ) { - bool useIcons = KGlobalSettings::showIconsOnPushButtons(); + bool useIcons = TDEGlobalSettings::showIconsOnPushButtons(); if ( useIcons ) { diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index 43f716870..32083a2c3 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -176,7 +176,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { TDEInstance *instance = d->m_instance; if ( !instance ) - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); pix = SmallIconSet( icon, 16, instance ); } @@ -351,7 +351,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::tqqt_cast( parent ) && KGlobalSettings::insertTearOffHandle()) + if ( ::tqqt_cast( parent ) && TDEGlobalSettings::insertTearOffHandle()) return static_cast(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) @@ -373,7 +373,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { TDEInstance *instance = d->m_instance; if ( !instance ) - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); pix = SmallIcon( icon, instance ); } diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index d8548cadb..da22e83fb 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -41,7 +41,7 @@ class KXMLGUIClientPrivate public: KXMLGUIClientPrivate() { - m_instance = KGlobal::instance(); + m_instance = TDEGlobal::instance(); m_parent = 0L; m_builder = 0L; m_actionCollection = 0; @@ -116,7 +116,7 @@ KActionCollection *KXMLGUIClient::actionCollection() const KAction *KXMLGUIClient::action( const TQDomElement &element ) const { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); return actionCollection()->action( element.attribute( attrName ).latin1() ); } @@ -250,17 +250,17 @@ void KXMLGUIClient::setDOMDocument( const TQDomDocument &document, bool merge ) bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, KActionCollection *actionCollection ) { - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagMerge = KGlobal::staticQString( "Merge" ); - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrAppend = KGlobal::staticQString( "append" ); - static const TQString &attrWeakSeparator = KGlobal::staticQString( "weakSeparator" ); - static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); - static const TQString &tagText = KGlobal::staticQString( "text" ); - static const TQString &attrAlreadyVisited = KGlobal::staticQString( "alreadyVisited" ); - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); - static const TQString &attrOne = KGlobal::staticQString( "1" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrAppend = TDEGlobal::staticQString( "append" ); + static const TQString &attrWeakSeparator = TDEGlobal::staticQString( "weakSeparator" ); + static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); + static const TQString &tagText = TDEGlobal::staticQString( "text" ); + static const TQString &attrAlreadyVisited = TDEGlobal::staticQString( "alreadyVisited" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); + static const TQString &attrOne = TDEGlobal::staticQString( "1" ); // there is a possibility that we don't want to merge in the // additive.. rather, we might want to *replace* the base with the @@ -501,9 +501,9 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive ) { - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQDomNode n = additive.firstChild(); while ( !n.isNull() ) diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 3c3f24668..78b918862 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -51,9 +51,9 @@ class KXMLGUIFactoryPrivate : public BuildState public: KXMLGUIFactoryPrivate() { - static const TQString &defaultMergingName = KGlobal::staticQString( "" ); - static const TQString &actionList = KGlobal::staticQString( "actionlist" ); - static const TQString &name = KGlobal::staticQString( "name" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); + static const TQString &actionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &name = TDEGlobal::staticQString( "name" ); m_rootNode = new ContainerNode( 0L, TQString::null, 0L ); m_defaultMergingName = defaultMergingName; @@ -103,7 +103,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInst TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance ) { - const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance(); TQString xml_file; if (!TQDir::isRelativePath(filename)) @@ -142,7 +142,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, const TQString& filename, const TDEInstance *_instance ) { - const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance(); TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) @@ -224,7 +224,7 @@ KXMLGUIFactory::~KXMLGUIFactory() void KXMLGUIFactory::addClient( KXMLGUIClient *client ) { kdDebug(1002) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis - static const TQString &actionPropElementName = KGlobal::staticQString( "ActionProperties" ); + static const TQString &actionPropElementName = TDEGlobal::staticQString( "ActionProperties" ); if ( client->factory() ) { if ( client->factory() == this ) @@ -497,7 +497,7 @@ void KXMLGUIFactory::unplugActionList( KXMLGUIClient *client, const TQString &na void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElement ) { - static const TQString &tagAction = KGlobal::staticQString( "action" ); + static const TQString &tagAction = TDEGlobal::staticQString( "action" ); for (TQDomNode n = actionPropElement.firstChild(); !n.isNull(); n = n.nextSibling() ) @@ -528,7 +528,7 @@ void KXMLGUIFactory::configureAction( KAction *action, const TQDomNamedNodeMap & void KXMLGUIFactory::configureAction( KAction *action, const TQDomAttr &attribute ) { - static const TQString &attrShortcut = KGlobal::staticQString( "shortcut" ); + static const TQString &attrShortcut = TDEGlobal::staticQString( "shortcut" ); TQString attrName = attribute.name(); // If the attribute is a deprecated "accel", change to "shortcut". @@ -588,8 +588,8 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create ) { - static const TQString& attrName = KGlobal::staticQString( "name" ); - static const TQString& tagAction = KGlobal::staticQString( "Action" ); + static const TQString& attrName = TDEGlobal::staticQString( "name" ); + static const TQString& tagAction = TDEGlobal::staticQString( "Action" ); for( TQDomNode it = elem.firstChild(); !it.isNull(); it = it.nextSibling() ) { TQDomElement e = it.toElement(); if( e.attribute( attrName ) == sName ) diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp index 26d120de7..522fb659d 100644 --- a/tdeui/kxmlguifactory_p.cpp +++ b/tdeui/kxmlguifactory_p.cpp @@ -220,7 +220,7 @@ void ContainerNode::plugActionList( BuildState &state ) void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -262,7 +262,7 @@ void ContainerNode::unplugActionList( BuildState &state ) void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -365,7 +365,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement, ContainerNode *childNode ) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); // ### slow for ( TQDomNode n = baseElement.firstChild(); !n.isNull(); @@ -412,7 +412,7 @@ void ContainerNode::unplugActions( BuildState &state ) void ContainerNode::unplugClient( ContainerClient *client ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); assert( builder ); @@ -497,7 +497,7 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName, int BuildHelper::calcMergingIndex( const TQDomElement &element, MergingIndexList::Iterator &it, TQString &group ) { - static const TQString &attrGroup = KGlobal::staticQString( "group" ); + static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); bool haveGroup = false; group = element.attribute( attrGroup ); @@ -521,7 +521,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node ) : containerClient( 0 ), ignoreDefaultMergingIndex( false ), m_state( state ), parentNode( node ) { - static const TQString &defaultMergingName = KGlobal::staticQString( "" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); // create a list of supported container and custom tags customTags = m_state.builderCustomTags; @@ -556,12 +556,12 @@ void BuildHelper::build( const TQDomElement &element ) void BuildHelper::processElement( const TQDomElement &e ) { // some often used QStrings - static const TQString &tagAction = KGlobal::staticQString( "action" ); - static const TQString &tagMerge = KGlobal::staticQString( "merge" ); - static const TQString &tagState = KGlobal::staticQString( "state" ); - static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticQString( "action" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "merge" ); + static const TQString &tagState = TDEGlobal::staticQString( "state" ); + static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString tag( e.tagName().lower() ); TQString currName( e.attribute( attrName ) ); @@ -670,10 +670,10 @@ void BuildHelper::processStateElement( const TQDomElement &element ) void BuildHelper::processMergeElement( const TQString &tag, const TQString &name, const TQDomElement &e ) { - static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); - static const TQString &defaultMergingName = KGlobal::staticQString( "" ); - static const TQString &attrGroup = KGlobal::staticQString( "group" ); + static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); + static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); TQString mergingName( name ); if ( mergingName.isEmpty() ) @@ -734,7 +734,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name void BuildHelper::processContainerElement( const TQDomElement &e, const TQString &tag, const TQString &name ) { - static const TQString &defaultMergingName = KGlobal::staticQString( "" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); ContainerNode *containerNode = parentNode->findContainer( name, tag, &containerList, diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index b8b7d40f8..9e92fb47e 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -94,7 +94,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) connect( cbListView, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggleSingleColumn( bool ) ) ); - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); //Create IconView TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "KIconView", this); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 234f62543..94314ffbc 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -52,7 +52,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); - m_ro->setCompletionMode( KGlobalSettings::CompletionAuto ); + m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto ); TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); @@ -142,7 +142,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) KCompletion * s_pCompletion = new KCompletion; s_pCompletion->setOrder( KCompletion::Weighted ); s_pCompletion->setItems( historyConfig.readListEntry( "ComboContents" ) ); - s_pCompletion->setCompletionMode( KGlobalSettings::completionMode() ); + s_pCompletion->setCompletionMode( TDEGlobalSettings::completionMode() ); m_konqc->setCompletionObject( s_pCompletion ); TQPixmap pix = SmallIcon("www"); diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp index 582ae19e9..9fc108e52 100644 --- a/tdeui/tests/klistviewtest.cpp +++ b/tdeui/tests/klistviewtest.cpp @@ -28,12 +28,12 @@ int main( int argc, char **argv ) new KListViewItem( view, "Item 1"); new KListViewItem( view, "Item 2", "Some more", "Hi Mom :)" ); - view->restoreLayout( KGlobal::config(), "ListView" ); + view->restoreLayout( TDEGlobal::config(), "ListView" ); new KListViewItem( view, "Item 3" ); dialog.exec(); - view->saveLayout( KGlobal::config(), "ListView" ); + view->saveLayout( TDEGlobal::config(), "ListView" ); return 0; } diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp index 5c1ffa757..617808f40 100644 --- a/tdeui/tests/ktoolbarlabelactiontest.cpp +++ b/tdeui/tests/ktoolbarlabelactiontest.cpp @@ -86,7 +86,7 @@ int main( int argc, char **argv ) { TDEApplication app( argc, argv, "ktoolbarlabelactiontest" ); - KGlobal::instance()->dirs()->addResourceDir("data", "."); + TDEGlobal::instance()->dirs()->addResourceDir("data", "."); MainWindow* mw = new MainWindow; app.setMainWidget(mw); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index 9f764e774..4c9e83bc1 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -22,7 +22,7 @@ int main( int argc, char **argv ) // KXMLGUIClient looks in the "data" resource for the .rc files // Let's add $PWD (ideally $srcdir instead...) to it - KGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() ); + TDEGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() ); KMainWindow *mainwindow = new KMainWindow; -- cgit v1.2.1