Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 58646ccdcd
commit 2f1044cf63

@ -196,6 +196,6 @@ void ExecDlg::saveSession()
void ExecDlg::help()
{
KApplication::kApplication()->invokeHelp("", "karts");
TDEApplication::kApplication()->invokeHelp("", "karts");
}
#include "execdlg.moc"

@ -172,7 +172,7 @@ void InterfaceDlg::update()
void InterfaceDlg::help()
{
KApplication::kApplication()->invokeHelp("", "karts");
TDEApplication::kApplication()->invokeHelp("", "karts");
}
#include "interfacedlg.moc"

@ -71,7 +71,7 @@ using namespace std;
/*************************************************************/
class ArtsBuilderApp :public KApplication
class ArtsBuilderApp :public TDEApplication
{
protected:
ArtsBuilderWindow *mainWindow;

@ -252,7 +252,7 @@ void PortPosDlg::update()
void PortPosDlg::help()
{
KApplication::kApplication()->invokeHelp("", "karts");
TDEApplication::kApplication()->invokeHelp("", "karts");
}
#include "portposdlg.moc"

@ -132,6 +132,6 @@ TQString RetrieveDlg::result()
void RetrieveDlg::help()
{
KApplication::kApplication()->invokeHelp("", "karts");
TDEApplication::kApplication()->invokeHelp("", "karts");
}
#include "retrievedlg.moc"

@ -33,7 +33,7 @@ int main(int argc, char **argv)
{
TQIOManager iomanager;
Dispatcher dispatcher(&iomanager);
KApplication application(argc, argv, "testgui");
TDEApplication application(argc, argv, "testgui");
ObjectManager::the()->provideCapability("kdegui");

@ -32,7 +32,7 @@ int main( int argc, char* argv[] ) {
aboutData.addAuthor( "Arnold Krille", I18N_NOOP( "Creator" ), "arnold@arnoldarts.de");
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
TDEApplication app;
dBTestWidget* w = new dBTestWidget( 0 );
w->show();

@ -155,7 +155,7 @@ TQString ChooseBusDlg::result()
void ChooseBusDlg::help()
{
KApplication::kApplication()->invokeHelp("", "artsbuilder");
TDEApplication::kApplication()->invokeHelp("", "artsbuilder");
}
void ChooseBusDlg::textChanged( const TQString & busname )

@ -197,7 +197,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app(argc, argv);
TDEApplication app(argc, argv);
// setup mcop communication
QIOManager qiomanager;

@ -173,7 +173,7 @@ TQCString MidiInstDlg::filename()
void MidiInstDlg::help()
{
KApplication::kApplication()->invokeHelp("", "artsbuilder");
TDEApplication::kApplication()->invokeHelp("", "artsbuilder");
}
#include "midiinstdlg.moc"

@ -105,7 +105,7 @@ const char *MidiPortDlg::device()
void MidiPortDlg::help()
{
KApplication::kApplication()->invokeHelp("", "artsbuilder");
TDEApplication::kApplication()->invokeHelp("", "artsbuilder");
}
#include "midiportdlg.moc"

@ -1892,7 +1892,7 @@ struct TypeDef {
Since &kde; dropped <acronym>CORBA</acronym> completely, and is using
&DCOP; everywhere instead, naturally the question arises why &arts;
isn't doing so. After all, &DCOP; support is in
<classname>KApplication</classname>, is well-maintained, supposed to
<classname>TDEApplication</classname>, is well-maintained, supposed to
integrate greatly with libICE, and whatever else.
</para>

@ -193,7 +193,7 @@ void CoverInfo::popup() const
{
TQPixmap image = pixmap(FullSize);
TQPoint mouse = TQCursor::pos();
TQRect desktop = KApplication::desktop()->screenGeometry(mouse);
TQRect desktop = TDEApplication::desktop()->screenGeometry(mouse);
int x = mouse.x();
int y = mouse.y();

@ -864,7 +864,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
if(itemMap.isEmpty() || ConfirmationDialog(map).exec() != TQDialog::Accepted)
return;
KApplication::setOverrideCursor(TQt::waitCursor);
TDEApplication::setOverrideCursor(TQt::waitCursor);
for(TQMap<TQString, TQString>::ConstIterator it = map.begin();
it != map.end(); ++it)
{
@ -879,7 +879,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
processEvents();
}
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
if(!errorFiles.isEmpty())
KMessageBox::errorList(0, i18n("The following rename operations failed:\n"), errorFiles);

@ -244,7 +244,7 @@ class KTRMEventHandler : public TQObject
public:
static void send(int fileId, KTRMEvent::Status status)
{
KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
TDEApplication::postEvent(instance(), new KTRMEvent(fileId, status));
}
protected:

@ -356,7 +356,7 @@ void HistoryItem::slotAddPlaying()
PlayerManager *manager = PlayerManager::instance();
if(manager->playing() && manager->playingFile() == m_file) {
m_history.prepend(Item(KApplication::randomString(20),
m_history.prepend(Item(TDEApplication::randomString(20),
m_file, Playlist::playingItem()->playlist()));
}

@ -750,7 +750,7 @@ void Playlist::slotRefresh()
if(l.isEmpty())
l = visibleItems();
KApplication::setOverrideCursor(TQt::waitCursor);
TDEApplication::setOverrideCursor(TQt::waitCursor);
for(PlaylistItemList::Iterator it = l.begin(); it != l.end(); ++it) {
(*it)->refreshFromDisk();
@ -763,7 +763,7 @@ void Playlist::slotRefresh()
processEvents();
}
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}
void Playlist::slotRenameFile()
@ -877,7 +877,7 @@ void Playlist::slotCoverChanged(int coverId)
void Playlist::slotGuessTagInfo(TagGuesser::Type type)
{
KApplication::setOverrideCursor(TQt::waitCursor);
TDEApplication::setOverrideCursor(TQt::waitCursor);
PlaylistItemList items = selectedItems();
setDynamicListsFrozen(true);
@ -898,7 +898,7 @@ void Playlist::slotGuessTagInfo(TagGuesser::Type type)
dataChanged();
setDynamicListsFrozen(false);
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}
void Playlist::slotReload()
@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event)
TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag(
TQListViewItemIterator::Visible));
if(selected.current() == visible.current())
KApplication::postEvent(parent(), new FocusUpEvent);
TDEApplication::postEvent(parent(), new FocusUpEvent);
}
}
@ -1353,7 +1353,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after)
if(!after)
after = static_cast<PlaylistItem *>(lastItem());
KApplication::setOverrideCursor(TQt::waitCursor);
TDEApplication::setOverrideCursor(TQt::waitCursor);
m_blockDataChanged = true;
@ -1370,7 +1370,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after)
slotWeightDirty();
dataChanged();
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}
void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id)

@ -618,7 +618,7 @@ void TagEditor::save(const PlaylistItemList &list)
{
if(!list.isEmpty() && m_dataChanged) {
KApplication::setOverrideCursor(TQt::waitCursor);
TDEApplication::setOverrideCursor(TQt::waitCursor);
m_dataChanged = false;
m_performingSave = true;
@ -685,7 +685,7 @@ void TagEditor::save(const PlaylistItemList &list)
TagTransactionManager::instance()->commit();
CollectionList::instance()->dataChanged();
m_performingSave = false;
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}
}

@ -61,7 +61,7 @@ void TagGuesserConfigDlg::accept()
{
if(m_child->lvSchemes->renameLineEdit()) {
TQKeyEvent returnKeyPress(TQEvent::KeyPress, Key_Return, 0, 0);
KApplication::sendEvent(m_child->lvSchemes->renameLineEdit(), &returnKeyPress);
TDEApplication::sendEvent(m_child->lvSchemes->renameLineEdit(), &returnKeyPress);
}
TQStringList schemes;

@ -66,7 +66,7 @@ int main( int argc, char **argv )
{
KAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication app;
TDEApplication app;
check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3",
"Block Rockin' Beats", "Chemical Brothers", "01", "Live" );
check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats (Live).mp3",

@ -97,7 +97,7 @@ void DefaultSequenceIterator::advance()
if(albumRandom) {
if(m_albumSearch.isNull() || m_albumSearch.matchedItems().isEmpty()) {
item = m_randomItems[KApplication::random() % m_randomItems.count()];
item = m_randomItems[TDEApplication::random() % m_randomItems.count()];
initAlbumSearch(item);
}
@ -132,7 +132,7 @@ void DefaultSequenceIterator::advance()
kdError(65432) << "Unable to perform album random play on " << *item << endl;
}
else
item = m_randomItems[KApplication::random() % m_randomItems.count()];
item = m_randomItems[TDEApplication::random() % m_randomItems.count()];
setCurrent(item);
m_randomItems.remove(item);
@ -173,7 +173,7 @@ void DefaultSequenceIterator::prepareToPlay(Playlist *playlist)
PlaylistItem *newItem = 0;
if(!items.isEmpty())
newItem = items[KApplication::random() % items.count()];
newItem = items[TDEApplication::random() % items.count()];
setCurrent(newItem);
refillRandomList();

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "userinterface.h"
Kaboodle::KaboodleApp::KaboodleApp()
: KApplication()
: TDEApplication()
{
disableSessionManagement();

@ -30,7 +30,7 @@ namespace Kaboodle
{
class UserInterface;
class KaboodleApp : public KApplication
class KaboodleApp : public TDEApplication
{
Q_OBJECT

@ -39,7 +39,7 @@ int main(int argc, char *argv[]){
// command line
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
KApplication a(argc, argv);
TDEApplication a(argc, argv);
KAudioCreator *app = new KAudioCreator(0, "MainWindow");
// we need some strings from libkcddb for the cddb album dialog

@ -75,14 +75,14 @@ static const KCmdLineOptions options[] =
int kdemain(int argc, char ** argv)
{
// KApplication uses libkcddb which needs a valid kapp pointer
// TDEApplication uses libkcddb which needs a valid kapp pointer
// GUIenabled must be true as libkcddb sometimes wants to communicate
// with the user
putenv(strdup("SESSION_MANAGER="));
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app(false, true);
TDEApplication app(false, true);
kdDebug(7117) << "Starting " << getpid() << endl;

@ -121,7 +121,7 @@ int ChannelView::lookmode=0;
int ChannelView::lookMode(void)
{
KConfig *kcfg=(KApplication::kApplication())->config();
KConfig *kcfg=(TDEApplication::kApplication())->config();
kcfg->setGroup("KMid");
lookmode=kcfg->readNumEntry("ChannelViewLookMode",0);
@ -131,7 +131,7 @@ int ChannelView::lookMode(void)
void ChannelView::lookMode(int i)
{
KConfig *kcfg=(KApplication::kApplication())->config();
KConfig *kcfg=(TDEApplication::kApplication())->config();
lookmode=i;

@ -43,7 +43,7 @@
class DeviceManager;
class KApplication;
class TDEApplication;
class KConfig;
class KLCDNumber;
class TQLabel;

@ -32,7 +32,7 @@
#include <tqtimer.h>
#include <tdelibs_export.h>
class KApplication;
class TDEApplication;
class KConfig;
class kmidClient;
class KToolBar;

@ -65,7 +65,7 @@ int main(int argc, char **argv)
};
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;
kmidFrame *kmidframe=new kmidFrame("KMid");

@ -58,7 +58,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KApplication app( false, false );
TDEApplication app( false, false );
// get maximum values
KConfig *config= new KConfig("kmixrc", true, false);

@ -54,7 +54,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
TDEApplication app;
KRecord *w = new KRecord();
w->show();
app.setMainWidget(w);

@ -1491,7 +1491,7 @@ void KSCD::information(int i)
bool KSCD::saveState(TQSessionManager& /*sm*/)
{
writeSettings();
KConfig* config = KApplication::kApplication()->sessionConfig();
KConfig* config = TDEApplication::kApplication()->sessionConfig();
config->setGroup("General");
config->writeEntry("Show", isVisible());
return true;
@ -1659,7 +1659,7 @@ int main( int argc, char *argv[] )
if (kapp->isRestored())
{
KConfig* config = KApplication::kApplication()->sessionConfig();
KConfig* config = TDEApplication::kApplication()->sessionConfig();
config->setGroup("General");
if (config->readBoolEntry("Show"))
k->show();

@ -197,7 +197,7 @@ main(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication magicApp;
TDEApplication magicApp;
*/

@ -103,7 +103,7 @@ int main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */, false /* No GUI */);
TDEApplication app(false /* No styles */, false /* No GUI */);
AsyncCDDBLookupTest test;

@ -101,7 +101,7 @@ int main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */, false /* No GUI */);
TDEApplication app(false /* No styles */, false /* No GUI */);
AsyncHTTPLookupTest a;

@ -70,7 +70,7 @@ int main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */, false /* No GUI */);
TDEApplication app(false /* No styles */, false /* No GUI */);
new AsyncHTTPSubmitTest;

@ -71,7 +71,7 @@ int main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */, false /* No GUI */);
TDEApplication app(false /* No styles */, false /* No GUI */);
new AsyncSMTPSubmitTest;

@ -28,7 +28,7 @@ main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */);
TDEApplication app(false /* No styles */);
using namespace KCDDB;

@ -12,7 +12,7 @@ main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */, false /* No GUI */);
TDEApplication app(false /* No styles */, false /* No GUI */);
using namespace KCDDB;

@ -11,7 +11,7 @@ main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */);
TDEApplication app(false /* No styles */);
using namespace KCDDB;

@ -30,7 +30,7 @@ main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */);
TDEApplication app(false /* No styles */);
using namespace KCDDB;

@ -30,7 +30,7 @@ main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app(false /* No styles */);
TDEApplication app(false /* No styles */);
using namespace KCDDB;

@ -11,7 +11,7 @@ main(int argc, char ** argv)
{
TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", "");
KApplication app;
TDEApplication app;
using namespace KCDDB;

@ -117,7 +117,7 @@ NoatunApp::NoatunApp()
{
KMessageBox::error(0,i18n("No playlist plugin was found. " \
"Please make sure that Noatun was installed correctly."));
KApplication::quit();
TDEApplication::quit();
delete this;
}
else
@ -400,7 +400,7 @@ void NoatunApp::preferences()
void NoatunApp::quit()
{
KApplication::quit();
TDEApplication::quit();
}
void NoatunApp::fileOpen()
@ -487,7 +487,7 @@ void NoatunApp::saveState(TQSessionManager &sm)
TQStringList restartCommand = sm.restartCommand();
sm.setRestartCommand( restartCommand );
KApplication::saveState(sm);
TDEApplication::saveState(sm);
}
// Deprecated

@ -147,7 +147,7 @@ void Keyz::slotPrevSection()
void Keyz::slotCopyTitle()
{
if (napp->player()->current())
KApplication::kApplication()->clipboard()->setText(napp->player()->current().title());
TDEApplication::kApplication()->clipboard()->setText(napp->player()->current().title());
}

@ -58,7 +58,7 @@ PlaylistItem SplitPlaylist::next(bool play)
if (lview->childCount())
{
SafeListViewItem *slvi = static_cast<SafeListViewItem*>(
lview->itemAtIndex(KApplication::random() % lview->childCount())
lview->itemAtIndex(TDEApplication::random() % lview->childCount())
);
nextItem = PlaylistItem(slvi);
}

Loading…
Cancel
Save