summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
Diffstat (limited to 'kontact')
-rw-r--r--kontact/TODO2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp4
-rw-r--r--kontact/plugins/knotes/knotes_part.h4
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h18
-rw-r--r--kontact/plugins/knotes/knotetip.cpp2
-rw-r--r--kontact/plugins/knotes/knotetip.h6
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp6
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp12
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp10
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp10
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp2
-rw-r--r--kontact/src/aboutdialog.cpp4
-rw-r--r--kontact/src/iconsidepane.cpp6
-rw-r--r--kontact/src/mainwindow.cpp14
17 files changed, 53 insertions, 53 deletions
diff --git a/kontact/TODO b/kontact/TODO
index a24083c30..4ff91f8e9 100644
--- a/kontact/TODO
+++ b/kontact/TODO
@@ -14,7 +14,7 @@ UNTIL KDE 3.2
- move plugins to respective apps for code sharing(?)
- Summary (what's next) view (slueppken) (done)
- Basic groupware functionality (Exchange 2k and Kolab)
-- make the headerWidget look nicer (we might use KIconLoader
+- make the headerWidget look nicer (we might use TDEIconLoader
for larger icons) (slueppken) (done)
- make all parts use the InfoExtension (done)
- make KCMultiDialog not crash when non-existent desktop-file
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index a67c0a594..95d8ad75c 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -48,8 +48,8 @@ SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const c
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop,
- KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_mail", TDEIcon::Desktop,
+ TDEIcon::SizeMedium );
TQWidget *header = createHeader(this, icon, i18n("E-Mail"));
mLayout = new TQGridLayout( 1, 3, 3 );
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index b83c677f3..cda762eba 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -33,7 +33,7 @@
#include "knotes/KNotesIface.h"
-class KIconView;
+class TDEIconView;
class TQIconViewItem;
class KNotesIconViewItem;
class KNoteTip;
@@ -91,7 +91,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
void printSelectedNotes();
private:
- KIconView *mNotesView;
+ TDEIconView *mNotesView;
KNoteTip *mNoteTip;
KNoteEditDlg *mNoteEditDlg;
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 8e11e4f15..ab386d1a9 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -57,19 +57,19 @@
#include "knotes/knoteedit.h"
-class KNotesIconViewItem : public KIconViewItem
+class KNotesIconViewItem : public TDEIconViewItem
{
public:
- KNotesIconViewItem( KIconView *parent, KCal::Journal *journal )
- : KIconViewItem( parent ),
+ KNotesIconViewItem( TDEIconView *parent, KCal::Journal *journal )
+ : TDEIconViewItem( parent ),
mJournal( journal )
{
setRenameEnabled( true );
- KIconEffect effect;
+ TDEIconEffect effect;
TQColor color( journal->customProperty( "KNotes", "BgColor" ) );
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop );
- icon = effect.apply( icon, KIconEffect::Colorize, 1, color, false );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", TDEIcon::Desktop );
+ icon = effect.apply( icon, TDEIconEffect::Colorize, 1, color, false );
setPixmap( icon );
setText( journal->summary() );
}
@@ -81,7 +81,7 @@ class KNotesIconViewItem : public KIconViewItem
virtual void setText( const TQString& text )
{
- KIconViewItem::setText( text );
+ TDEIconViewItem::setText( text );
mJournal->setSummary( text );
}
@@ -90,7 +90,7 @@ class KNotesIconViewItem : public KIconViewItem
};
-class KNotesIconView : public KIconView
+class KNotesIconView : public TDEIconView
{
protected:
TQDragObject* dragObject()
@@ -101,7 +101,7 @@ class KNotesIconView : public KIconView
selectedItems.append( static_cast<KNotesIconViewItem *>( it ) );
}
if ( selectedItems.count() != 1 )
- return KIconView::dragObject();
+ return TDEIconView::dragObject();
KCal::CalendarLocal cal( KPimPrefs::timezone() );
KCal::Incidence *i = selectedItems.first()->journal()->clone();
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 0c6435341..054c0f91e 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -40,7 +40,7 @@
#include "knotes_part_p.h"
-KNoteTip::KNoteTip( KIconView *parent )
+KNoteTip::KNoteTip( TDEIconView *parent )
: TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P
WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ),
mFilter( false ),
diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h
index 221720224..9a4e0fcc5 100644
--- a/kontact/plugins/knotes/knotetip.h
+++ b/kontact/plugins/knotes/knotetip.h
@@ -35,13 +35,13 @@
#include <tqframe.h>
class TQTextEdit;
-class KIconView;
+class TDEIconView;
class KNotesIconViewItem;
class KNoteTip : public TQFrame
{
public:
- KNoteTip( KIconView *parent );
+ KNoteTip( TDEIconView *parent );
~KNoteTip();
void setNote( KNotesIconViewItem *item );
@@ -59,7 +59,7 @@ class KNoteTip : public TQFrame
private:
bool mFilter;
- KIconView *mView;
+ TDEIconView *mView;
KNotesIconViewItem *mNoteIVI;
TQTextEdit *mPreview;
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index dd5c78ebe..c0a92617c 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -51,7 +51,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_notes",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget* header = createHeader( this, icon, i18n( "Notes" ) );
mainLayout->addWidget( header );
@@ -80,10 +80,10 @@ void KNotesSummaryWidget::updateView()
label->deleteLater();
mLabels.clear();
- KIconLoader loader( "knotes" );
+ TDEIconLoader loader( "knotes" );
int counter = 0;
- TQPixmap pm = loader.loadIcon( "knotes", KIcon::Small );
+ TQPixmap pm = loader.loadIcon( "knotes", TDEIcon::Small );
KCal::Journal::List::Iterator it;
if ( mNotes.count() ) {
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 02e3eb106..16aba3778 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -57,7 +57,7 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_date",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Calendar" ) );
mainLayout->addWidget( header );
@@ -83,7 +83,7 @@ void SummaryWidget::updateView()
mLabels.clear();
mLabels.setAutoDelete( false );
- KIconLoader loader( "tdepim" );
+ TDEIconLoader loader( "tdepim" );
TDEConfig config( "kcmkorgsummaryrc" );
@@ -92,9 +92,9 @@ void SummaryWidget::updateView()
TQLabel *label = 0;
int counter = 0;
- TQPixmap pm = loader.loadIcon( "appointment", KIcon::Small );
- TQPixmap pmb = loader.loadIcon( "calendarbirthday", KIcon::Small );
- TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
+ TQPixmap pm = loader.loadIcon( "appointment", TDEIcon::Small );
+ TQPixmap pmb = loader.loadIcon( "calendarbirthday", TDEIcon::Small );
+ TQPixmap pma = loader.loadIcon( "calendaranniversary", TDEIcon::Small );
TQDate dt;
TQDate currentDate = TQDate::currentDate();
@@ -270,7 +270,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
TDEPopupMenu popup( this );
TQToolTip::remove( this );
popup.insertItem( i18n( "&Edit Appointment..." ), 0 );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", TDEIcon::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 3089c9876..16aced52d 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -59,7 +59,7 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_todo",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "To-do" ) );
mainLayout->addWidget( header );
@@ -89,7 +89,7 @@ void TodoSummaryWidget::updateView()
config.setGroup( "Todo" );
bool showAllTodos = config.readBoolEntry( "ShowAllTodos", false );
- KIconLoader loader( "tdepim" );
+ TDEIconLoader loader( "tdepim" );
TQLabel *label = 0;
int counter = 0;
@@ -97,7 +97,7 @@ void TodoSummaryWidget::updateView()
TQDate currentDate = TQDate::currentDate();
KCal::Todo::List todos = mCalendar->todos();
if ( todos.count() > 0 ) {
- TQPixmap pm = loader.loadIcon( "todo", KIcon::Small );
+ TQPixmap pm = loader.loadIcon( "todo", TDEIcon::Small );
KCal::Todo::List::ConstIterator it;
for ( it = todos.begin(); it != todos.end(); ++it ) {
KCal::Todo *todo = *it;
@@ -227,11 +227,11 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
TDEPopupMenu popup( this );
TQToolTip::remove( this );
popup.insertItem( i18n( "&Edit To-do..." ), 0 );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", TDEIcon::Small),
i18n( "&Delete To-do" ), 1 );
KCal::Todo *todo = mCalendar->todo( uid );
if ( !todo->isCompleted() ) {
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", TDEIcon::Small),
i18n( "&Mark To-do Completed" ), 2 );
}
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 8a659a6e7..42b69f4f6 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 = TDEGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kpilot", TDEIcon::Desktop, TDEIcon::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 f0f7d7460..db83e3de0 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -48,7 +48,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_news",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "News Feeds" ) );
vlay->addWidget( header );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index e55f19359..80e0f1465 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -85,7 +85,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "cookie",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Special Dates" ) );
mainLayout->addWidget(header);
@@ -219,7 +219,7 @@ void SDSummaryWidget::updateView()
mLabels.clear();
mLabels.setAutoDelete( false );
- KIconLoader loader( "tdepim" );
+ TDEIconLoader loader( "tdepim" );
KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
TQValueList<SDEntry> dates;
@@ -425,7 +425,7 @@ void SDSummaryWidget::updateView()
label = new TQLabel( this );
if ( icon_img.isNull() ) {
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( icon_name,
- KIcon::Small ) );
+ TDEIcon::Small ) );
} else {
label->setPixmap( icon_img );
}
@@ -575,9 +575,9 @@ void SDSummaryWidget::viewContact( const TQString &uid )
void SDSummaryWidget::popupMenu( const TQString &uid )
{
TDEPopupMenu popup( this );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", TDEIcon::Small ),
i18n( "Send &Mail" ), 0 );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", TDEIcon::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 e1e3c7f00..b43af7ffb 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 = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
+ TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), TDEIcon::Small );
setPixmap( 0, pm );
}
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 2b114ca24..64d3d2691 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 = TDEGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kweather", TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
mLayout->addWidget( header );
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index db40083a6..faa2a2447 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -66,7 +66,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
const TDEAboutData *about )
{
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon,
- KIcon::Desktop, 48 );
+ TDEIcon::Desktop, 48 );
TQFrame *topFrame = addPage( title, TQString(), pixmap );
@@ -161,7 +161,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about )
return;
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature",
- KIcon::Desktop, 48 );
+ TDEIcon::Desktop, 48 );
TQString title = i18n( "%1 License" ).arg( about->programName() );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 6c490880c..581a91b96 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -112,10 +112,10 @@ void EntryItem::reloadPixmap()
int size = (int)navigator()->viewMode();
if ( size != 0 )
mPixmap = TDEGlobal::iconLoader()->loadIcon( mPlugin->icon(),
- KIcon::Desktop, size,
+ TDEIcon::Desktop, size,
mPlugin->disabled() ?
- KIcon::DisabledState
- : KIcon::DefaultState);
+ TDEIcon::DisabledState
+ : TDEIcon::DefaultState);
else
mPixmap = TQPixmap();
}
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 8c82fa5f9..eff2d9089 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -433,13 +433,13 @@ void MainWindow::slotLoadProfile( const TQString& id )
cfg->sync();
Prefs::self()->readConfig();
applyMainWindowSettings( cfg );
- KIconTheme::reconfigure();
+ TDEIconTheme::reconfigure();
const WId wid = winId();
KIPC::sendMessage( KIPC::PaletteChanged, wid );
KIPC::sendMessage( KIPC::FontChanged, wid );
KIPC::sendMessage( KIPC::StyleChanged, wid );
KIPC::sendMessage( KIPC::SettingsChanged, wid );
- for ( int i = 0; i < KIcon::LastGroup; ++i )
+ for ( int i = 0; i < TDEIcon::LastGroup; ++i )
KIPC::sendMessage( KIPC::IconChanged, wid, i );
loadSettings();
@@ -1160,12 +1160,12 @@ void MainWindow::slotShowStatusMsg( const TQString &msg )
TQString MainWindow::introductionString()
{
- KIconLoader *iconloader = TDEGlobal::iconLoader();
- int iconSize = iconloader->currentSize( KIcon::Desktop );
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
+ int iconSize = iconloader->currentSize( TDEIcon::Desktop );
- TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop );
- TQString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop );
- TQString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop );
+ TQString handbook_icon_path = iconloader->iconPath( "contents2", TDEIcon::Desktop );
+ TQString html_icon_path = iconloader->iconPath( "html", TDEIcon::Desktop );
+ TQString wizard_icon_path = iconloader->iconPath( "wizard", TDEIcon::Desktop );
TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
"<p>%1</p>"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 12:22:20 +0000