summaryrefslogtreecommitdiffstats
path: root/kontact/src
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kontact/src
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact/src')
-rw-r--r--kontact/src/aboutdialog.cpp4
-rw-r--r--kontact/src/iconsidepane.cpp22
-rw-r--r--kontact/src/iconsidepane.h8
-rw-r--r--kontact/src/kcmkontact.cpp2
-rw-r--r--kontact/src/main.cpp2
-rw-r--r--kontact/src/mainwindow.cpp28
-rw-r--r--kontact/src/profilemanager.cpp14
7 files changed, 40 insertions, 40 deletions
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 19e9d9ea..e671ddeb 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -93,10 +93,10 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
text += "<a href=\"" + home + "\">" + home + "</a><br>";
}
- text.replace( "\n", "<br>" );
+ text.tqreplace( "\n", "<br>" );
KActiveLabel *label = new KActiveLabel( text, topFrame );
- label->setAlignment( AlignTop );
+ label->tqsetAlignment( AlignTop );
topLayout->addWidget( label );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 4303175f..b54454e1 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p )
TQBrush brush;
if ( isCurrent() || isSelected() || mPaintActive )
- brush = box->colorGroup().brush( TQColorGroup::Highlight );
+ brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
else
- brush = box->colorGroup().highlight().light( 115 );
+ brush = box->tqcolorGroup().highlight().light( 115 );
p->fillRect( 1, 0, w - 2, h - 1, brush );
TQPen pen = p->pen();
TQPen oldPen = pen;
- pen.setColor( box->colorGroup().mid() );
+ pen.setColor( box->tqcolorGroup().mid() );
p->setPen( pen );
p->drawPoint( 1, 0 );
@@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p )
p->drawPixmap( x, y, mPixmap );
}
- TQColor shadowColor = listBox()->colorGroup().background().dark(115);
+ TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115);
if ( isCurrent() || isSelected() ) {
- p->setPen( box->colorGroup().highlightedText() );
+ p->setPen( box->tqcolorGroup().highlightedText() );
}
if ( !text().isEmpty() && navigator()->showText() ) {
@@ -225,13 +225,13 @@ void EntryItem::paint( TQPainter *p )
if ( plugin()->disabled() ) {
p->setPen( box->palette().disabled().text( ) );
} else if ( isCurrent() || isSelected() || mHasHover ) {
- p->setPen( box->colorGroup().highlight().dark(115) );
+ p->setPen( box->tqcolorGroup().highlight().dark(115) );
p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
y + 1, text() );
- p->setPen( box->colorGroup().highlightedText() );
+ p->setPen( box->tqcolorGroup().highlightedText() );
}
else
- p->setPen( box->colorGroup().text() );
+ p->setPen( box->tqcolorGroup().text() );
p->drawText( x, y, text() );
}
@@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
}
-TQSize Navigator::sizeHint() const
+TQSize Navigator::tqsizeHint() const
{
return TQSize( 100, 100 );
}
@@ -344,7 +344,7 @@ void Navigator::updatePlugins( TQValueList<Kontact::Plugin*> plugins_ )
minWidth = item->width( this );
}
- parentWidget()->setFixedWidth( minWidth );
+ tqparentWidget()->setFixedWidth( minWidth );
}
void Navigator::dragEnterEvent( TQDragEnterEvent *event )
@@ -491,7 +491,7 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos )
if (width > maxWidth)
maxWidth = width;
}
- parentWidget()->setFixedWidth( maxWidth );
+ tqparentWidget()->setFixedWidth( maxWidth );
triggerUpdate( true );
}
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 674980c0..a5aad36a 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -101,12 +101,12 @@ class EntryItemToolTip : public QToolTip
if ( !mListBox ) return;
TQListBoxItem* item = mListBox->itemAt( p );
if ( !item ) return;
- const TQRect itemRect = mListBox->itemRect( item );
- if ( !itemRect.isValid() ) return;
+ const TQRect tqitemRect = mListBox->tqitemRect( item );
+ if ( !tqitemRect.isValid() ) return;
const EntryItem *entryItem = static_cast<EntryItem*>( item );
TQString tipStr = entryItem->text();
- tip( itemRect, tipStr );
+ tip( tqitemRect, tipStr );
}
private:
TQListBox* mListBox;
@@ -125,7 +125,7 @@ class Navigator : public KListBox
void updatePlugins( TQValueList<Kontact::Plugin*> plugins );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void highlightItem( EntryItem* item );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index c14669ff..2162ffa0 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -114,7 +114,7 @@ PluginSelection::~PluginSelection()
void PluginSelection::readConfig()
{
const KTrader::OfferList offers = KTrader::self()->query(
- TQString::fromLatin1( "Kontact/Plugin" ),
+ TQString::tqfromLatin1( "Kontact/Plugin" ),
TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
int activeComponent = 0;
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index ee098180..760ea846 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -76,7 +76,7 @@ static void listPlugins()
{
KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
KTrader::OfferList offers = KTrader::self()->query(
- TQString::fromLatin1( "Kontact/Plugin" ),
+ TQString::tqfromLatin1( "Kontact/Plugin" ),
TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
KService::Ptr service = (*it);
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 247bb665..ab613466 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -124,7 +124,7 @@ void MainWindow::initGUI()
TQT_SLOT( showAboutDialog() ) );
KTrader::OfferList offers = KTrader::self()->query(
- TQString::fromLatin1( "Kontact/Plugin" ),
+ TQString::tqfromLatin1( "Kontact/Plugin" ),
TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
@@ -187,7 +187,7 @@ void MainWindow::initObject()
// done initializing
slotShowStatusMsg( TQString::null );
- connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+ connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) );
// launch commandline specified module if any
@@ -226,7 +226,7 @@ void MainWindow::activatePluginModule()
if ( !mActiveModule.isEmpty() ) {
PluginList::ConstIterator end = mPlugins.end();
for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it )
- if ( ( *it )->identifier().contains( mActiveModule ) ) {
+ if ( ( *it )->identifier().tqcontains( mActiveModule ) ) {
selectPlugin( *it );
return;
}
@@ -244,7 +244,7 @@ void MainWindow::initWidgets()
mSplitter = new TQSplitter( mTopWidget );
mBox = new TQHBox( mTopWidget );
mSidePane = new IconSidePane( this, mSplitter );
- mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+ mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
TQSizePolicy::Preferred ) );
// donÄt occupy screen estate on load
TQValueList<int> sizes;
@@ -278,7 +278,7 @@ void MainWindow::initWidgets()
mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() );
mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() );
- mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
+ mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
statusBar()->addWidget( mStatusMsgLabel, 10 , false );
statusBar()->addWidget( mLittleProgress, 0 , true );
@@ -802,15 +802,15 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
}
// store old focus widget
- TQWidget *focusWidget = kapp->focusWidget();
- if ( mCurrentPlugin && focusWidget ) {
+ TQWidget *tqfocusWidget = kapp->tqfocusWidget();
+ if ( mCurrentPlugin && tqfocusWidget ) {
// save the focus widget only when it belongs to the activated part
- TQWidget *parent = focusWidget->parentWidget();
+ TQWidget *parent = tqfocusWidget->tqparentWidget();
while ( parent ) {
if ( parent == mCurrentPlugin->part()->widget() )
- mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) );
+ mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
- parent = parent->parentWidget();
+ parent = parent->tqparentWidget();
}
}
@@ -828,10 +828,10 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
mPartsStack->raiseWidget( view );
view->show();
- if ( mFocusWidgets.contains( plugin->identifier() ) ) {
- focusWidget = mFocusWidgets[ plugin->identifier() ];
- if ( focusWidget )
- focusWidget->setFocus();
+ if ( mFocusWidgets.tqcontains( plugin->identifier() ) ) {
+ tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
+ if ( tqfocusWidget )
+ tqfocusWidget->setFocus();
} else
view->setFocus();
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index bb8d5095..804f65e3 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 = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) );
typedef TQMap<TQString, Kontact::Profile> ProfileMap;
ProfileMap profiles;
@@ -199,7 +199,7 @@ void Kontact::ProfileManager::readConfig()
for ( ProfileMap::ConstIterator it = globalProfiles.begin(), end = globalProfiles.end(); it != end; ++it )
{
- if ( !profiles.contains( it.key() ) )
+ if ( !profiles.tqcontains( it.key() ) )
profiles[it.key()] = it.data();
}
@@ -252,7 +252,7 @@ void Kontact::ProfileManager::saveToProfile( const TQString& id )
bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool syncConfig )
{
const TQString id = profile.id();
- if ( m_profiles.contains( id ) )
+ if ( m_profiles.tqcontains( id ) )
return false;
m_profiles[id] = profile;
emit profileAdded( id );
@@ -266,7 +266,7 @@ bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool
void Kontact::ProfileManager::loadProfile( const TQString& id )
{
- if ( !m_profiles.contains( id ) )
+ if ( !m_profiles.tqcontains( id ) )
return;
emit profileLoaded( id );
}
@@ -278,7 +278,7 @@ void Kontact::ProfileManager::removeProfile( const Kontact::Profile& profile )
void Kontact::ProfileManager::removeProfile( const TQString& id )
{
- if ( !m_profiles.contains( id ) )
+ if ( !m_profiles.tqcontains( id ) )
return;
Kontact::Profile profile = profileById( id );
if ( profile.isLocal() ) {
@@ -292,7 +292,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDirectory( const TQString& id, const TQString& path )
{
- if ( !m_profiles.contains( id ) )
+ if ( !m_profiles.tqcontains( id ) )
return SuccessfulExport;
if ( !TQDir( path ).exists() )
@@ -332,7 +332,7 @@ TQString Kontact::ProfileManager::generateNewId() const
while ( true )
{
const TQString newId = KApplication::randomString( 10 );
- if ( !m_profiles.contains( newId ) )
+ if ( !m_profiles.tqcontains( newId ) )
return newId;
}
}