summaryrefslogtreecommitdiffstats
path: root/kitchensync
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kitchensync
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kitchensync')
-rw-r--r--kitchensync/src/aboutpage.cpp2
-rw-r--r--kitchensync/src/groupconfig.cpp4
-rw-r--r--kitchensync/src/groupitem.cpp8
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp4
-rw-r--r--kitchensync/src/kwidgetlist.cpp8
-rw-r--r--kitchensync/src/main.cpp2
-rw-r--r--kitchensync/src/memberinfo.cpp4
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kitchensync/src/pluginpicker.cpp2
9 files changed, 18 insertions, 18 deletions
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index f2683996f..fe252460e 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -94,7 +94,7 @@ void AboutPage::handleUrl( const KURL &url )
TQString AboutPage::htmlText() const
{
- 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/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index cfedcbfad..4159fd1b6 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -56,7 +56,7 @@ GroupConfig::GroupConfig( TQWidget *parent )
TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
nameLayout->setMargin( 4 );
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_summary",
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary",
KIcon::Desktop );
TQLabel *iconLabel = new TQLabel( titleFrame );
@@ -92,7 +92,7 @@ GroupConfig::GroupConfig( TQWidget *parent )
buttonLayout->addStretch( 1 );
- icon = KGlobal::iconLoader()->loadIcon( "bookmark", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "bookmark", KIcon::Desktop );
TQFrame *page = mMemberView->addPage( i18n("Group"),
i18n("General Group Settings"), icon );
TQBoxLayout *pageLayout = new TQVBoxLayout( page );
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 08b12625f..023f91a01 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -67,7 +67,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
static TQPixmap icon;
if ( icon.isNull() )
- icon = KGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop );
mIcon = new TQLabel( hbox );
mIcon->setPixmap( icon );
@@ -123,8 +123,8 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
mCallbackHandler->setEngine( mSyncProcess->engine() );
- setSelectionForegroundColor( KGlobalSettings::textColor() );
- setSelectionBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
+ setSelectionForegroundColor( TDEGlobalSettings::textColor() );
+ setSelectionBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() );
update();
}
@@ -143,7 +143,7 @@ void GroupItem::update()
TQDateTime dateTime = mSyncProcess->group().lastSynchronization();
if ( dateTime.isValid() )
- mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) );
+ mTime->setText( i18n( "Last synchronized on: %1" ).arg( TDEGlobal::locale()->formatDateTime( dateTime ) ) );
else
mTime->setText( i18n( "Not synchronized yet" ) );
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index 1b4c2fe1b..e6f23afda 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -45,8 +45,8 @@ void HTMLDiffAlgoDisplay::begin()
mText.append( "<html>" );
mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" )
- .arg( KGlobalSettings::textColor().name() )
- .arg( KGlobalSettings::baseColor().name() ) );
+ .arg( TDEGlobalSettings::textColor().name() )
+ .arg( TDEGlobalSettings::baseColor().name() ) );
mText.append( "<center><table>" );
mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" )
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index 396e144f6..0990e479f 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -259,10 +259,10 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name )
: TQWidget( parent, name )
{
- mForegroundColor = KGlobalSettings::textColor();
- mBackgroundColor = KGlobalSettings::baseColor();
- mSelectionForegroundColor = KGlobalSettings::highlightedTextColor();
- mSelectionBackgroundColor = KGlobalSettings::highlightColor();
+ mForegroundColor = TDEGlobalSettings::textColor();
+ mBackgroundColor = TDEGlobalSettings::baseColor();
+ mSelectionForegroundColor = TDEGlobalSettings::highlightedTextColor();
+ mSelectionBackgroundColor = TDEGlobalSettings::highlightColor();
setFocusPolicy( TQ_StrongFocus );
}
diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp
index c544326ff..322326346 100644
--- a/kitchensync/src/main.cpp
+++ b/kitchensync/src/main.cpp
@@ -49,7 +49,7 @@ int main( int argc, char **argv )
KUniqueApplication app;
- KGlobal::locale()->insertCatalogue( "libkcal" );
+ TDEGlobal::locale()->insertCatalogue( "libkcal" );
MainWindow *mainWindow = new MainWindow;
mainWindow->show();
diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp
index 69ae89860..b93721ac6 100644
--- a/kitchensync/src/memberinfo.cpp
+++ b/kitchensync/src/memberinfo.cpp
@@ -32,12 +32,12 @@ MemberInfo::MemberInfo( const QSync::Member &member )
TQPixmap MemberInfo::smallIcon() const
{
- return KGlobal::iconLoader()->loadIcon( iconName(), KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::Small );
}
TQPixmap MemberInfo::desktopIcon() const
{
- return KGlobal::iconLoader()->loadIcon( iconName(), KIcon::Desktop );
+ return TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::Desktop );
}
TQString MemberInfo::iconName() const
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index b60e75f0c..1cf4d7a6c 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -48,7 +48,7 @@ KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName
new MainWidget( this, canvas );
- KGlobal::iconLoader()->addAppDir( "kitchensync" );
+ TDEGlobal::iconLoader()->addAppDir( "kitchensync" );
setXMLFile( "kitchensync_part.rc" );
}
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index d981599bd..b50027f43 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -41,7 +41,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
TQLabel *icon = new TQLabel( this );
- icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
+ icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
icon->setFixedSize( icon->sizeHint() );
TQLabel *name = new TQLabel( plugin.longName(), this );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 08:19:20 +0000