summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
Diffstat (limited to 'kontact')
-rw-r--r--kontact/interfaces/plugin.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h2
-rw-r--r--kontact/plugins/knotes/knotetip.cpp4
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp14
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp6
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp18
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp10
-rw-r--r--kontact/plugins/weather/summarywidget.h6
-rw-r--r--kontact/src/aboutdialog.cpp8
-rw-r--r--kontact/src/iconsidepane.cpp2
-rw-r--r--kontact/src/main.cpp2
-rw-r--r--kontact/src/mainwindow.cpp6
-rw-r--r--kontact/src/profilemanager.cpp2
20 files changed, 48 insertions, 48 deletions
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index bedd52c3..82f2bbbe 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -57,7 +57,7 @@ Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name )
: KXMLGUIClient( core ), TQObject( parent, name ), d( new Private )
{
core->factory()->addClient( this );
- KGlobal::locale()->insertCatalogue(name);
+ TDEGlobal::locale()->insertCatalogue(name);
d->core = core;
d->dcopClient = 0;
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 76b2b759..e878ce1c 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -48,7 +48,7 @@ SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const c
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop,
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop,
KIcon::SizeMedium );
TQWidget *header = createHeader(this, icon, i18n("E-Mail"));
mLayout = new TQGridLayout( 1, 3, 3 );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 0752ade0..725219f4 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
if ( !name.isEmpty() )
journal->setSummary( name );
else
- journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+ journal->setSummary( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
// the body of the note
journal->setDescription( text );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index a9eb11bd..91c198af 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -68,7 +68,7 @@ class KNotesIconViewItem : public KIconViewItem
KIconEffect effect;
TQColor color( journal->customProperty( "KNotes", "BgColor" ) );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop );
icon = effect.apply( icon, KIconEffect::Colorize, 1, color, false );
setPixmap( icon );
setText( journal->summary() );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index ec77cc50..0c643534 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -100,7 +100,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
while ( w > 60 && h == mPreview->heightForWidth( w - 20 ) )
w -= 20;
- TQRect desk = KGlobalSettings::desktopGeometry( mNoteIVI->rect().center() );
+ TQRect desk = TDEGlobalSettings::desktopGeometry( mNoteIVI->rect().center() );
resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
hide();
@@ -206,7 +206,7 @@ void KNoteTip::reposition()
TQPoint pos = rect.center();
// should the tooltip be shown to the left or to the right of the ivi?
- TQRect desk = KGlobalSettings::desktopGeometry( pos );
+ TQRect desk = TDEGlobalSettings::desktopGeometry( pos );
if ( rect.center().x() + width() > desk.right() ) {
// to the left
if ( pos.x() - width() < 0 )
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 309904a9..dd5c78eb 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -50,7 +50,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_notes",
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_notes",
KIcon::Desktop, KIcon::SizeMedium );
TQWidget* header = createHeader( this, icon, i18n( "Notes" ) );
mainLayout->addWidget( header );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index ee8eefdc..bbd9be2b 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -56,7 +56,7 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_date",
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_date",
KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Calendar" ) );
mainLayout->addWidget( header );
@@ -167,15 +167,15 @@ void SummaryWidget::updateView()
( sD.day() == currentDate.addDays( 1 ).day() ) ) {
datestr = i18n( "Tomorrow" );
} else {
- datestr = KGlobal::locale()->formatDate( sD );
+ datestr = TDEGlobal::locale()->formatDate( sD );
}
// Print the date span for multiday, floating events, for the
// first day of the event only.
if ( ev->isMultiDay() && ev->doesFloat() && dayof == 1 && span > 1 ) {
- datestr = KGlobal::locale()->formatDate( ev->dtStart().date() );
+ datestr = TDEGlobal::locale()->formatDate( ev->dtStart().date() );
datestr += " -\n " +
- KGlobal::locale()->formatDate( sD.addDays( span-1 ) );
+ TDEGlobal::locale()->formatDate( sD.addDays( span-1 ) );
}
label = new TQLabel( datestr, this );
@@ -225,8 +225,8 @@ void SummaryWidget::updateView()
}
}
datestr = i18n( "Time from - to", "%1 - %2" )
- .arg( KGlobal::locale()->formatTime( sST ) )
- .arg( KGlobal::locale()->formatTime( sET ) );
+ .arg( TDEGlobal::locale()->formatTime( sST ) )
+ .arg( TDEGlobal::locale()->formatTime( sET ) );
label = new TQLabel( datestr, this );
label->setAlignment( AlignLeft | AlignVCenter );
mLayout->addWidget( label, counter, 3 );
@@ -270,7 +270,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
KPopupMenu popup( this );
TQToolTip::remove( this );
popup.insertItem( i18n( "&Edit Appointment..." ), 0 );
- popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
i18n( "&Delete Appointment" ), 1 );
switch ( popup.exec( TQCursor::pos() ) ) {
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 7171e539..b0cbf7d9 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -58,7 +58,7 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_todo",
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_todo",
KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "To-do" ) );
mainLayout->addWidget( header );
@@ -227,11 +227,11 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
KPopupMenu popup( this );
TQToolTip::remove( this );
popup.insertItem( i18n( "&Edit To-do..." ), 0 );
- popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
i18n( "&Delete To-do" ), 1 );
KCal::Todo *todo = mCalendar->todo( uid );
if ( !todo->isCompleted() ) {
- popup.insertItem( KGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small),
i18n( "&Mark To-do Completed" ), 2 );
}
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index b3184943..8a659a6e 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -59,7 +59,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout = new TQGridLayout( this, 2, 3, 3, 3 );
int row=0;
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "KPilot Configuration" ) );
mLayout->addMultiCellWidget( header, row,row, 0,3 );
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 92207c1e..8e6719fc 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -47,7 +47,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_news",
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_news",
KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "News Feeds" ) );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 1b847508..a3698930 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -84,7 +84,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
// Create the Summary Layout
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "cookie",
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "cookie",
KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Special Dates" ) );
@@ -226,8 +226,8 @@ void SDSummaryWidget::updateView()
TQLabel *label = 0;
// No reason to show the date year
- TQString savefmt = KGlobal::locale()->dateFormat();
- KGlobal::locale()->setDateFormat( KGlobal::locale()->
+ TQString savefmt = TDEGlobal::locale()->dateFormat();
+ TDEGlobal::locale()->setDateFormat( TDEGlobal::locale()->
dateFormat().replace( 'Y', ' ' ) );
// Search for Birthdays and Anniversaries in the Addressbook
@@ -424,7 +424,7 @@ void SDSummaryWidget::updateView()
}
label = new TQLabel( this );
if ( icon_img.isNull() ) {
- label->setPixmap( KGlobal::iconLoader()->loadIcon( icon_name,
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( icon_name,
KIcon::Small ) );
} else {
label->setPixmap( icon_img );
@@ -446,13 +446,13 @@ void SDSummaryWidget::updateView()
} else if ( (*addrIt).daysTo == 1 ) {
datestr = i18n( "Tomorrow" );
} else {
- datestr = KGlobal::locale()->formatDate( sD );
+ datestr = TDEGlobal::locale()->formatDate( sD );
}
// Print the date span for multiday, floating events, for the
// first day of the event only.
if ( (*addrIt).span > 1 ) {
TQString endstr =
- KGlobal::locale()->formatDate( sD.addDays( (*addrIt).span - 1 ) );
+ TDEGlobal::locale()->formatDate( sD.addDays( (*addrIt).span - 1 ) );
datestr += " -\n " + endstr;
}
@@ -550,7 +550,7 @@ void SDSummaryWidget::updateView()
for ( label = mLabels.first(); label; label = mLabels.next() )
label->show();
- KGlobal::locale()->setDateFormat( savefmt );
+ TDEGlobal::locale()->setDateFormat( savefmt );
}
void SDSummaryWidget::mailContact( const TQString &uid )
@@ -575,9 +575,9 @@ void SDSummaryWidget::viewContact( const TQString &uid )
void SDSummaryWidget::popupMenu( const TQString &uid )
{
KPopupMenu popup( this );
- popup.insertItem( KGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ),
i18n( "Send &Mail" ), 0 );
- popup.insertItem( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ),
i18n( "View &Contact" ), 1 );
switch ( popup.exec( TQCursor::pos() ) ) {
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 360da023..f3eae012 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -55,7 +55,7 @@ class PluginItem : public TQCheckListItem
: TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ),
mInfo( info )
{
- TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
+ TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
setPixmap( 0, pm );
}
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index da0c160d..ba85836b 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette()
void SummaryViewPart::setDate( const TQDate& newDate )
{
TQString date( "<b>%1</b>" );
- date = date.arg( KGlobal::locale()->formatDate( newDate ) );
+ date = date.arg( TDEGlobal::locale()->formatDate( newDate ) );
mDateLabel->setText( date );
}
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 63c7c897..2b114ca2 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -45,7 +45,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout = new TQVBoxLayout( this, 3, 3 );
mLayout->setAlignment( TQt::AlignTop );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
mLayout->addWidget( header );
@@ -209,9 +209,9 @@ void SummaryWidget::updateSummary( bool )
void SummaryWidget::showReport( const TQString &stationID )
{
- mProc = new KProcess;
- TQApplication::connect( mProc, TQT_SIGNAL( processExited( KProcess* ) ),
- this, TQT_SLOT( reportFinished( KProcess* ) ) );
+ mProc = new TDEProcess;
+ TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ),
+ this, TQT_SLOT( reportFinished( TDEProcess* ) ) );
*mProc << "kweatherreport";
*mProc << stationID;
@@ -221,7 +221,7 @@ void SummaryWidget::showReport( const TQString &stationID )
}
}
-void SummaryWidget::reportFinished( KProcess* )
+void SummaryWidget::reportFinished( TDEProcess* )
{
mProc->deleteLater();
mProc = 0;
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 8bb36ce8..96361526 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -35,7 +35,7 @@
#include <tqtimer.h>
#include <tqwidget.h>
-class KProcess;
+class TDEProcess;
class TQGridLayout;
class TQLabel;
@@ -107,7 +107,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
void updateView();
void timeout();
void showReport( const TQString& );
- void reportFinished( KProcess* );
+ void reportFinished( TDEProcess* );
private:
TQStringList mStations;
@@ -118,7 +118,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
TQPtrList<TQGridLayout> mLayouts;
TQVBoxLayout *mLayout;
- KProcess* mProc;
+ TDEProcess* mProc;
};
#endif
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index ae0d0965..db40083a 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -46,7 +46,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name )
mCore( core )
{
addAboutData( i18n( "Kontact Container" ), TQString( "kontact" ),
- KGlobal::instance()->aboutData() );
+ TDEGlobal::instance()->aboutData() );
TQValueList<Plugin*> plugins = mCore->pluginList();
TQValueList<Plugin*>::ConstIterator end = plugins.end();
@@ -54,7 +54,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name )
for ( ; it != end; ++it )
addAboutPlugin( *it );
- addLicenseText( KGlobal::instance()->aboutData() );
+ addLicenseText( TDEGlobal::instance()->aboutData() );
}
void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin )
@@ -65,7 +65,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin )
void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
const TDEAboutData *about )
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon,
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon,
KIcon::Desktop, 48 );
TQFrame *topFrame = addPage( title, TQString(), pixmap );
@@ -160,7 +160,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about )
if ( !about || about->license().isEmpty() )
return;
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature",
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature",
KIcon::Desktop, 48 );
TQString title = i18n( "%1 License" ).arg( about->programName() );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index a6490766..2fef3e0b 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -111,7 +111,7 @@ void EntryItem::reloadPixmap()
{
int size = (int)navigator()->viewMode();
if ( size != 0 )
- mPixmap = KGlobal::iconLoader()->loadIcon( mPlugin->icon(),
+ mPixmap = TDEGlobal::iconLoader()->loadIcon( mPlugin->icon(),
KIcon::Desktop, size,
mPlugin->disabled() ?
KIcon::DisabledState
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 0fa50b21..71fb5e1b 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -53,7 +53,7 @@ class KontactApp : public KUniqueApplication {
public:
KontactApp() : mMainWindow( 0 ), mSessionRestored( false )
{
- KGlobal::iconLoader()->addAppDir( "tdepim" );
+ TDEGlobal::iconLoader()->addAppDir( "tdepim" );
}
~KontactApp() {}
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 307f1c4b..5ac040f7 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -1050,7 +1050,7 @@ void MainWindow::configureShortcuts()
void MainWindow::configureToolbars()
{
- saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+ saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
KEditToolbar edit( factory() );
connect( &edit, TQT_SIGNAL( newToolbarConfig() ),
@@ -1064,7 +1064,7 @@ void MainWindow::slotNewToolbarConfig()
createGUI( mCurrentPlugin->part() );
}
if ( mCurrentPlugin ) {
- applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+ applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
}
updateShortcuts(); // for the plugActionList call
}
@@ -1160,7 +1160,7 @@ void MainWindow::slotShowStatusMsg( const TQString &msg )
TQString MainWindow::introductionString()
{
- KIconLoader *iconloader = KGlobal::iconLoader();
+ KIconLoader *iconloader = TDEGlobal::iconLoader();
int iconSize = iconloader->currentSize( KIcon::Desktop );
TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop );
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index d929bcb3..c64cbf97 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
void Kontact::ProfileManager::readConfig()
{
- const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
+ const TQStringList profilePaths = TDEGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
typedef TQMap<TQString, Kontact::Profile> ProfileMap;
ProfileMap profiles;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 00:30:24 +0000