summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:29:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:29:26 -0600
commit31fde11959900b0fd3748bab9a3539b88825feb9 (patch)
tree5cd7424ac96f34ae59a5d325fa797e30c0d6f58f
parent44ff5a3c798fe9c44df30cc898fbdffa44784d56 (diff)
downloadtdesdk-31fde11959900b0fd3748bab9a3539b88825feb9.tar.gz
tdesdk-31fde11959900b0fd3748bab9a3539b88825feb9.zip
Rename KStandard for enhanced compatibility with KDE4
-rw-r--r--kbabel/common/projectsettings.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp2
-rw-r--r--kbugbuster/backend/mailsender.cpp4
-rw-r--r--scripts/fixheaders4
-rw-r--r--tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp2
-rw-r--r--umbrello/umbrello/aligntoolbar.cpp2
-rw-r--r--umbrello/umbrello/codegenerationpolicy.cpp2
-rw-r--r--umbrello/umbrello/kstartuplogo.cpp2
-rw-r--r--umbrello/umbrello/listpopupmenu.cpp2
-rw-r--r--umbrello/umbrello/refactoring/refactoringassistant.cpp2
-rw-r--r--umbrello/umbrello/umllistview.cpp2
-rw-r--r--umbrello/umbrello/worktoolbar.cpp2
15 files changed, 18 insertions, 18 deletions
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 08204054..98df4924 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -46,7 +46,7 @@ TQString KBabel::Defaults::Spellcheck::ignoreURL()
{
TQString _ignoreURL;
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
_ignoreURL = dirs->saveLocation("appdata");
@@ -113,7 +113,7 @@ TQString KBabel::Defaults::CatalogManager::ignoreURL()
{
TQString _ignoreURL;
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
_ignoreURL = dirs->saveLocation("appdata");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 126c8c10..6c05904c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -1158,7 +1158,7 @@ KDBSearchEngine::readSettings (TDEConfigBase * config)
lang = config->readEntry ("Language", defaultLang);
TQString defaultDir;
- KStandardDirs *dirs = TDEGlobal::dirs ();
+ TDEStandardDirs *dirs = TDEGlobal::dirs ();
if (dirs)
{
defaultDir = dirs->saveLocation ("data");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index 9958b409..ed2c5065 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -85,7 +85,7 @@ dbpw->ignoreLE->setText("&.:");
dbpw->autoAddCB_2->setChecked(true);
TQString defaultDir;
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
defaultDir = dirs->saveLocation("data");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index d81dcc93..21e8d641 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -322,7 +322,7 @@ void KDBSearchEngine2::readSettings(TDEConfigBase *config)
{
/*TQString defaultDir;
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
defaultDir = dirs->saveLocation("data");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index 5e49a996..d70ae697 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -53,7 +53,7 @@ emit restoreNow();
void KDB2PreferencesWidget::standard()
{
TQString defaultDir;
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
defaultDir = dirs->saveLocation("data");
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index d1f91f01..9c94d669 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -53,11 +53,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
bool needHeaders = true;
- TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
+ TQString command = TDEStandardDirs::findExe(TQString::fromLatin1("sendmail"),
TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
else {
- command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
+ command = TDEStandardDirs::findExe(TQString::fromLatin1("mail"));
if (command.isNull()) return false; // give up
command.append(TQString::fromLatin1(" -s "));
diff --git a/scripts/fixheaders b/scripts/fixheaders
index a5debd94..12cf1a2a 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -48,8 +48,8 @@ $lastdir = '.';
'`TDEGlobal\' undeclared \(first use this function\)' => "kglobal",
'implicit declaration of function `int locate\(\.\.\.\)' => "kstddirs",
'`locate\' undeclared \(first use this function\)' => "kstddirs",
- 'no matching function for call to `KStandardDirs' => "kstddirs",
- 'no method `KStandardDirs::' => "kstddirs",
+ 'no matching function for call to `TDEStandardDirs' => "kstddirs",
+ 'no method `TDEStandardDirs::' => "kstddirs",
'variable `class QFile \S*\' has initializer but incomplete type' => "qfile",
'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader",
'`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox",
diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
index eba0634a..fa4b264c 100644
--- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
+++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
@@ -115,7 +115,7 @@ SvnHelper::SvnHelper():TDEApplication() {
TDEIO::NetAccess::synchronousRun( job, 0 );
if ( diffresult.count() > 0 ) {
//check kompare is available
- if ( !KStandardDirs::findExe( "kompare" ).isNull() ) {
+ if ( !TDEStandardDirs::findExe( "kompare" ).isNull() ) {
KTempFile *tmp = new KTempFile;
tmp->setAutoDelete(true);
TQTextStream *stream = tmp->textStream();
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index d8248bda..cf2a15cc 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -67,7 +67,7 @@ bool AlignToolBar::hasWidgetSmallerY(const UMLWidget* widget1, const UMLWidget*
}
void AlignToolBar::loadPixmaps() {
- KStandardDirs* dirs = TDEGlobal::dirs();
+ TDEStandardDirs* dirs = TDEGlobal::dirs();
TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
dataDir += "/umbrello/pics/";
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index dbabc9a3..0b33372a 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -469,7 +469,7 @@ void CodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSigna
path = config -> readPathEntry("headingsDirectory");
if(path.isEmpty()) {
- KStandardDirs stddirs;
+ TDEStandardDirs stddirs;
path = stddirs.findDirs("data","umbrello/headings").first();
}
setHeadingFileDir ( path );
diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp
index 1b3f8625..21e1ff57 100644
--- a/umbrello/umbrello/kstartuplogo.cpp
+++ b/umbrello/umbrello/kstartuplogo.cpp
@@ -21,7 +21,7 @@ KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
: TQWidget(parent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
,m_bReadyToHide(false) {
//pm.load(locate("appdata", "pics/startlogo.png"));
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString dataDir = dirs -> findResourceDir("data", "umbrello/pics/object.png");
dataDir += "/umbrello/pics/";
TQPixmap pm(dataDir + "startlogo.png");
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 15ce6c21..96679522 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -826,7 +826,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
m_pShow = 0;
m_pColor = 0;
- KStandardDirs* dirs = TDEGlobal::dirs();
+ TDEStandardDirs* dirs = TDEGlobal::dirs();
TQString dataDir = dirs->findResourceDir("data", "umbrello/pics/object.png");
dataDir += "/umbrello/pics/";
m_pixmap[pm_Class] .load(dataDir+"class.png", "PNG");
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 9951e00f..1616751b 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -681,7 +681,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
void RefactoringAssistant::loadPixmaps()
{
- KStandardDirs *dirs = TDEGlobal::dirs();
+ TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString dataDir = dirs -> findResourceDir( "data", "umbrello/pics/object.png" );
dataDir += "/umbrello/pics/";
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 12671fdf..d6f23206 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -1753,7 +1753,7 @@ TQPixmap & UMLListView::getPixmap(Uml::Icon_Type type) {
}
void UMLListView::loadPixmaps() {
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString dataDir = dirs -> findResourceDir("data", "umbrello/pics/object.png");
dataDir += "/umbrello/pics/";
diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp
index 1f291ec9..e973e553 100644
--- a/umbrello/umbrello/worktoolbar.cpp
+++ b/umbrello/umbrello/worktoolbar.cpp
@@ -289,7 +289,7 @@ void WorkToolBar::loadPixmaps() {
{ tbb_Initial_Activity, i18n("Initial Activity"), "initial_state.png" },
{ tbb_Coll_Message, i18n("Message"), "message-asynchronous.png" }
};
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
dataDir += "/umbrello/pics/";
const size_t n_buttonInfos = sizeof(buttonInfo) / sizeof(ButtonInfo);