TDE
/
piklab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/piklab
0
0
Fork 0
Code Issues Releases Wiki Activity

Use tdeApp

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/25/head
Michele Calgaro 1 month ago
parent 3e17dfec52
commit e87deba42d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

6
src/common/global/generic_config.cpp
Unescape Escape View File

@ -25,9 +25,9 @@ class GenericConfigPrivate
{ {
public: public:
GenericConfigPrivate(const TQString &group) : _group(group) {} GenericConfigPrivate(const TQString &group) : _group(group) {}
~GenericConfigPrivate() { kapp->config()->sync(); } ~GenericConfigPrivate() { tdeApp->config()->sync(); }
TDEConfig &config() { TDEConfig &config() {
TDEConfig *conf = kapp->config(); TDEConfig *conf = tdeApp->config();
conf->setGroup(_group); conf->setGroup(_group);
return *conf; return *conf;
} }
@ -216,7 +216,7 @@ void GenericConfig::deleteGroup(const TQString &group)
Q_UNUSED(group); Q_UNUSED(group);
// #### cannot do that... // #### cannot do that...
#else #else
kapp->config()->deleteGroup(group); tdeApp->config()->deleteGroup(group);
#endif #endif
} }

12
src/common/nokde/nokde_tdecmdlineargs.cpp
Unescape Escape View File

@ -142,20 +142,20 @@ bool TDECmdLineArgs::ignoreUnknown = false;
void void
TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName, TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName,
const char *_description, const char *_version, bool noKApp) const char *_description, const char *_version, bool noTDEApp)
{ {
init(_argc, _argv, init(_argc, _argv,
new TDEAboutData(_appname, programName, _version, _description), new TDEAboutData(_appname, programName, _version, _description),
noKApp); noTDEApp);
} }
void void
TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
const char *_description, const char *_version, bool noKApp) const char *_description, const char *_version, bool noTDEApp)
{ {
init(_argc, _argv, init(_argc, _argv,
new TDEAboutData(_appname, _appname, _version, _description), new TDEAboutData(_appname, _appname, _version, _description),
noKApp); noTDEApp);
} }
void void
@ -176,7 +176,7 @@ TDECmdLineArgs::init(const TDEAboutData* ab)
void void
TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool /*noKApp*/) TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool /*noTDEApp*/)
{ {
argc = _argc; argc = _argc;
argv = _argv; argv = _argv;
@ -204,7 +204,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool /
#ifdef TQ_WS_WIN #ifdef TQ_WS_WIN
win32_slashify(mCwd, PATH_MAX); win32_slashify(mCwd, PATH_MAX);
#endif #endif
// if (!noKApp) // if (!noTDEApp)
// TDEApplication::addCmdLineOptions(); // TDEApplication::addCmdLineOptions();
} }

10
src/common/nokde/nokde_tdecmdlineargs.h
Unescape Escape View File

@ -252,14 +252,14 @@ public:
* translation. Example: I18N_NOOP("KEdit") * translation. Example: I18N_NOOP("KEdit")
* @param _description A short description of what your application is about. * @param _description A short description of what your application is about.
* @param _version A version. * @param _version A version.
* @param noKApp Set this true to not add commandline options for * @param noTDEApp Set this true to not add commandline options for
* TQApplication / TDEApplication * TQApplication / TDEApplication
* *
* @since 3.2 * @since 3.2
*/ */
static void init(int _argc, char **_argv, const char *_appname, static void init(int _argc, char **_argv, const char *_appname,
const char* programName, const char *_description, const char* programName, const char *_description,
const char *_version, bool noKApp = false); const char *_version, bool noTDEApp = false);
/** /**
* @deprecated * @deprecated
* You should convert any calls to this method to use the one * You should convert any calls to this method to use the one
@ -268,7 +268,7 @@ public:
*/ */
static void init(int _argc, char **_argv, static void init(int _argc, char **_argv,
const char *_appname, const char *_description, const char *_appname, const char *_description,
const char *_version, bool noKApp = false) TDE_DEPRECATED; const char *_version, bool noTDEApp = false) TDE_DEPRECATED;
/** /**
* Initialize class. * Initialize class.
@ -280,11 +280,11 @@ public:
* @param _argc As passed to @p main(...). * @param _argc As passed to @p main(...).
* @param _argv As passed to @p main(...). * @param _argv As passed to @p main(...).
* @param about A TDEAboutData object describing your program. * @param about A TDEAboutData object describing your program.
* @param noKApp Set this true to not add commandline options for * @param noTDEApp Set this true to not add commandline options for
* TQApplication / TDEApplication * TQApplication / TDEApplication
*/ */
static void init(int _argc, char **_argv, static void init(int _argc, char **_argv,
const TDEAboutData *about, bool noKApp = false); const TDEAboutData *about, bool noTDEApp = false);
/** /**
* Initialize Class * Initialize Class

52
src/libgui/likeback.cpp
Unescape Escape View File

@ -57,10 +57,10 @@ LikeBack::LikeBack(Button buttons)
{ {
TQHBoxLayout *layout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like", TDEIcon::Small); TQIconSet likeIconSet = tdeApp->iconLoader()->loadIconSet("likeback_like", TDEIcon::Small);
TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", TDEIcon::Small); TQIconSet dislikeIconSet = tdeApp->iconLoader()->loadIconSet("likeback_dislike", TDEIcon::Small);
TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug", TDEIcon::Small); TQIconSet bugIconSet = tdeApp->iconLoader()->loadIconSet("likeback_bug", TDEIcon::Small);
// TQIconSet configureIconSet = kapp->iconLoader()->loadIconSet("configure", TDEIcon::Small); // TQIconSet configureIconSet = tdeApp->iconLoader()->loadIconSet("configure", TDEIcon::Small);
TQToolButton *m_likeButton = new TQToolButton(this, "ilike"); TQToolButton *m_likeButton = new TQToolButton(this, "ilike");
m_likeButton->setIconSet(likeIconSet); m_likeButton->setIconSet(likeIconSet);
@ -84,7 +84,7 @@ LikeBack::LikeBack(Button buttons)
layout->add(m_bugButton); layout->add(m_bugButton);
m_configureButton = new TQToolButton(this, "configure"); m_configureButton = new TQToolButton(this, "configure");
TQIconSet helpIconSet = kapp->iconLoader()->loadIconSet("help", TDEIcon::Small); TQIconSet helpIconSet = tdeApp->iconLoader()->loadIconSet("help", TDEIcon::Small);
m_configureButton->setIconSet(helpIconSet); m_configureButton->setIconSet(helpIconSet);
m_configureButton->setTextLabel(i18n("Configure...")); m_configureButton->setTextLabel(i18n("Configure..."));
m_configureButton->setAutoRaise(true); m_configureButton->setAutoRaise(true);
@ -93,9 +93,9 @@ LikeBack::LikeBack(Button buttons)
TQPopupMenu *configureMenu = new TQPopupMenu(this); TQPopupMenu *configureMenu = new TQPopupMenu(this);
configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQ_SLOT(showWhatsThisMessage()) ); configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQ_SLOT(showWhatsThisMessage()) );
TQIconSet changeEmailIconSet = kapp->iconLoader()->loadIconSet("mail_generic", TDEIcon::Small); TQIconSet changeEmailIconSet = tdeApp->iconLoader()->loadIconSet("mail_generic", TDEIcon::Small);
configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQ_SLOT(askEMail()) ); configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQ_SLOT(askEMail()) );
// TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("process-stop", TDEIcon::Small); // TQIconSet dontHelpIconSet = tdeApp->iconLoader()->loadIconSet("process-stop", TDEIcon::Small);
// configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQ_SLOT(doNotHelpAnymore()) ); // configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQ_SLOT(doNotHelpAnymore()) );
m_configureButton->setPopup(configureMenu); m_configureButton->setPopup(configureMenu);
connect( m_configureButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(openConfigurePopup()) ); connect( m_configureButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(openConfigurePopup()) );
@ -131,7 +131,7 @@ void LikeBack::doNotHelpAnymore()
{ {
disable(); disable();
int result = KMessageBox::questionYesNo( int result = KMessageBox::questionYesNo(
kapp->activeWindow(), tdeApp->activeWindow(),
i18n("Are you sure you do not want to participate anymore in the application enhancing program?"), i18n("Are you sure you do not want to participate anymore in the application enhancing program?"),
i18n("Do not Help Anymore")); i18n("Do not Help Anymore"));
if (result == KMessageBox::No) { if (result == KMessageBox::No) {
@ -153,7 +153,7 @@ void LikeBack::showWhatsThisMessage()
bool LikeBack::userWantToParticipate() bool LikeBack::userWantToParticipate()
{ {
if (!kapp) if (!tdeApp)
return true; return true;
s_config->setGroup("LikeBack"); s_config->setGroup("LikeBack");
@ -164,9 +164,9 @@ bool LikeBack::userWantToParticipate()
void LikeBack::showInformationMessage() void LikeBack::showInformationMessage()
{ {
TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like", TDEIcon::Small); TQPixmap likeIcon = tdeApp->iconLoader()->loadIcon("likeback_like", TDEIcon::Small);
TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small); TQPixmap dislikeIcon = tdeApp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small);
TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug", TDEIcon::Small); TQPixmap bugIcon = tdeApp->iconLoader()->loadIcon("likeback_bug", TDEIcon::Small);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon); TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon); TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon); TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon);
@ -276,7 +276,7 @@ void LikeBack::autoMove()
{ {
static TQWidget *lastWindow = 0; static TQWidget *lastWindow = 0;
TQWidget *window = kapp->activeWindow(); TQWidget *window = tdeApp->activeWindow();
// When a Kicker applet has the focus, like the Commandline TQLineEdit, // When a Kicker applet has the focus, like the Commandline TQLineEdit,
// the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon. // the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon.
// It's obviously bad ;-) : // It's obviously bad ;-) :
@ -311,7 +311,7 @@ void LikeBack::iDoNotLike()
void LikeBack::iFoundABug() void LikeBack::iFoundABug()
{ {
(void)new KRun(Piklab::URLS[Piklab::BugReport], kapp->mainWidget()); (void)new KRun(Piklab::URLS[Piklab::BugReport], tdeApp->mainWidget());
// showDialog(IFoundABug); // showDialog(IFoundABug);
} }
@ -322,7 +322,7 @@ void LikeBack::configure()
TQString LikeBack::activeWindowPath() TQString LikeBack::activeWindowPath()
{ {
TQStringList windowNames; TQStringList windowNames;
TQWidget *window = kapp->activeWindow(); TQWidget *window = tdeApp->activeWindow();
while (window) { while (window) {
TQString name = window->name(); TQString name = window->name();
if (name == "unnamed") if (name == "unnamed")
@ -347,7 +347,7 @@ void LikeBack::showDialog(Button button)
LikeBackDialog dialog(button, activeWindowPath(), ""); LikeBackDialog dialog(button, activeWindowPath(), "");
disable(); disable();
hide(); hide();
kapp->processEvents(); tdeApp->processEvents();
dialog.exec(); dialog.exec();
enable(); enable();
} }
@ -396,7 +396,7 @@ void LikeBack::askEMail()
"<p>" + i18n("The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case.") + "</p>" + "<p>" + i18n("The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case.") + "</p>" +
"<p>" + i18n("You can change or remove your email address whenever you want. For that, use the little arrow icon at the top-right corner of a window.") + "</p>" + "<p>" + i18n("You can change or remove your email address whenever you want. For that, use the little arrow icon at the top-right corner of a window.") + "</p>" +
"<p>" + i18n("Your email address (keep empty to post comments anonymously):"), "<p>" + i18n("Your email address (keep empty to post comments anonymously):"),
currentEMailAddress, &ok, kapp->activeWindow(), /*name=*/(const char*)0, &emailValidator); currentEMailAddress, &ok, tdeApp->activeWindow(), /*name=*/(const char*)0, &emailValidator);
enable(); enable();
if (ok) if (ok)
@ -430,9 +430,9 @@ void LikeBack::init(Button buttons)
void LikeBack::init(bool isDevelopmentVersion, Button buttons) void LikeBack::init(bool isDevelopmentVersion, Button buttons)
{ {
if (s_config == 0) if (s_config == 0)
s_config = kapp->config(); s_config = tdeApp->config();
if (s_about == 0) if (s_about == 0)
s_about = (TDEAboutData*) kapp->aboutData(); s_about = (TDEAboutData*) tdeApp->aboutData();
if (LikeBack::userWantToParticipate() && isDevelopmentVersion) if (LikeBack::userWantToParticipate() && isDevelopmentVersion)
new LikeBack(buttons); new LikeBack(buttons);
@ -503,7 +503,7 @@ void LikeBack::endFetchingEmailFrom()
/** class LikeBackDialog: */ /** class LikeBackDialog: */
LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQString context) LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQString context)
: KDialog(kapp->activeWindow(), "_likeback_feedback_window_") : KDialog(tdeApp->activeWindow(), "_likeback_feedback_window_")
, m_reason(reason) , m_reason(reason)
, m_windowName(windowName) , m_windowName(windowName)
, m_context(context) , m_context(context)
@ -526,21 +526,21 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
case LikeBack::ILike: case LikeBack::ILike:
color = TQColor("#DFFFDF"); color = TQColor("#DFFFDF");
lineColor = TQt::green; lineColor = TQt::green;
icon = kapp->iconLoader()->loadIcon("likeback_like", TDEIcon::Small); icon = tdeApp->iconLoader()->loadIcon("likeback_like", TDEIcon::Small);
title = i18n("I like..."); title = i18n("I like...");
please = i18n("Please briefly describe what you like."); please = i18n("Please briefly describe what you like.");
break; break;
case LikeBack::IDoNotLike: case LikeBack::IDoNotLike:
color = TQColor("#FFDFDF"); color = TQColor("#FFDFDF");
lineColor = TQt::red; lineColor = TQt::red;
icon = kapp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small); icon = tdeApp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small);
title = i18n("I do not like..."); title = i18n("I do not like...");
please = i18n("Please briefly describe what you do not like."); please = i18n("Please briefly describe what you do not like.");
break; break;
case LikeBack::IFoundABug: case LikeBack::IFoundABug:
color = TQColor("#C0C0C0"); color = TQColor("#C0C0C0");
lineColor = TQt::black; lineColor = TQt::black;
icon = kapp->iconLoader()->loadIcon("bug", TDEIcon::Small); icon = tdeApp->iconLoader()->loadIcon("bug", TDEIcon::Small);
title = i18n("I found a bug..."); title = i18n("I found a bug...");
please = i18n("Please briefly describe the bug you encountered."); please = i18n("Please briefly describe the bug you encountered.");
break; break;
@ -578,7 +578,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
commentLayout->setMargin(0); commentLayout->setMargin(0);
commentLayout->setSpacing(KDialogBase::spacingHint()); commentLayout->setSpacing(KDialogBase::spacingHint());
m_comment = new TQTextEdit(coloredWidget); m_comment = new TQTextEdit(coloredWidget);
TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail-send", TDEIcon::Toolbar); TQIconSet sendIconSet = tdeApp->iconLoader()->loadIconSet("mail-send", TDEIcon::Toolbar);
m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget); m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget);
m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding); m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
m_sendButton->setEnabled(false); m_sendButton->setEnabled(false);
@ -604,9 +604,9 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
) + "</p>" ) + "</p>"
); );
resize(kapp->desktop()->width() / 2, kapp->desktop()->height() / 3); resize(tdeApp->desktop()->width() / 2, tdeApp->desktop()->height() / 3);
setCaption(kapp->makeStdCaption(i18n("Send a Comment"))); setCaption(tdeApp->makeStdCaption(i18n("Send a Comment")));
// setMinimumSize(mainLayout->sizeHint()); // FIXME: Doesn't work! // setMinimumSize(mainLayout->sizeHint()); // FIXME: Doesn't work!
} }

2
src/libgui/likeback.h
Unescape Escape View File

@ -61,7 +61,7 @@ class LikeBack : public TQWidget
static bool emailAddressAlreadyProvided(); static bool emailAddressAlreadyProvided();
static TQString emailAddress(); /// << @Returns the email user address, or ask it to the user if he haven't provided or ignored it static TQString emailAddress(); /// << @Returns the email user address, or ask it to the user if he haven't provided or ignored it
static void setEmailAddress(const TQString &address); /// << Calling emailAddress() will ask it to the user the first time static void setEmailAddress(const TQString &address); /// << Calling emailAddress() will ask it to the user the first time
static bool isDevelopmentVersion(const TQString &version = TQString()); /// << @Returns true if version is an alpha/beta/rc/svn/cvs version. Use kapp->aboutData()->version is @p version is empty static bool isDevelopmentVersion(const TQString &version = TQString()); /// << @Returns true if version is an alpha/beta/rc/svn/cvs version. Use tdeApp->aboutData()->version is @p version is empty
static void init(Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if the application version is a development one. static void init(Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if the application version is a development one.
static void init(bool isDevelopmentVersion, Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if @p isDevelopmentVersion is true. static void init(bool isDevelopmentVersion, Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if @p isDevelopmentVersion is true.
static void init(TDEConfig* config, TDEAboutData* about, Button buttons = AllButtons); static void init(TDEConfig* config, TDEAboutData* about, Button buttons = AllButtons);

16
src/libgui/toplevel.cpp
Unescape Escape View File

@ -186,7 +186,7 @@ MainWindow::MainWindow()
KStdAction::open(this, TQ_SLOT(openFile()), actionCollection()); KStdAction::open(this, TQ_SLOT(openFile()), actionCollection());
TDERecentFilesAction *recent = KStdAction::openRecent(this, TQ_SLOT(openRecentFile(const KURL &)), actionCollection()); TDERecentFilesAction *recent = KStdAction::openRecent(this, TQ_SLOT(openRecentFile(const KURL &)), actionCollection());
recent->setMaxItems(20); recent->setMaxItems(20);
recent->loadEntries(kapp->config(), "recent-files"); recent->loadEntries(tdeApp->config(), "recent-files");
(void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQ_SLOT(saveAllFiles()), (void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQ_SLOT(saveAllFiles()),
actionCollection(), "file_save_all"); actionCollection(), "file_save_all");
KStdAction::close(Main::_editorManager, TQ_SLOT(closeCurrentEditor()), actionCollection()); KStdAction::close(Main::_editorManager, TQ_SLOT(closeCurrentEditor()), actionCollection());
@ -230,7 +230,7 @@ MainWindow::MainWindow()
recent = new TDERecentFilesAction(i18n("Open Recent Project"), 0, recent = new TDERecentFilesAction(i18n("Open Recent Project"), 0,
this, TQ_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent"); this, TQ_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent");
recent->setMaxItems(20); recent->setMaxItems(20);
recent->loadEntries(kapp->config(), "recent-projects"); recent->loadEntries(tdeApp->config(), "recent-projects");
(void)new TDEAction(i18n("Project Options..."), "configure", 0, (void)new TDEAction(i18n("Project Options..."), "configure", 0,
this, TQ_SLOT(configureProject()), actionCollection(), "project_options"); this, TQ_SLOT(configureProject()), actionCollection(), "project_options");
(void)new TDEAction(i18n("Close Project"), "window-close", 0, (void)new TDEAction(i18n("Close Project"), "window-close", 0,
@ -358,10 +358,10 @@ MainWindow::~MainWindow()
void MainWindow::readDockConfig() void MainWindow::readDockConfig()
{ {
KDockMainWindow::readDockConfig(kapp->config(), "dock_config"); KDockMainWindow::readDockConfig(tdeApp->config(), "dock_config");
// if there is a new dock: it is not displayed by default... // if there is a new dock: it is not displayed by default...
TQMap<TQString, TQString> entries = kapp->config()->entryMap("dock_config"); TQMap<TQString, TQString> entries = tdeApp->config()->entryMap("dock_config");
TQValueList<DockData>::iterator it; TQValueList<DockData>::iterator it;
for(it=_docks.begin(); it!=_docks.end(); ++it) { for(it=_docks.begin(); it!=_docks.end(); ++it) {
TQMap<TQString, TQString>::const_iterator eit; TQMap<TQString, TQString>::const_iterator eit;
@ -511,9 +511,9 @@ bool MainWindow::queryClose()
} }
// save other settings // save other settings
::PBusyCursor bc; ::PBusyCursor bc;
writeDockConfig(kapp->config(), "dock_config"); writeDockConfig(tdeApp->config(), "dock_config");
static_cast<TDERecentFilesAction *>(Main::action("project_open_recent"))->saveEntries(kapp->config(), "recent-projects"); static_cast<TDERecentFilesAction *>(Main::action("project_open_recent"))->saveEntries(tdeApp->config(), "recent-projects");
static_cast<TDERecentFilesAction *>(Main::action("file_open_recent"))->saveEntries(kapp->config(), "recent-files"); static_cast<TDERecentFilesAction *>(Main::action("file_open_recent"))->saveEntries(tdeApp->config(), "recent-files");
GlobalConfig::writeOpenedProject(Main::project() ? Main::project()->url() : PURL::Url()); GlobalConfig::writeOpenedProject(Main::project() ? Main::project()->url() : PURL::Url());
if ( Main::project() ) Main::_projectManager->closeProject(); if ( Main::project() ) Main::_projectManager->closeProject();
return true; return true;
@ -674,7 +674,7 @@ void MainWindow::updateGUI()
if ( Main::project() ) caption += " - "; if ( Main::project() ) caption += " - ";
caption += Main::currentEditor()->url().filepath(); caption += Main::currentEditor()->url().filepath();
} }
setCaption(TDEApplication::kApplication()->makeStdCaption(caption)); setCaption(tdeApp->makeStdCaption(caption));
emit stateChanged(); emit stateChanged();
} }

4
src/piklab/main.cpp
Unescape Escape View File

@ -23,10 +23,10 @@ int main(int argc, char **argv)
LikeBack::init(true); LikeBack::init(true);
LikeBack::setServer("piklab.sourceforge.net", "/likeback/send.php"); LikeBack::setServer("piklab.sourceforge.net", "/likeback/send.php");
LikeBack::setAllowFeatureWishes(true); LikeBack::setAllowFeatureWishes(true);
if ( kapp->isRestored() ) RESTORE(MainWindow) if ( tdeApp->isRestored() ) RESTORE(MainWindow)
else { else {
MainWindow *wid = new MainWindow; MainWindow *wid = new MainWindow;
wid->show(); wid->show();
} }
return kapp->exec(); return tdeApp->exec();
} }

Write Preview
Loading…
Cancel
Save