summaryrefslogtreecommitdiffstats
path: root/kjots/KJotsMain.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /kjots/KJotsMain.cpp
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kjots/KJotsMain.cpp')
-rw-r--r--kjots/KJotsMain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 9333b81..f0a1c70 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -67,7 +67,7 @@ KJotsMain::KJotsMain(const char* name)
setCentralWidget(f_main);
splitter = new TQSplitter(f_main);
- splitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
// the subject list
subjectList = new KListView(splitter, "subjectList");
@@ -573,7 +573,7 @@ void KJotsMain::slotQuit()
void KJotsMain::insertDate()
{
- me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
+ me_text->insert(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
}
void KJotsMain::updateMenu()