summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-07 11:10:19 -0600
committerTimothy Pearson <[email protected]>2013-02-07 11:10:19 -0600
commit84673b354321cc022a8d8ec46dba6aa1dd6f95ef (patch)
treee74655fb4b281fb2fd4d63da0f6a5690b7fe5754
parent9a03aa40e3110a537b19f8a708d6782c69526f30 (diff)
downloadtdenetwork-84673b354321cc022a8d8ec46dba6aa1dd6f95ef.tar.gz
tdenetwork-84673b354321cc022a8d8ec46dba6aa1dd6f95ef.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--knewsticker/knewsticker.cpp2
-rw-r--r--kpf/src/Applet.cpp2
-rw-r--r--krfb/krfb/main.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 1c8854e9..a6ea7ce3 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -113,7 +113,7 @@ void KNewsTicker::preferences()
void KNewsTicker::about()
{
- KAboutApplication aboutDlg(m_aboutData);
+ TDEAboutApplication aboutDlg(m_aboutData);
aboutDlg.exec();
}
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 3b6b1902..f5feb871 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -215,7 +215,7 @@ namespace KPF
)
);
- KAboutApplication a(&about, this);
+ TDEAboutApplication a(&about, this);
a.exec();
}
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index ee8fff85..125bbdb8 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
if (!RFBController::checkX11Capabilities())
return 1;
- TrayIcon trayicon(new KAboutApplication(&aboutData),
+ TrayIcon trayicon(new TDEAboutApplication(&aboutData),
config);
RFBController controller(config);
KRfbIfaceImpl dcopiface(&controller);