summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:12 -0600
commitfd5d099065a748cac49e20a13481f85666c53c71 (patch)
treea0f1672cd88eb0e69b9ddc2ed9b08ecd98538bd3 /libtdepim
parentb440a9c608596cd88efdb3bfa4661c5e37efbe4b (diff)
downloadtdepim-fd5d099065a748cac49e20a13481f85666c53c71.tar.gz
tdepim-fd5d099065a748cac49e20a13481f85666c53c71.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/addresseeemailselection.cpp2
-rw-r--r--libtdepim/addresseelineedit.cpp4
-rw-r--r--libtdepim/addresseeselector.cpp8
-rw-r--r--libtdepim/addresseeselector.h6
-rw-r--r--libtdepim/addresseeview.cpp14
-rw-r--r--libtdepim/addresseeview.h16
-rw-r--r--libtdepim/addressesdialog.cpp14
-rw-r--r--libtdepim/addressesdialog.h6
-rw-r--r--libtdepim/addresspicker.ui4
-rw-r--r--libtdepim/completionordereditor.cpp2
-rw-r--r--libtdepim/completionordereditor.h4
-rw-r--r--libtdepim/kcmdesignerfields.cpp2
-rw-r--r--libtdepim/kcmdesignerfields.h4
-rw-r--r--libtdepim/kfoldertree.cpp22
-rw-r--r--libtdepim/kfoldertree.h4
-rw-r--r--libtdepim/komposer/core/core.cpp18
-rw-r--r--libtdepim/komposer/core/core.h2
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp32
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.h28
-rw-r--r--libtdepim/kpimurlrequesterdlg.cpp2
-rw-r--r--libtdepim/kpixmapregionselectorwidget.cpp10
-rw-r--r--libtdepim/kpixmapregionselectorwidget.h6
-rw-r--r--libtdepim/kprefsdialog.cpp4
-rw-r--r--libtdepim/kscoringeditor.cpp2
-rw-r--r--libtdepim/kscoringeditor.h4
-rw-r--r--libtdepim/recentaddresses.cpp2
-rw-r--r--libtdepim/recentaddresses.h2
27 files changed, 112 insertions, 112 deletions
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index c2c6ff4f4..817e60327 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -28,7 +28,7 @@
#include "addresseeemailselection.h"
using namespace KPIM;
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
AddresseeEmailSelection::AddresseeEmailSelection()
: Selection()
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index dbe032b2c..68e79b2b2 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -217,12 +217,12 @@ void AddresseeLineEdit::keyPressEvent( TQKeyEvent *e )
{
bool accept = false;
- if ( KStdAccel::shortcut( KStdAccel::SubstringCompletion ).contains( KKey( e ) ) ) {
+ if ( TDEStdAccel::shortcut( TDEStdAccel::SubstringCompletion ).contains( KKey( e ) ) ) {
//TODO: add LDAP substring lookup, when it becomes available in KPIM::LDAPSearch
updateSearchString();
doCompletion( true );
accept = true;
- } else if ( KStdAccel::shortcut( KStdAccel::TextCompletion ).contains( KKey( e ) ) ) {
+ } else if ( TDEStdAccel::shortcut( TDEStdAccel::TextCompletion ).contains( KKey( e ) ) ) {
int len = text().length();
if ( len == cursorPosition() ) { // at End?
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 38bec42df..4549d3768 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -293,7 +293,7 @@ void AddresseeSelector::initGUI()
uint count = mSelection->fieldCount();
for ( uint i = 0; i < count; ++i, ++row ) {
- KListView *listView = new KListView( this );
+ TDEListView *listView = new TDEListView( this );
listView->addColumn( mSelection->fieldTitle( i ) );
listView->setFullWidth( true );
mSelectionViews.append( listView );
@@ -330,7 +330,7 @@ void AddresseeSelector::initGUI()
layout->addWidget( listView, row, 2 );
}
- mAddresseeView = new KListView( this );
+ mAddresseeView = new TDEListView( this );
mAddresseeView->addColumn( "" );
mAddresseeView->header()->hide();
mAddresseeView->setFullWidth( true );
@@ -391,7 +391,7 @@ void AddresseeSelector::move( int index )
void AddresseeSelector::remove( int index )
{
- KListView *view = mSelectionViews[ index ];
+ TDEListView *view = mSelectionViews[ index ];
SelectionViewItem *item = dynamic_cast<SelectionViewItem*>( view->selectedItem() );
if ( item ) {
@@ -447,7 +447,7 @@ void AddresseeSelector::setItemSelected( uint fieldIndex, const KABC::Addressee
void AddresseeSelector::updateSelectionView( int index )
{
- KListView *view = mSelectionViews[ index ];
+ TDEListView *view = mSelectionViews[ index ];
view->clear();
SelectionItem::List::Iterator it;
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index c5e6b4934..f06c030bc 100644
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@@ -34,7 +34,7 @@
class KComboBox;
class KLineEdit;
-class KListView;
+class TDEListView;
class TQSignalMapper;
namespace KPIM {
@@ -200,10 +200,10 @@ class KDE_EXPORT AddresseeSelector : public TQWidget
KComboBox *mAddressBookCombo;
KLineEdit *mAddresseeFilter;
- KListView *mAddresseeView;
+ TDEListView *mAddresseeView;
SelectionItem::List mSelectionItems;
- TQValueList<KListView*> mSelectionViews;
+ TQValueList<TDEListView*> mSelectionViews;
TQSignalMapper *mMoveMapper;
TQSignalMapper *mRemoveMapper;
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index ef754e819..dfe955403 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -73,19 +73,19 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
setNotifyClick( true );
- mActionShowBirthday = new KToggleAction( i18n( "Show Birthday" ) );
+ mActionShowBirthday = new TDEToggleAction( i18n( "Show Birthday" ) );
mActionShowBirthday->setCheckedState( i18n( "Hide Birthday" ) );
- mActionShowAddresses = new KToggleAction( i18n( "Show Postal Addresses" ) );
+ mActionShowAddresses = new TDEToggleAction( i18n( "Show Postal Addresses" ) );
mActionShowAddresses->setCheckedState( i18n( "Hide Postal Addresses" ) );
- mActionShowEmails = new KToggleAction( i18n( "Show Email Addresses" ) );
+ mActionShowEmails = new TDEToggleAction( i18n( "Show Email Addresses" ) );
mActionShowEmails->setCheckedState( i18n( "Hide Email Addresses" ) );
- mActionShowPhones = new KToggleAction( i18n( "Show Telephone Numbers" ) );
+ mActionShowPhones = new TDEToggleAction( i18n( "Show Telephone Numbers" ) );
mActionShowPhones->setCheckedState( i18n( "Hide Telephone Numbers" ) );
- mActionShowURLs = new KToggleAction( i18n( "Show Web Pages (URLs)" ) );
+ mActionShowURLs = new TDEToggleAction( i18n( "Show Web Pages (URLs)" ) );
mActionShowURLs->setCheckedState( i18n( "Hide Web Pages (URLs)" ) );
- mActionShowIMAddresses = new KToggleAction( i18n( "Show Instant Messaging Addresses" ) );
+ mActionShowIMAddresses = new TDEToggleAction( i18n( "Show Instant Messaging Addresses" ) );
mActionShowIMAddresses->setCheckedState( i18n( "Hide Instant Messaging Addresses" ) );
- mActionShowCustomFields = new KToggleAction( i18n( "Show Custom Fields" ) );
+ mActionShowCustomFields = new TDEToggleAction( i18n( "Show Custom Fields" ) );
mActionShowCustomFields->setCheckedState( i18n( "Hide Custom Fields" ) );
connect( mActionShowBirthday, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 25b97487a..92760529a 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -32,7 +32,7 @@
namespace TDEIO {
class Job;
}
-class KToggleAction;
+class TDEToggleAction;
class TQPopupMenu;
@@ -184,13 +184,13 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
TQByteArray mImageData;
TDEIO::Job *mImageJob;
- KToggleAction *mActionShowBirthday;
- KToggleAction *mActionShowAddresses;
- KToggleAction *mActionShowEmails;
- KToggleAction *mActionShowPhones;
- KToggleAction *mActionShowURLs;
- KToggleAction *mActionShowIMAddresses;
- KToggleAction *mActionShowCustomFields;
+ TDEToggleAction *mActionShowBirthday;
+ TDEToggleAction *mActionShowAddresses;
+ TDEToggleAction *mActionShowEmails;
+ TDEToggleAction *mActionShowPhones;
+ TDEToggleAction *mActionShowURLs;
+ TDEToggleAction *mActionShowIMAddresses;
+ TDEToggleAction *mActionShowCustomFields;
KABC::Addressee mAddressee;
int mLinkMask;
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index d86995404..68fd906e3 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -93,7 +93,7 @@ struct AddressesDialog::AddressesDialogPrivate {
AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr,
int emailIndex )
- : TQObject( 0 ), KListViewItem( parent, addr.realName(),
+ : TQObject( 0 ), TDEListViewItem( parent, addr.realName(),
( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) )
{
d = new AddresseeViewItemPrivate;
@@ -113,8 +113,8 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add
}
}
-AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Category cat )
- : TQObject(0), KListViewItem( lv, name )
+AddresseeViewItem::AddresseeViewItem( TDEListView *lv, const TQString& name, Category cat )
+ : TQObject(0), TDEListViewItem( lv, name )
{
d = new AddresseeViewItemPrivate;
d->category = cat;
@@ -122,7 +122,7 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ
AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name,
const KABC::Addressee::List &lst )
- : TQObject(0), KListViewItem( parent, name, i18n("<group>") )
+ : TQObject(0), TDEListViewItem( parent, name, i18n("<group>") )
{
d = new AddresseeViewItemPrivate;
d->category = FilledGroup;
@@ -130,7 +130,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString
}
AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name )
- : TQObject(0), KListViewItem( parent, name, i18n("<group>") )
+ : TQObject(0), TDEListViewItem( parent, name, i18n("<group>") )
{
d = new AddresseeViewItemPrivate;
d->category = DistList;
@@ -194,7 +194,7 @@ int
AddresseeViewItem::compare( TQListViewItem * i, int col, bool ascending ) const
{
if ( category() == Group || category() == Entry )
- return KListViewItem::compare( i , col, ascending );
+ return TDEListViewItem::compare( i , col, ascending );
AddresseeViewItem *item = static_cast<AddresseeViewItem*>( i );
int a = static_cast<int>( category() );
@@ -1063,7 +1063,7 @@ AddressesDialog::filterChanged( const TQString& txt )
}
KABC::Addressee::List
-AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const
+AddressesDialog::allAddressee( TDEListView* view, bool onlySelected ) const
{
KABC::Addressee::List lst;
TQListViewItemIterator it( view );
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index 7f751452d..44b4f50e2 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -35,7 +35,7 @@
namespace KPIM {
- class AddresseeViewItem : public TQObject, public KListViewItem
+ class AddresseeViewItem : public TQObject, public TDEListViewItem
{
Q_OBJECT
@@ -51,7 +51,7 @@ namespace KPIM {
DistList =6
};
AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 );
- AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group );
+ AddresseeViewItem( TDEListView *lv, const TQString& name, Category cat=Group );
AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst );
AddresseeViewItem( AddresseeViewItem *parent, const TQString& name );
~AddresseeViewItem();
@@ -198,7 +198,7 @@ namespace KPIM {
const TQPtrList<AddresseeViewItem>& addresses );
TQStringList entryToString( const KABC::Addressee::List& l ) const;
KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const;
- KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const;
+ KABC::Addressee::List allAddressee( TDEListView* view, bool onlySelected = true ) const;
TQStringList allDistributionLists( AddresseeViewItem* parent ) const;
private:
diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui
index 8469730a4..75d70011d 100644
--- a/libtdepim/addresspicker.ui
+++ b/libtdepim/addresspicker.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView" row="1" column="0">
+ <widget class="TDEListView" row="1" column="0">
<column>
<property name="text">
<string>Name</string>
@@ -244,7 +244,7 @@
</widget>
</hbox>
</widget>
- <widget class="KListView" row="1" column="2">
+ <widget class="TDEListView" row="1" column="2">
<column>
<property name="text">
<string>Name</string>
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 1796933f8..4a1ee29ca 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -211,7 +211,7 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
mItems.sort();
TQHBox* page = makeHBoxMainWidget();
- mListView = new KListView( page );
+ mListView = new TDEListView( page );
mListView->setSorting( -1 );
mListView->addColumn( TQString() );
mListView->header()->hide();
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index e13ce3130..53061f04f 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -35,7 +35,7 @@
#include <tdeconfig.h>
class KPushButton;
-class KListView;
+class TDEListView;
namespace KPIM {
class LdapSearch;
@@ -80,7 +80,7 @@ private slots:
private:
TDEConfig mConfig;
CompletionItemList mItems;
- KListView* mListView;
+ TDEListView* mListView;
KPushButton* mUpButton;
KPushButton* mDownButton;
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 47d3b9102..00b2f0bb3 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -277,7 +277,7 @@ void KCMDesignerFields::initGUI()
TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() );
- mPageView = new KListView( this );
+ mPageView = new TDEListView( this );
mPageView->addColumn( i18n( "Available Pages" ) );
mPageView->setRootIsDecorated( true );
mPageView->setAllColumnsShowFocus( true );
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index d1f749a5d..8ab575416 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -25,7 +25,7 @@
#include <tdecmodule.h>
#include <tdepimmacros.h>
-class KListView;
+class TDEListView;
class TQLabel;
class TQListViewItem;
@@ -68,7 +68,7 @@ class KDE_EXPORT KCMDesignerFields : public TDECModule
private:
void initGUI();
- KListView *mPageView;
+ TDEListView *mPageView;
TQLabel *mPagePreview;
TQLabel *mPageDetails;
TQPushButton *mDeleteButton;
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index 58961ddc6..abc69fad4 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -14,7 +14,7 @@
//-----------------------------------------------------------------------------
KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label,
Protocol protocol, Type type )
- : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+ : TDEListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false )
{
}
@@ -23,7 +23,7 @@ KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label,
KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent,
const TQString & label, Protocol protocol, Type type,
int unread, int total )
- : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+ : TDEListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false )
{
}
@@ -265,7 +265,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
}
- // most cells can be handled by KListView::paintCell, we only need to
+ // most cells can be handled by TDEListView::paintCell, we only need to
// deal with the folder column if the unread column is not shown
/* The below is exceedingly silly, but Ingo insists that the unread
@@ -274,16 +274,16 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
* two painting passes which flickers. Since that flicker is not
* needed when there is the unread column, special case that. */
if ( ft->isUnreadActive() || column != 0 ) {
- KListViewItem::paintCell( p, mycg, column, width, align );
+ TDEListViewItem::paintCell( p, mycg, column, width, align );
} else {
TQListView *lv = listView();
TQString oldText = text(column);
// set an empty text so that we can have our own implementation (see further down)
- // but still benefit from KListView::paintCell
+ // but still benefit from TDEListView::paintCell
setText( column, "" );
- KListViewItem::paintCell( p, mycg, column, width, align );
+ TDEListViewItem::paintCell( p, mycg, column, width, align );
const TQPixmap *icon = pixmap( column );
int marg = lv ? lv->itemMargin() : 1;
@@ -360,7 +360,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
KFolderTree::KFolderTree( TQWidget *parent, const char* name )
- : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
+ : TDEListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
{
// GUI-options
setStyleDependantFrameWidth();
@@ -404,7 +404,7 @@ void KFolderTree::setStyleDependantFrameWidth()
void KFolderTree::styleChange( TQStyle& oldStyle )
{
setStyleDependantFrameWidth();
- KListView::styleChange( oldStyle );
+ TDEListView::styleChange( oldStyle );
}
//-----------------------------------------------------------------------------
@@ -413,7 +413,7 @@ void KFolderTree::drawContentsOffset( TQPainter * p, int ox, int oy,
{
bool oldUpdatesEnabled = isUpdatesEnabled();
setUpdatesEnabled(false);
- KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
+ TDEListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
setUpdatesEnabled(oldUpdatesEnabled);
}
@@ -421,13 +421,13 @@ void KFolderTree::drawContentsOffset( TQPainter * p, int ox, int oy,
void KFolderTree::contentsMousePressEvent( TQMouseEvent *e )
{
setSelectionModeExt(Single);
- KListView::contentsMousePressEvent(e);
+ TDEListView::contentsMousePressEvent(e);
}
//-----------------------------------------------------------------------------
void KFolderTree::contentsMouseReleaseEvent( TQMouseEvent *e )
{
- KListView::contentsMouseReleaseEvent(e);
+ TDEListView::contentsMouseReleaseEvent(e);
setSelectionModeExt(Extended);
}
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index c9f9425db..d8c6841ca 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -140,7 +140,7 @@ struct KPaintInfo {
//==========================================================================
-class KDE_EXPORT KFolderTreeItem : public KListViewItem
+class KDE_EXPORT KFolderTreeItem : public TDEListViewItem
{
public:
/** Protocol information */
@@ -239,7 +239,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
//==========================================================================
-class KDE_EXPORT KFolderTree : public KListView
+class KDE_EXPORT KFolderTree : public TDEListView
{
Q_OBJECT
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index a2f5fd003..87da5c00e 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -55,7 +55,7 @@ using namespace Komposer;
Core::Core( TQWidget *parent, const char *name )
: KomposerIface( "KomposerIface" ),
- KMainWindow( parent, name ), m_currentEditor( 0 )
+ TDEMainWindow( parent, name ), m_currentEditor( 0 )
{
initWidgets();
initCore();
@@ -248,29 +248,29 @@ Core::createActions()
{
KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() );
- (void) new KAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return,
+ (void) new TDEAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return,
this, TQT_SLOT(slotSendNow()), actionCollection(),
"send_default" );
- (void) new KAction( i18n( "&Queue" ), "queue", 0,
+ (void) new TDEAction( i18n( "&Queue" ), "queue", 0,
this, TQT_SLOT(slotSendLater()),
actionCollection(), "send_alternative" );
- (void) new KAction( i18n( "Save in &Drafts Folder" ), "filesave", 0,
+ (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "filesave", 0,
this, TQT_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts" );
- (void) new KAction( i18n( "&Insert File..." ), "fileopen", 0,
+ (void) new TDEAction( i18n( "&Insert File..." ), "fileopen", 0,
this, TQT_SLOT(slotInsertFile()),
actionCollection(), "insert_file" );
- (void) new KAction( i18n( "&Address Book" ), "contents",0,
+ (void) new TDEAction( i18n( "&Address Book" ), "contents",0,
this, TQT_SLOT(slotAddrBook()),
actionCollection(), "addressbook" );
- (void) new KAction( i18n( "&New Composer" ), "mail_new",
- KStdAccel::shortcut( KStdAccel::New ),
+ (void) new TDEAction( i18n( "&New Composer" ), "mail_new",
+ TDEStdAccel::shortcut( TDEStdAccel::New ),
this, TQT_SLOT(slotNewComposer()),
actionCollection(), "new_composer" );
- (void) new KAction( i18n( "&Attach File..." ), "attach",
+ (void) new TDEAction( i18n( "&Attach File..." ), "attach",
0, this, TQT_SLOT(slotAttachFile()),
actionCollection(), "attach_file" );
}
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 98fee42aa..5259710ae 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -42,7 +42,7 @@ namespace Komposer
/**
* This class provides the interface to the Komposer core for the editor.
*/
- class Core : public KMainWindow, virtual public KomposerIface
+ class Core : public TDEMainWindow, virtual public KomposerIface
{
Q_OBJECT
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 426e4c01b..88c4fb1ea 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -93,7 +93,7 @@ DefaultEditor::changeSignature( const TQString &sig )
}
void
-DefaultEditor::createActions( KActionCollection *ac )
+DefaultEditor::createActions( TDEActionCollection *ac )
{
//
// File Actions
@@ -106,22 +106,22 @@ DefaultEditor::createActions( KActionCollection *ac )
//
// Edit Actions
//
- KAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac );
+ TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac );
actionUndo->setEnabled( false );
connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)),
actionUndo, TQT_SLOT(setEnabled(bool)) );
- KAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac );
+ TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac );
actionRedo->setEnabled( false );
connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)),
actionRedo, TQT_SLOT(setEnabled(bool)) );
- KAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac );
+ TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac );
action_cut->setEnabled( false );
connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
action_cut, TQT_SLOT(setEnabled(bool)) );
- KAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac );
+ TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac );
action_copy->setEnabled( false );
connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
action_copy, TQT_SLOT(setEnabled(bool)) );
@@ -129,7 +129,7 @@ DefaultEditor::createActions( KActionCollection *ac )
(void) KStdAction::print( this, TQT_SLOT(print()), ac );
(void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac );
- (void) new KAction( i18n( "C&lear" ), 0,
+ (void) new TDEAction( i18n( "C&lear" ), 0,
m_textEdit, TQT_SLOT(removeSelectedText()),
ac, "edit_clear" );
@@ -144,37 +144,37 @@ DefaultEditor::createActions( KActionCollection *ac )
//
// Character Formatting
//
- m_actionBold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+ m_actionBold = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
ac, "format_bold" );
connect( m_actionBold, TQT_SIGNAL(toggled(bool)),
m_textEdit, TQT_SLOT(setBold(bool)) );
- m_actionItalic = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+ m_actionItalic = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
ac, "format_italic" );
connect( m_actionItalic, TQT_SIGNAL(toggled(bool)),
m_textEdit, TQT_SLOT(setItalic(bool) ));
- m_actionUnderline = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+ m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
ac, "format_underline" );
connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)),
m_textEdit, TQT_SLOT(setUnderline(bool)) );
- (void) new KAction( i18n("Text &Color..."), "colorpicker", 0,
+ (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0,
this, TQT_SLOT(formatColor()),
ac, "format_color" );
//
// Font
//
- m_actionFont = new KFontAction( i18n("&Font"), 0,
+ m_actionFont = new TDEFontAction( i18n("&Font"), 0,
ac, "format_font" );
connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)),
m_textEdit, TQT_SLOT(setFamily(const TQString &)) );
- m_actionFontSize = new KFontSizeAction( i18n("Font &Size"), 0,
+ m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0,
ac, "format_font_size" );
connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)),
m_textEdit, TQT_SLOT(setPointSize(int)) );
@@ -182,22 +182,22 @@ DefaultEditor::createActions( KActionCollection *ac )
//
// Alignment
//
- m_actionAlignLeft = new KToggleAction( i18n("Align &Left"), "text_left", 0,
+ m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "text_left", 0,
ac, "format_align_left" );
connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignLeft(bool)) );
- m_actionAlignCenter = new KToggleAction( i18n("Align &Center"), "text_center", 0,
+ m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
ac, "format_align_center" );
connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignCenter(bool)) );
- m_actionAlignRight = new KToggleAction( i18n("Align &Right"), "text_right", 0,
+ m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "text_right", 0,
ac, "format_align_right" );
connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignRight(bool)) );
- m_actionAlignJustify = new KToggleAction( i18n("&Justify"), "text_block", 0,
+ m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
ac, "format_align_justify" );
connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignJustify(bool)) );
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.h b/libtdepim/komposer/plugins/default/defaulteditor.h
index d73953a67..5763b5542 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.h
+++ b/libtdepim/komposer/plugins/default/defaulteditor.h
@@ -25,10 +25,10 @@
#include "editor.h"
class TQTextEdit;
-class KFontAction;
-class KFontSizeAction;
-class KToggleAction;
-class KActionCollection;
+class TDEFontAction;
+class TDEFontSizeAction;
+class TDEToggleAction;
+class TDEActionCollection;
class DefaultEditor : public Komposer::Editor
@@ -91,7 +91,7 @@ protected slots:
/**
* Creates the part's actions in the part's action collection.
*/
- void createActions( KActionCollection *ac );
+ void createActions( TDEActionCollection *ac );
void updateActions();
@@ -102,17 +102,17 @@ protected slots:
private:
TQTextEdit *m_textEdit;
- KToggleAction *m_actionBold;
- KToggleAction *m_actionItalic;
- KToggleAction *m_actionUnderline;
+ TDEToggleAction *m_actionBold;
+ TDEToggleAction *m_actionItalic;
+ TDEToggleAction *m_actionUnderline;
- KFontAction *m_actionFont;
- KFontSizeAction *m_actionFontSize;
+ TDEFontAction *m_actionFont;
+ TDEFontSizeAction *m_actionFontSize;
- KToggleAction *m_actionAlignLeft;
- KToggleAction *m_actionAlignRight;
- KToggleAction *m_actionAlignCenter;
- KToggleAction *m_actionAlignJustify;
+ TDEToggleAction *m_actionAlignLeft;
+ TDEToggleAction *m_actionAlignRight;
+ TDEToggleAction *m_actionAlignCenter;
+ TDEToggleAction *m_actionAlignJustify;
};
#endif
diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp
index 7f4a71f20..d733eab28 100644
--- a/libtdepim/kpimurlrequesterdlg.cpp
+++ b/libtdepim/kpimurlrequesterdlg.cpp
@@ -35,7 +35,7 @@ KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label,
const KURL& url = dlg.selectedURL();
if (url.isValid())
- KRecentDocument::add(url);
+ TDERecentDocument::add(url);
return url;
}
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index 0697f667d..21a1fc6f2 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -138,17 +138,17 @@ void KPixmapRegionSelectorWidget::updatePixmap()
m_label->setPixmap(pixmap);
}
-KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
+TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
{
- KPopupMenu *popup=new KPopupMenu(this, "PixmapRegionSelectorPopup");
+ TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
popup->insertTitle(i18n("Image Operations"));
- KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw",
+ TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
TQT_TQOBJECT(popup), "rotateclockwise");
action->plug(popup);
- action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
+ action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
TQT_TQOBJECT(popup), "rotatecounterclockwise");
action->plug(popup);
@@ -220,7 +220,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
if ( mev->button() == Qt::RightButton )
{
- KPopupMenu *popup = createPopupMenu( );
+ TDEPopupMenu *popup = createPopupMenu( );
popup->exec( mev->globalPos() );
delete popup;
return TRUE;
diff --git a/libtdepim/kpixmapregionselectorwidget.h b/libtdepim/kpixmapregionselectorwidget.h
index caad8fc3f..9af02c2ce 100644
--- a/libtdepim/kpixmapregionselectorwidget.h
+++ b/libtdepim/kpixmapregionselectorwidget.h
@@ -28,7 +28,7 @@
#include <tqlabel.h>
#include <kimageeffect.h>
-class KPopupMenu;
+class TDEPopupMenu;
namespace KPIM {
@@ -139,9 +139,9 @@ public slots:
protected:
/**
- * Creates a KPopupMenu with the menu that appears when clicking with the right button on the label
+ * Creates a TDEPopupMenu with the menu that appears when clicking with the right button on the label
*/
- virtual KPopupMenu *createPopupMenu();
+ virtual TDEPopupMenu *createPopupMenu();
private:
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 230962cb2..fbfa21a6d 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -272,8 +272,8 @@ TQPushButton *KPrefsWidFont::button()
void KPrefsWidFont::selectFont()
{
TQFont myFont(mPreview->font());
- int result = KFontDialog::getFont(myFont);
- if (result == KFontDialog::Accepted) {
+ int result = TDEFontDialog::getFont(myFont);
+ if (result == TDEFontDialog::Accepted) {
mPreview->setFont(myFont);
emit changed();
}
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index d46343d6b..0eadb6709 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -600,7 +600,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
kdDebug(5100) << "RuleListWidget::RuleListWidget()" << endl;
if (!n) setName("RuleListWidget");
TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint());
- ruleList = new KListBox(this);
+ ruleList = new TDEListBox(this);
if (standalone) {
connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
this,TQT_SLOT(slotEditRule(TQListBoxItem*)));
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index 4d4459845..0160a9e47 100644
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@@ -30,7 +30,7 @@
class KComboBox;
class KLineEdit;
class KIntSpinBox;
-class KListBox;
+class TDEListBox;
class TQFrame;
class TQLabel;
class TQListBoxItem;
@@ -235,7 +235,7 @@ protected slots:
private:
/** the list of rules */
- KListBox *ruleList;
+ TDEListBox *ruleList;
/** the current group */
TQString group;
/** marks if we're alone or together with the edit widget */
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index eb4660a3b..35c52e35d 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -41,7 +41,7 @@
#include <tqlayout.h>
-using namespace KRecentAddress;
+using namespace TDERecentAddress;
static KStaticDeleter<RecentAddresses> sd;
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 08976a027..6adc65986 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -39,7 +39,7 @@
class TDEConfig;
class KEditListBox;
-namespace KRecentAddress {
+namespace TDERecentAddress {
class KDE_EXPORT RecentAddressDialog : public KDialogBase
{